From 46411c9723a80a781ec513d6a2cfd175cec44644 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Thu, 4 Aug 2022 11:10:45 +0100 Subject: [PATCH 001/912] Implemented review --- openpype/hosts/blender/api/__init__.py | 5 + openpype/hosts/blender/api/capture.py | 278 ++++++++++++++++ openpype/hosts/blender/api/lib.py | 9 + openpype/hosts/blender/api/plugin.py | 7 +- .../blender/plugins/create/create_review.py | 47 +++ .../blender/plugins/publish/collect_review.py | 64 ++++ .../plugins/publish/extract_playblast.py | 125 +++++++ .../plugins/publish/extract_thumbnail.py | 102 ++++++ .../plugins/publish/integrate_thumbnail.py | 10 + openpype/plugins/publish/extract_review.py | 1 + .../defaults/project_settings/blender.json | 137 ++++++++ .../schema_project_blender.json | 4 + .../schemas/schema_blender_publish.json | 308 ++++++++++++++++++ 13 files changed, 1095 insertions(+), 2 deletions(-) create mode 100644 openpype/hosts/blender/api/capture.py create mode 100644 openpype/hosts/blender/plugins/create/create_review.py create mode 100644 openpype/hosts/blender/plugins/publish/collect_review.py create mode 100644 openpype/hosts/blender/plugins/publish/extract_playblast.py create mode 100644 openpype/hosts/blender/plugins/publish/extract_thumbnail.py create mode 100644 openpype/hosts/blender/plugins/publish/integrate_thumbnail.py create mode 100644 openpype/settings/entities/schemas/projects_schema/schemas/schema_blender_publish.json diff --git a/openpype/hosts/blender/api/__init__.py b/openpype/hosts/blender/api/__init__.py index e017d74d91..75a11affde 100644 --- a/openpype/hosts/blender/api/__init__.py +++ b/openpype/hosts/blender/api/__init__.py @@ -31,10 +31,13 @@ from .lib import ( lsattrs, read, maintained_selection, + maintained_time, get_selection, # unique_name, ) +from .capture import capture + __all__ = [ "install", @@ -56,9 +59,11 @@ __all__ = [ # Utility functions "maintained_selection", + "maintained_time", "lsattr", "lsattrs", "read", "get_selection", + "capture", # "unique_name", ] diff --git a/openpype/hosts/blender/api/capture.py b/openpype/hosts/blender/api/capture.py new file mode 100644 index 0000000000..7cf9e52cb6 --- /dev/null +++ b/openpype/hosts/blender/api/capture.py @@ -0,0 +1,278 @@ + +"""Blender Capture +Playblasting with independent viewport, camera and display options +""" +import contextlib +import bpy + +from .lib import maintained_time +from .plugin import deselect_all, create_blender_context + + +def capture( + camera=None, + width=None, + height=None, + filename=None, + start_frame=None, + end_frame=None, + step_frame=None, + sound=None, + isolate=None, + maintain_aspect_ratio=True, + overwrite=False, + image_settings=None, + display_options=None +): + """Playblast in an independent windows + Arguments: + camera (str, optional): Name of camera, defaults to "Camera" + width (int, optional): Width of output in pixels + height (int, optional): Height of output in pixels + filename (str, optional): Name of output file path. Defaults to current + render output path. + start_frame (int, optional): Defaults to current start frame. + end_frame (int, optional): Defaults to current end frame. + step_frame (int, optional): Defaults to 1. + sound (str, optional): Specify the sound node to be used during + playblast. When None (default) no sound will be used. + isolate (list): List of nodes to isolate upon capturing + maintain_aspect_ratio (bool, optional): Modify height in order to + maintain aspect ratio. + overwrite (bool, optional): Whether or not to overwrite if file + already exists. If disabled and file exists and error will be + raised. + image_settings (dict, optional): Supplied image settings for render, + using `ImageSettings` + display_options (dict, optional): Supplied display options for render + """ + + scene = bpy.context.scene + camera = camera or "Camera" + + # Ensure camera exists. + if camera not in scene.objects and camera != "AUTO": + raise RuntimeError("Camera does not exist: {0}".format(camera)) + + # Ensure resolution. + if width and height: + maintain_aspect_ratio = False + width = width or scene.render.resolution_x + height = height or scene.render.resolution_y + if maintain_aspect_ratio: + ratio = scene.render.resolution_x / scene.render.resolution_y + height = round(width / ratio) + + # Get frame range. + if start_frame is None: + start_frame = scene.frame_start + if end_frame is None: + end_frame = scene.frame_end + if step_frame is None: + step_frame = 1 + frame_range = (start_frame, end_frame, step_frame) + + if filename is None: + filename = scene.render.filepath + + render_options = { + "filepath": "{}.".format(filename.rstrip(".")), + "resolution_x": width, + "resolution_y": height, + "use_overwrite": overwrite, + } + + with _independent_window() as window: + + applied_view(window, camera, isolate, options=display_options) + + with contextlib.ExitStack() as stack: + stack.enter_context(maintain_camera(window, camera)) + stack.enter_context(applied_frame_range(window, *frame_range)) + stack.enter_context(applied_render_options(window, render_options)) + stack.enter_context(applied_image_settings(window, image_settings)) + stack.enter_context(maintained_time()) + + bpy.ops.render.opengl( + animation=True, + render_keyed_only=False, + sequencer=False, + write_still=False, + view_context=True + ) + + return filename + + +ImageSettings = { + "file_format": "FFMPEG", + "color_mode": "RGB", + "ffmpeg": { + "format": "QUICKTIME", + "use_autosplit": False, + "codec": "H264", + "constant_rate_factor": "MEDIUM", + "gopsize": 18, + "use_max_b_frames": False, + }, +} + + +def isolate_objects(window, objects): + """Isolate selection""" + deselect_all() + + for obj in objects: + obj.select_set(True) + + context = create_blender_context(selected=objects, window=window) + + bpy.ops.view3d.view_axis(context, type="FRONT") + bpy.ops.view3d.localview(context) + + deselect_all() + + +def _apply_options(entity, options): + for option, value in options.items(): + if isinstance(value, dict): + _apply_options(getattr(entity, option), value) + else: + setattr(entity, option, value) + + +def applied_view(window, camera, isolate=None, options=None): + """Apply view options to window.""" + area = window.screen.areas[0] + space = area.spaces[0] + + area.ui_type = "VIEW_3D" + + meshes = [obj for obj in window.scene.objects if obj.type == "MESH"] + + if camera == "AUTO": + space.region_3d.view_perspective = "ORTHO" + isolate_objects(window, isolate or meshes) + else: + isolate_objects(window, isolate or meshes) + space.camera = window.scene.objects.get(camera) + space.region_3d.view_perspective = "CAMERA" + + if isinstance(options, dict): + _apply_options(space, options) + else: + space.shading.type = "SOLID" + space.shading.color_type = "MATERIAL" + space.show_gizmo = False + space.overlay.show_overlays = False + + +@contextlib.contextmanager +def applied_frame_range(window, start, end, step): + """Context manager for setting frame range.""" + # Store current frame range + current_frame_start = window.scene.frame_start + current_frame_end = window.scene.frame_end + current_frame_step = window.scene.frame_step + # Apply frame range + window.scene.frame_start = start + window.scene.frame_end = end + window.scene.frame_step = step + try: + yield + finally: + # Restore frame range + window.scene.frame_start = current_frame_start + window.scene.frame_end = current_frame_end + window.scene.frame_step = current_frame_step + + +@contextlib.contextmanager +def applied_render_options(window, options): + """Context manager for setting render options.""" + render = window.scene.render + + # Store current settings + original = {} + for opt in options.copy(): + try: + original[opt] = getattr(render, opt) + except ValueError: + options.pop(opt) + + # Apply settings + _apply_options(render, options) + + try: + yield + finally: + # Restore previous settings + _apply_options(render, original) + + +@contextlib.contextmanager +def applied_image_settings(window, options): + """Context manager to override image settings.""" + + options = options or ImageSettings.copy() + ffmpeg = options.pop("ffmpeg", {}) + render = window.scene.render + + # Store current image settings + original = {} + for opt in options.copy(): + try: + original[opt] = getattr(render.image_settings, opt) + except ValueError: + options.pop(opt) + + # Store current ffmpeg settings + original_ffmpeg = {} + for opt in ffmpeg.copy(): + try: + original_ffmpeg[opt] = getattr(render.ffmpeg, opt) + except ValueError: + ffmpeg.pop(opt) + + # Apply image settings + for opt, value in options.items(): + setattr(render.image_settings, opt, value) + + # Apply ffmpeg settings + for opt, value in ffmpeg.items(): + setattr(render.ffmpeg, opt, value) + + try: + yield + finally: + # Restore previous settings + for opt, value in original.items(): + setattr(render.image_settings, opt, value) + for opt, value in original_ffmpeg.items(): + setattr(render.ffmpeg, opt, value) + + +@contextlib.contextmanager +def maintain_camera(window, camera): + """Context manager to override camera.""" + current_camera = window.scene.camera + if camera in window.scene.objects: + window.scene.camera = window.scene.objects.get(camera) + try: + yield + finally: + window.scene.camera = current_camera + + +@contextlib.contextmanager +def _independent_window(): + """Create capture-window context.""" + context = create_blender_context() + current_windows = set(bpy.context.window_manager.windows) + bpy.ops.wm.window_new(context) + window = list(set(bpy.context.window_manager.windows) - current_windows)[0] + context["window"] = window + try: + yield window + finally: + bpy.ops.wm.window_close(context) \ No newline at end of file diff --git a/openpype/hosts/blender/api/lib.py b/openpype/hosts/blender/api/lib.py index 20098c0fe8..ee127ab313 100644 --- a/openpype/hosts/blender/api/lib.py +++ b/openpype/hosts/blender/api/lib.py @@ -284,3 +284,12 @@ def maintained_selection(): # This could happen if the active node was deleted during the # context. log.exception("Failed to set active object.") + +@contextlib.contextmanager +def maintained_time(): + """Maintain current frame during context.""" + current_time = bpy.context.scene.frame_current + try: + yield + finally: + bpy.context.scene.frame_current = current_time diff --git a/openpype/hosts/blender/api/plugin.py b/openpype/hosts/blender/api/plugin.py index c59be8d7ff..1274795c6b 100644 --- a/openpype/hosts/blender/api/plugin.py +++ b/openpype/hosts/blender/api/plugin.py @@ -62,7 +62,8 @@ def prepare_data(data, container_name=None): def create_blender_context(active: Optional[bpy.types.Object] = None, - selected: Optional[bpy.types.Object] = None,): + selected: Optional[bpy.types.Object] = None, + window: Optional[bpy.types.Window] = None): """Create a new Blender context. If an object is passed as parameter, it is set as selected and active. """ @@ -72,7 +73,9 @@ def create_blender_context(active: Optional[bpy.types.Object] = None, override_context = bpy.context.copy() - for win in bpy.context.window_manager.windows: + windows = [window] if window else bpy.context.window_manager.windows + + for win in windows: for area in win.screen.areas: if area.type == 'VIEW_3D': for region in area.regions: diff --git a/openpype/hosts/blender/plugins/create/create_review.py b/openpype/hosts/blender/plugins/create/create_review.py new file mode 100644 index 0000000000..bf4ea6a7cd --- /dev/null +++ b/openpype/hosts/blender/plugins/create/create_review.py @@ -0,0 +1,47 @@ +"""Create review.""" + +import bpy + +from openpype.pipeline import legacy_io +from openpype.hosts.blender.api import plugin, lib, ops +from openpype.hosts.blender.api.pipeline import AVALON_INSTANCES + + +class CreateReview(plugin.Creator): + """Single baked camera""" + + name = "reviewDefault" + label = "Review" + family = "review" + icon = "video-camera" + + def process(self): + """ Run the creator on Blender main thread""" + mti = ops.MainThreadItem(self._process) + ops.execute_in_main_thread(mti) + + def _process(self): + # Get Instance Container or create it if it does not exist + instances = bpy.data.collections.get(AVALON_INSTANCES) + if not instances: + instances = bpy.data.collections.new(name=AVALON_INSTANCES) + bpy.context.scene.collection.children.link(instances) + + # Create instance object + asset = self.data["asset"] + subset = self.data["subset"] + name = plugin.asset_name(asset, subset) + asset_group = bpy.data.collections.new(name=name) + instances.children.link(asset_group) + self.data['task'] = legacy_io.Session.get('AVALON_TASK') + lib.imprint(asset_group, self.data) + + if (self.options or {}).get("useSelection"): + selected = lib.get_selection() + for obj in selected: + asset_group.objects.link(obj) + elif (self.options or {}).get("asset_group"): + obj = (self.options or {}).get("asset_group") + asset_group.objects.link(obj) + + return asset_group diff --git a/openpype/hosts/blender/plugins/publish/collect_review.py b/openpype/hosts/blender/plugins/publish/collect_review.py new file mode 100644 index 0000000000..09b5558d31 --- /dev/null +++ b/openpype/hosts/blender/plugins/publish/collect_review.py @@ -0,0 +1,64 @@ +import bpy + +import pyblish.api +from openpype.pipeline import legacy_io + + +class CollectReview(pyblish.api.InstancePlugin): + """Collect Review data + + """ + + order = pyblish.api.CollectorOrder + 0.3 + label = "Collect Review Data" + families = ["review"] + + def process(self, instance): + + self.log.debug(f"instance: {instance}") + + # get cameras + cameras = [ + obj + for obj in instance + if isinstance(obj, bpy.types.Object) and obj.type == "CAMERA" + ] + + assert len(cameras) == 1, ( + f"Not a single camera found in extraction: {cameras}" + ) + camera = cameras[0].name + self.log.debug(f"camera: {camera}") + + # get isolate objects list from meshes instance members . + isolate_objects = [ + obj + for obj in instance + if isinstance(obj, bpy.types.Object) and obj.type == "MESH" + ] + + if not instance.data.get("remove"): + + task = legacy_io.Session.get("AVALON_TASK") + + instance.data.update({ + "subset": f"{task}Review", + "review_camera": camera, + "frameStart": instance.context.data["frameStart"], + "frameEnd": instance.context.data["frameEnd"], + "fps": instance.context.data["fps"], + "isolate": isolate_objects, + }) + + self.log.debug(f"instance data: {instance.data}") + + # TODO : Collect audio + audio_tracks = [] + instance.data["audio"] = [] + for track in audio_tracks: + instance.data["audio"].append( + { + "offset": track.offset.get(), + "filename": track.filename.get(), + } + ) \ No newline at end of file diff --git a/openpype/hosts/blender/plugins/publish/extract_playblast.py b/openpype/hosts/blender/plugins/publish/extract_playblast.py new file mode 100644 index 0000000000..d07968d469 --- /dev/null +++ b/openpype/hosts/blender/plugins/publish/extract_playblast.py @@ -0,0 +1,125 @@ +import os +import clique + +import bpy + +import pyblish.api +import openpype.api +from openpype.hosts.blender.api import capture +from openpype.hosts.blender.api.lib import maintained_time + + +class ExtractPlayblast(openpype.api.Extractor): + """ + Extract viewport playblast. + + Takes review camera and creates review Quicktime video based on viewport + capture. + """ + + label = "Extract Playblast" + hosts = ["blender"] + families = ["review"] + optional = True + order = pyblish.api.ExtractorOrder + 0.01 + + + def process(self, instance): + self.log.info("Extracting capture..") + + self.log.info(instance.data) + print(instance.context.data) + + # get scene fps + fps = instance.data.get("fps") + if fps is None: + fps = bpy.context.scene.render.fps + instance.data["fps"] = fps + + self.log.info(f"fps: {fps}") + + # If start and end frames cannot be determined, + # get them from Blender timeline. + start = instance.data.get("frameStart", bpy.context.scene.frame_start) + end = instance.data.get("frameEnd", bpy.context.scene.frame_end) + + self.log.info(f"start: {start}, end: {end}") + assert end > start, "Invalid time range !" + + # get cameras + camera = instance.data("review_camera", None) + + # get isolate objects list + isolate = instance.data("isolate", None) + + # get ouput path + stagingdir = self.staging_dir(instance) + filename = instance.name + path = os.path.join(stagingdir, filename) + + self.log.info(f"Outputting images to {path}") + + project_settings = instance.context.data["project_settings"]["blender"] + presets = project_settings["publish"]["ExtractPlayblast"]["presets"] + preset = presets.get("default") + preset.update({ + "camera": camera, + "start_frame": start, + "end_frame": end, + "filename": path, + "overwrite": True, + "isolate": isolate, + }) + preset.setdefault( + "image_settings", + { + "file_format": "PNG", + "color_mode": "RGB", + "color_depth": "8", + "compression": 15, + }, + ) + + with maintained_time(): + path = capture(**preset) + + self.log.debug(f"playblast path {path}") + + collected_files = os.listdir(stagingdir) + collections, remainder = clique.assemble( + collected_files, + patterns=[f"{filename}\\.{clique.DIGITS_PATTERN}\\.png$"], + ) + + if len(collections) > 1: + raise RuntimeError( + f"More than one collection found in stagingdir: {stagingdir}" + ) + elif len(collections) == 0: + raise RuntimeError( + f"No collection found in stagingdir: {stagingdir}" + ) + + frame_collection = collections[0] + + self.log.info(f"We found collection of interest {frame_collection}") + + instance.data.setdefault("representations", []) + + tags = ["review"] + if not instance.data.get("keepImages"): + tags.append("delete") + + representation = { + "name": "png", + "ext": "png", + "files": list(frame_collection), + "stagingDir": stagingdir, + "frameStart": start, + "frameEnd": end, + "fps": fps, + "preview": True, + "tags": tags, + "camera_name": camera + } + instance.data["representations"].append(representation) \ No newline at end of file diff --git a/openpype/hosts/blender/plugins/publish/extract_thumbnail.py b/openpype/hosts/blender/plugins/publish/extract_thumbnail.py new file mode 100644 index 0000000000..3fabdf61e0 --- /dev/null +++ b/openpype/hosts/blender/plugins/publish/extract_thumbnail.py @@ -0,0 +1,102 @@ +import os +import glob + +import pyblish.api +import openpype.api +from openpype.hosts.blender.api import capture +from openpype.hosts.blender.api.lib import maintained_time + +import bpy + + +class ExtractThumbnail(openpype.api.Extractor): + """Extract viewport thumbnail. + + Takes review camera and creates a thumbnail based on viewport + capture. + + """ + + label = "Extract Thumbnail" + hosts = ["blender"] + families = ["review"] + order = pyblish.api.ExtractorOrder + 0.01 + + def process(self, instance): + self.log.info("Extracting capture..") + + stagingdir = self.staging_dir(instance) + filename = instance.name + path = os.path.join(stagingdir, filename) + + self.log.info(f"Outputting images to {path}") + + camera = instance.data.get("review_camera", "AUTO") + start = instance.data.get("frameStart", bpy.context.scene.frame_start) + family = instance.data.get("family") + isolate = instance.data("isolate", None) + + project_settings = instance.context.data["project_settings"]["blender"] + extractor_settings = project_settings["publish"]["ExtractThumbnail"] + presets = extractor_settings.get("presets") + + preset = presets.get(family, {}) + + preset.update({ + "camera": camera, + "start_frame": start, + "end_frame": start, + "filename": path, + "overwrite": True, + "isolate": isolate, + }) + preset.setdefault( + "image_settings", + { + "file_format": "JPEG", + "color_mode": "RGB", + "quality": 100, + }, + ) + + with maintained_time(): + path = capture(**preset) + + thumbnail = os.path.basename(self._fix_output_path(path)) + + self.log.info(f"thumbnail: {thumbnail}") + + instance.data.setdefault("representations", []) + + representation = { + "name": "thumbnail", + "ext": "jpg", + "files": thumbnail, + "stagingDir": stagingdir, + "thumbnail": True + } + instance.data["representations"].append(representation) + + def _fix_output_path(self, filepath): + """"Workaround to return correct filepath. + + To workaround this we just glob.glob() for any file extensions and + assume the latest modified file is the correct file and return it. + + """ + # Catch cancelled playblast + if filepath is None: + self.log.warning( + "Playblast did not result in output path. " + "Playblast is probably interrupted." + ) + return None + + if not os.path.exists(filepath): + files = glob.glob(f"{filepath}.*.jpg") + + if not files: + raise RuntimeError(f"Couldn't find playblast from: {filepath}") + filepath = max(files, key=os.path.getmtime) + + return filepath \ No newline at end of file diff --git a/openpype/hosts/blender/plugins/publish/integrate_thumbnail.py b/openpype/hosts/blender/plugins/publish/integrate_thumbnail.py new file mode 100644 index 0000000000..489db673de --- /dev/null +++ b/openpype/hosts/blender/plugins/publish/integrate_thumbnail.py @@ -0,0 +1,10 @@ +import pyblish.api +from openpype.plugins.publish import integrate_thumbnail + + +class IntegrateThumbnails(integrate_thumbnail.IntegrateThumbnails): + """Integrate Thumbnails.""" + + label = "Integrate Thumbnails" + order = pyblish.api.IntegratorOrder + 0.01 + families = ["review"] diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py index 533a87acb4..5068b0261e 100644 --- a/openpype/plugins/publish/extract_review.py +++ b/openpype/plugins/publish/extract_review.py @@ -41,6 +41,7 @@ class ExtractReview(pyblish.api.InstancePlugin): hosts = [ "nuke", "maya", + "blender", "shell", "hiero", "premiere", diff --git a/openpype/settings/defaults/project_settings/blender.json b/openpype/settings/defaults/project_settings/blender.json index a7262dcb5d..e3be0b50ee 100644 --- a/openpype/settings/defaults/project_settings/blender.json +++ b/openpype/settings/defaults/project_settings/blender.json @@ -2,5 +2,142 @@ "workfile_builder": { "create_first_version": false, "custom_templates": [] + }, + "publish": { + "ValidateLinkedVersion": { + "enabled": true, + "optional": true, + "active": true + }, + "ValidateLinkedData": { + "enabled": true, + "optional": true, + "active": true + }, + "ExtractBlend": { + "enabled": true, + "optional": true, + "active": true, + "pack_images": true + }, + "ExtractBlendAnimation": { + "enabled": true, + "optional": true, + "active": true + }, + "ExtractCamera": { + "enabled": true, + "optional": true, + "active": true + }, + "ExtractFBX": { + "enabled": true, + "optional": true, + "active": true, + "scale_length": 0 + }, + "ExtractAnimationFBX": { + "enabled": true, + "optional": true, + "active": true + }, + "ExtractABC": { + "enabled": true, + "optional": true, + "active": true + }, + "ExtractLayout": { + "enabled": true, + "optional": true, + "active": true + }, + "ExtractThumbnail": { + "enabled": true, + "optional": true, + "active": true, + "presets": { + "model": { + "image_settings": { + "file_format": "JPEG", + "color_mode": "RGB", + "quality": 100 + }, + "display_options": { + "shading": { + "light": "STUDIO", + "studio_light": "Default", + "type": "SOLID", + "color_type": "OBJECT", + "show_xray": false, + "show_shadows": false, + "show_cavity": true + }, + "overlay": { + "show_overlays": false + } + } + }, + "rig": { + "image_settings": { + "file_format": "JPEG", + "color_mode": "RGB", + "quality": 100 + }, + "display_options": { + "shading": { + "light": "STUDIO", + "studio_light": "Default", + "type": "SOLID", + "color_type": "OBJECT", + "show_xray": true, + "show_shadows": false, + "show_cavity": false + }, + "overlay": { + "show_overlays": true, + "show_ortho_grid": false, + "show_floor": false, + "show_axis_x": false, + "show_axis_y": false, + "show_axis_z": false, + "show_text": false, + "show_stats": false, + "show_cursor": false, + "show_annotation": false, + "show_extras": false, + "show_relationship_lines": false, + "show_outline_selected": false, + "show_motion_paths": false, + "show_object_origins": false, + "show_bones": true + } + } + } + } + }, + "ExtractPlayblast": { + "enabled": true, + "optional": true, + "active": true, + "presets": { + "default": { + "image_settings": { + "file_format": "PNG", + "color_mode": "RGB", + "color_depth": "8", + "compression": 15 + }, + "display_options": { + "shading": { + "type": "MATERIAL", + "render_pass": "COMBINED" + }, + "overlay": { + "show_overlays": false + } + } + } + } + } } } \ No newline at end of file diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json b/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json index af09329a03..4c72ebda2f 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json @@ -12,6 +12,10 @@ "workfile_builder/builder_on_start", "workfile_builder/profiles" ] + }, + { + "type": "schema", + "name": "schema_blender_publish" } ] } diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_blender_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_blender_publish.json new file mode 100644 index 0000000000..a634b6dabe --- /dev/null +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_blender_publish.json @@ -0,0 +1,308 @@ +{ + "type": "dict", + "collapsible": true, + "key": "publish", + "label": "Publish plugins", + "children": [ + { + "type": "label", + "label": "Validators" + }, + { + "type": "dict", + "collapsible": true, + "key": "ValidateLinkedVersion", + "label": "Validate Linked Version", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "optional", + "label": "Optional" + }, + { + "type": "boolean", + "key": "active", + "label": "Active" + } + ] + }, + { + "type": "dict", + "collapsible": true, + "key": "ValidateLinkedData", + "label": "Validate Linked Data", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "optional", + "label": "Optional" + }, + { + "type": "boolean", + "key": "active", + "label": "Active" + } + ] + }, + { + "type": "splitter" + }, + { + "type": "label", + "label": "Extractors" + }, + { + "type": "dict", + "collapsible": true, + "key": "ExtractBlend", + "label": "Extract Blend", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "optional", + "label": "Optional" + }, + { + "type": "boolean", + "key": "active", + "label": "Active" + }, + { + "type": "boolean", + "key": "pack_images", + "label": "Pack Images" + } + ] + }, + { + "type": "dict", + "collapsible": true, + "key": "ExtractBlendAnimation", + "label": "Extract Blend Animation", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "optional", + "label": "Optional" + }, + { + "type": "boolean", + "key": "active", + "label": "Active" + } + ] + }, + { + "type": "dict", + "collapsible": true, + "key": "ExtractCamera", + "label": "Extract Camera as FBX", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "optional", + "label": "Optional" + }, + { + "type": "boolean", + "key": "active", + "label": "Active" + } + ] + }, + { + "type": "dict", + "collapsible": true, + "key": "ExtractFBX", + "label": "Extract FBX (model and rig)", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "optional", + "label": "Optional" + }, + { + "type": "boolean", + "key": "active", + "label": "Active" + }, + { + "type": "number", + "key": "scale_length", + "label": "Scale length", + "decimal": 3, + "minimum": 0, + "maximum": 1000 + } + ] + }, + { + "type": "dict", + "collapsible": true, + "key": "ExtractAnimationFBX", + "label": "Extract Animation FBX", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "optional", + "label": "Optional" + }, + { + "type": "boolean", + "key": "active", + "label": "Active" + } + ] + }, + { + "type": "dict", + "collapsible": true, + "key": "ExtractABC", + "label": "Extract ABC (model and pointcache)", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "optional", + "label": "Optional" + }, + { + "type": "boolean", + "key": "active", + "label": "Active" + } + ] + }, + { + "type": "dict", + "collapsible": true, + "key": "ExtractLayout", + "label": "Extract Layout as JSON", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "optional", + "label": "Optional" + }, + { + "type": "boolean", + "key": "active", + "label": "Active" + } + ] + }, + { + "type": "dict", + "collapsible": true, + "key": "ExtractThumbnail", + "label": "ExtractThumbnail", + "checkbox_key": "enabled", + "is_group": true, + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "optional", + "label": "Optional" + }, + { + "type": "boolean", + "key": "active", + "label": "Active" + }, + { + "type": "raw-json", + "key": "presets", + "label": "Presets" + } + ] + }, + { + "type": "dict", + "collapsible": true, + "key": "ExtractPlayblast", + "label": "ExtractPlayblast", + "checkbox_key": "enabled", + "is_group": true, + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "optional", + "label": "Optional" + }, + { + "type": "boolean", + "key": "active", + "label": "Active" + }, + { + "type": "raw-json", + "key": "presets", + "label": "Presets" + } + ] + } + ] +} \ No newline at end of file From 13997f4b4cc55c2168c360870593ea561daf1eeb Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Thu, 4 Aug 2022 12:22:44 +0100 Subject: [PATCH 002/912] Removed thumbnail integrator --- .../blender/plugins/publish/integrate_thumbnail.py | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 openpype/hosts/blender/plugins/publish/integrate_thumbnail.py diff --git a/openpype/hosts/blender/plugins/publish/integrate_thumbnail.py b/openpype/hosts/blender/plugins/publish/integrate_thumbnail.py deleted file mode 100644 index 489db673de..0000000000 --- a/openpype/hosts/blender/plugins/publish/integrate_thumbnail.py +++ /dev/null @@ -1,10 +0,0 @@ -import pyblish.api -from openpype.plugins.publish import integrate_thumbnail - - -class IntegrateThumbnails(integrate_thumbnail.IntegrateThumbnails): - """Integrate Thumbnails.""" - - label = "Integrate Thumbnails" - order = pyblish.api.IntegratorOrder + 0.01 - families = ["review"] From 2ace936a951c6562145b4dd359e104eca629bd05 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 20 Sep 2022 23:32:13 +0200 Subject: [PATCH 003/912] Draft to refactor fusion to new publisher and use as FusionHost --- openpype/hosts/fusion/api/__init__.py | 27 +-- openpype/hosts/fusion/api/menu.py | 2 +- openpype/hosts/fusion/api/pipeline.py | 174 ++++++++++++------ openpype/hosts/fusion/api/workio.py | 45 ----- .../deploy/MenuScripts/openpype_menu.py | 4 +- .../fusion/plugins/create/create_exr_saver.py | 44 +++-- 6 files changed, 160 insertions(+), 136 deletions(-) delete mode 100644 openpype/hosts/fusion/api/workio.py diff --git a/openpype/hosts/fusion/api/__init__.py b/openpype/hosts/fusion/api/__init__.py index ed70dbca50..495fe286d5 100644 --- a/openpype/hosts/fusion/api/__init__.py +++ b/openpype/hosts/fusion/api/__init__.py @@ -1,20 +1,11 @@ from .pipeline import ( - install, - uninstall, - + FusionHost, ls, imprint_container, - parse_container -) - -from .workio import ( - open_file, - save_file, - current_file, - has_unsaved_changes, - file_extensions, - work_root + parse_container, + list_instances, + remove_instance ) from .lib import ( @@ -30,21 +21,11 @@ from .menu import launch_openpype_menu __all__ = [ # pipeline - "install", - "uninstall", "ls", "imprint_container", "parse_container", - # workio - "open_file", - "save_file", - "current_file", - "has_unsaved_changes", - "file_extensions", - "work_root", - # lib "maintained_selection", "update_frame_range", diff --git a/openpype/hosts/fusion/api/menu.py b/openpype/hosts/fusion/api/menu.py index 7a6293807f..4e415cafba 100644 --- a/openpype/hosts/fusion/api/menu.py +++ b/openpype/hosts/fusion/api/menu.py @@ -144,7 +144,7 @@ class OpenPypeMenu(QtWidgets.QWidget): host_tools.show_creator() def on_publish_clicked(self): - host_tools.show_publish() + host_tools.show_publisher() def on_load_clicked(self): host_tools.show_loader(use_context=True) diff --git a/openpype/hosts/fusion/api/pipeline.py b/openpype/hosts/fusion/api/pipeline.py index c92d072ef7..b73759fee0 100644 --- a/openpype/hosts/fusion/api/pipeline.py +++ b/openpype/hosts/fusion/api/pipeline.py @@ -3,6 +3,7 @@ Basic avalon integration """ import os import logging +import contextlib import pyblish.api @@ -14,15 +15,14 @@ from openpype.pipeline import ( register_loader_plugin_path, register_creator_plugin_path, register_inventory_action_path, - deregister_loader_plugin_path, - deregister_creator_plugin_path, - deregister_inventory_action_path, AVALON_CONTAINER_ID, ) from openpype.pipeline.load import any_outdated_containers from openpype.hosts.fusion import FUSION_HOST_DIR +from openpype.host import HostBase, IWorkfileHost, ILoadHost, INewPublisher from openpype.tools.utils import host_tools + from .lib import ( get_current_comp, comp_lock_and_undo_chunk, @@ -47,71 +47,99 @@ class CompLogHandler(logging.Handler): comp.Print(entry) -def install(): - """Install fusion-specific functionality of OpenPype. +class FusionHost(HostBase, IWorkfileHost, ILoadHost, INewPublisher): + name = "fusion" - This is where you install menus and register families, data - and loaders into fusion. + def install(self): + """Install fusion-specific functionality of OpenPype. - It is called automatically when installing via - `openpype.pipeline.install_host(openpype.hosts.fusion.api)` + This is where you install menus and register families, data + and loaders into fusion. - See the Maya equivalent for inspiration on how to implement this. + It is called automatically when installing via + `openpype.pipeline.install_host(openpype.hosts.fusion.api)` - """ - # Remove all handlers associated with the root logger object, because - # that one always logs as "warnings" incorrectly. - for handler in logging.root.handlers[:]: - logging.root.removeHandler(handler) + See the Maya equivalent for inspiration on how to implement this. - # Attach default logging handler that prints to active comp - logger = logging.getLogger() - formatter = logging.Formatter(fmt="%(message)s\n") - handler = CompLogHandler() - handler.setFormatter(formatter) - logger.addHandler(handler) - logger.setLevel(logging.DEBUG) + """ + # Remove all handlers associated with the root logger object, because + # that one always logs as "warnings" incorrectly. + for handler in logging.root.handlers[:]: + logging.root.removeHandler(handler) - pyblish.api.register_host("fusion") - pyblish.api.register_plugin_path(PUBLISH_PATH) - log.info("Registering Fusion plug-ins..") + # Attach default logging handler that prints to active comp + logger = logging.getLogger() + formatter = logging.Formatter(fmt="%(message)s\n") + handler = CompLogHandler() + handler.setFormatter(formatter) + logger.addHandler(handler) + logger.setLevel(logging.DEBUG) - register_loader_plugin_path(LOAD_PATH) - register_creator_plugin_path(CREATE_PATH) - register_inventory_action_path(INVENTORY_PATH) + pyblish.api.register_host("fusion") + pyblish.api.register_plugin_path(PUBLISH_PATH) + log.info("Registering Fusion plug-ins..") - pyblish.api.register_callback( - "instanceToggled", on_pyblish_instance_toggled - ) + register_loader_plugin_path(LOAD_PATH) + register_creator_plugin_path(CREATE_PATH) + register_inventory_action_path(INVENTORY_PATH) - # Fusion integration currently does not attach to direct callbacks of - # the application. So we use workfile callbacks to allow similar behavior - # on save and open - register_event_callback("workfile.open.after", on_after_open) + pyblish.api.register_callback("instanceToggled", + on_pyblish_instance_toggled) + # Fusion integration currently does not attach to direct callbacks of + # the application. So we use workfile callbacks to allow similar + # behavior on save and open + register_event_callback("workfile.open.after", on_after_open) -def uninstall(): - """Uninstall all that was installed + # region workfile io api + def has_unsaved_changes(self): + comp = get_current_comp() + return comp.GetAttrs()["COMPB_Modified"] - This is where you undo everything that was done in `install()`. - That means, removing menus, deregistering families and data - and everything. It should be as though `install()` was never run, - because odds are calling this function means the user is interested - in re-installing shortly afterwards. If, for example, he has been - modifying the menu or registered families. + def get_workfile_extensions(self): + return [".comp"] - """ - pyblish.api.deregister_host("fusion") - pyblish.api.deregister_plugin_path(PUBLISH_PATH) - log.info("Deregistering Fusion plug-ins..") + def save_workfile(self, dst_path=None): + comp = get_current_comp() + comp.Save(dst_path) - deregister_loader_plugin_path(LOAD_PATH) - deregister_creator_plugin_path(CREATE_PATH) - deregister_inventory_action_path(INVENTORY_PATH) + def open_workfile(self, filepath): + # Hack to get fusion, see + # openpype.hosts.fusion.api.pipeline.get_current_comp() + fusion = getattr(sys.modules["__main__"], "fusion", None) - pyblish.api.deregister_callback( - "instanceToggled", on_pyblish_instance_toggled - ) + return fusion.LoadComp(filepath) + + def get_current_workfile(self): + comp = get_current_comp() + current_filepath = comp.GetAttrs()["COMPS_FileName"] + if not current_filepath: + return None + + return current_filepath + + def work_root(self, session): + work_dir = session["AVALON_WORKDIR"] + scene_dir = session.get("AVALON_SCENEDIR") + if scene_dir: + return os.path.join(work_dir, scene_dir) + else: + return work_dir + # endregion + + @contextlib.contextmanager + def maintained_selection(self): + from .lib import maintained_selection + return maintained_selection() + + def get_containers(self): + return ls() + + def update_context_data(self, data, changes): + print(data, changes) + + def get_context_data(self): + return {} def on_pyblish_instance_toggled(instance, old_value, new_value): @@ -254,3 +282,43 @@ def parse_container(tool): return container +def list_instances(creator_id=None): + """Return created instances in current workfile which will be published. + + Returns: + (list) of dictionaries matching instances format + """ + + comp = get_current_comp() + tools = comp.GetToolList(False, "Loader").values() + + instance_signature = { + "id": "pyblish.avalon.instance", + "identifier": creator_id + } + instances = [] + for tool in tools: + + data = tool.GetData('openpype') + if not isinstance(data, dict): + return + + if creator_id and data.get("identifier") != creator_id: + continue + + if data.get("id") != instance_signature["id"]: + continue + + instances.append(tool) + + return instances + + +def remove_instance(instance): + """Remove instance from current workfile. + + Args: + instance (dict): instance representation from subsetmanager model + """ + # Assume instance is a Fusion tool directly + instance.Delete() diff --git a/openpype/hosts/fusion/api/workio.py b/openpype/hosts/fusion/api/workio.py deleted file mode 100644 index 939b2ff4be..0000000000 --- a/openpype/hosts/fusion/api/workio.py +++ /dev/null @@ -1,45 +0,0 @@ -"""Host API required Work Files tool""" -import sys -import os - -from .lib import get_current_comp - - -def file_extensions(): - return [".comp"] - - -def has_unsaved_changes(): - comp = get_current_comp() - return comp.GetAttrs()["COMPB_Modified"] - - -def save_file(filepath): - comp = get_current_comp() - comp.Save(filepath) - - -def open_file(filepath): - # Hack to get fusion, see - # openpype.hosts.fusion.api.pipeline.get_current_comp() - fusion = getattr(sys.modules["__main__"], "fusion", None) - - return fusion.LoadComp(filepath) - - -def current_file(): - comp = get_current_comp() - current_filepath = comp.GetAttrs()["COMPS_FileName"] - if not current_filepath: - return None - - return current_filepath - - -def work_root(session): - work_dir = session["AVALON_WORKDIR"] - scene_dir = session.get("AVALON_SCENEDIR") - if scene_dir: - return os.path.join(work_dir, scene_dir) - else: - return work_dir diff --git a/openpype/hosts/fusion/deploy/MenuScripts/openpype_menu.py b/openpype/hosts/fusion/deploy/MenuScripts/openpype_menu.py index 2918c552c8..685e58d58f 100644 --- a/openpype/hosts/fusion/deploy/MenuScripts/openpype_menu.py +++ b/openpype/hosts/fusion/deploy/MenuScripts/openpype_menu.py @@ -13,11 +13,11 @@ def main(env): # However the contents of that folder can conflict with Qt library dlls # so we make sure to move out of it to avoid DLL Load Failed errors. os.chdir("..") - from openpype.hosts.fusion import api + from openpype.hosts.fusion.api import FusionHost from openpype.hosts.fusion.api import menu # activate resolve from pype - install_host(api) + install_host(FusionHost()) log = Logger.get_logger(__name__) log.info(f"Registered host: {registered_host()}") diff --git a/openpype/hosts/fusion/plugins/create/create_exr_saver.py b/openpype/hosts/fusion/plugins/create/create_exr_saver.py index 6d93fe710a..74cd1cbea5 100644 --- a/openpype/hosts/fusion/plugins/create/create_exr_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_exr_saver.py @@ -1,24 +1,29 @@ import os -from openpype.pipeline import ( - LegacyCreator, - legacy_io -) from openpype.hosts.fusion.api import ( get_current_comp, - comp_lock_and_undo_chunk + comp_lock_and_undo_chunk, + remove_instance, + list_instances +) + +from openpype.pipeline import ( + legacy_io, + Creator, + CreatedInstance ) -class CreateOpenEXRSaver(LegacyCreator): - +class CreateOpenEXRSaver(Creator): + identifier = "io.openpype.creators.fusion.saver" name = "openexrDefault" label = "Create OpenEXR Saver" - hosts = ["fusion"] family = "render" - defaults = ["Main"] + default_variants = ["Main"] - def process(self): + selected_nodes = [] + + def create(self, subset_name, instance_data, pre_create_data): file_format = "OpenEXRFormat" @@ -26,13 +31,13 @@ class CreateOpenEXRSaver(LegacyCreator): workdir = os.path.normpath(legacy_io.Session["AVALON_WORKDIR"]) - filename = "{}..exr".format(self.name) + filename = "{}..exr".format(subset_name) filepath = os.path.join(workdir, "render", filename) with comp_lock_and_undo_chunk(comp): args = (-32768, -32768) # Magical position numbers saver = comp.AddTool("Saver", *args) - saver.SetAttrs({"TOOLS_Name": self.name}) + saver.SetAttrs({"TOOLS_Name": subset_name}) # Setting input attributes is different from basic attributes # Not confused with "MainInputAttributes" which @@ -47,3 +52,18 @@ class CreateOpenEXRSaver(LegacyCreator): # Set file format attributes saver[file_format]["Depth"] = 1 # int8 | int16 | float32 | other saver[file_format]["SaveAlpha"] = 0 + + def collect_instances(self): + for instance in list_instances(creator_id=self.identifier): + created_instance = CreatedInstance.from_existing(instance, self) + self._add_instance_to_context(created_instance) + + def update_instances(self, update_list): + print(update_list) + + def remove_instances(self, instances): + for instance in instances: + remove_instance(instance) + + def get_pre_create_attr_defs(self): + return [] \ No newline at end of file From 13cb1f4bc0756eae2cf1cf7d07726e137a03a37f Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 20 Sep 2022 23:37:32 +0200 Subject: [PATCH 004/912] Ensure newline --- openpype/hosts/fusion/plugins/create/create_exr_saver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/plugins/create/create_exr_saver.py b/openpype/hosts/fusion/plugins/create/create_exr_saver.py index 74cd1cbea5..4809832cd0 100644 --- a/openpype/hosts/fusion/plugins/create/create_exr_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_exr_saver.py @@ -66,4 +66,4 @@ class CreateOpenEXRSaver(Creator): remove_instance(instance) def get_pre_create_attr_defs(self): - return [] \ No newline at end of file + return [] From 218c836026fcb99dd157fa56e6dfabc8bf3a8271 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 21 Sep 2022 09:12:41 +0200 Subject: [PATCH 005/912] Reorder logic - makes more sense to check id first --- openpype/hosts/fusion/api/pipeline.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/api/pipeline.py b/openpype/hosts/fusion/api/pipeline.py index b73759fee0..f5900a2dde 100644 --- a/openpype/hosts/fusion/api/pipeline.py +++ b/openpype/hosts/fusion/api/pipeline.py @@ -303,10 +303,10 @@ def list_instances(creator_id=None): if not isinstance(data, dict): return - if creator_id and data.get("identifier") != creator_id: + if data.get("id") != instance_signature["id"]: continue - if data.get("id") != instance_signature["id"]: + if creator_id and data.get("identifier") != creator_id: continue instances.append(tool) From 1cf86a68f7b1961118f127cadc068e6b37e62d77 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 21 Sep 2022 14:19:56 +0200 Subject: [PATCH 006/912] Remove creator in menu in favor of new publisher --- openpype/hosts/fusion/api/menu.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/openpype/hosts/fusion/api/menu.py b/openpype/hosts/fusion/api/menu.py index 4e415cafba..ec8747298c 100644 --- a/openpype/hosts/fusion/api/menu.py +++ b/openpype/hosts/fusion/api/menu.py @@ -52,7 +52,6 @@ class OpenPypeMenu(QtWidgets.QWidget): asset_label.setAlignment(QtCore.Qt.AlignHCenter) workfiles_btn = QtWidgets.QPushButton("Workfiles...", self) - create_btn = QtWidgets.QPushButton("Create...", self) publish_btn = QtWidgets.QPushButton("Publish...", self) load_btn = QtWidgets.QPushButton("Load...", self) manager_btn = QtWidgets.QPushButton("Manage...", self) @@ -75,7 +74,6 @@ class OpenPypeMenu(QtWidgets.QWidget): layout.addSpacing(20) - layout.addWidget(create_btn) layout.addWidget(load_btn) layout.addWidget(publish_btn) layout.addWidget(manager_btn) @@ -100,7 +98,6 @@ class OpenPypeMenu(QtWidgets.QWidget): self.asset_label = asset_label workfiles_btn.clicked.connect(self.on_workfile_clicked) - create_btn.clicked.connect(self.on_create_clicked) publish_btn.clicked.connect(self.on_publish_clicked) load_btn.clicked.connect(self.on_load_clicked) manager_btn.clicked.connect(self.on_manager_clicked) @@ -140,9 +137,6 @@ class OpenPypeMenu(QtWidgets.QWidget): def on_workfile_clicked(self): host_tools.show_workfiles() - def on_create_clicked(self): - host_tools.show_creator() - def on_publish_clicked(self): host_tools.show_publisher() From ae5c565ab61609a3affcecc7b398ee9d0a6a874f Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 21 Sep 2022 14:20:50 +0200 Subject: [PATCH 007/912] Fix logic - add comments that these will remain unused however --- openpype/hosts/fusion/api/pipeline.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/fusion/api/pipeline.py b/openpype/hosts/fusion/api/pipeline.py index f5900a2dde..1587381b1a 100644 --- a/openpype/hosts/fusion/api/pipeline.py +++ b/openpype/hosts/fusion/api/pipeline.py @@ -282,6 +282,7 @@ def parse_container(tool): return container +# TODO: Function below is currently unused prototypes def list_instances(creator_id=None): """Return created instances in current workfile which will be published. @@ -290,7 +291,7 @@ def list_instances(creator_id=None): """ comp = get_current_comp() - tools = comp.GetToolList(False, "Loader").values() + tools = comp.GetToolList(False).values() instance_signature = { "id": "pyblish.avalon.instance", @@ -301,7 +302,7 @@ def list_instances(creator_id=None): data = tool.GetData('openpype') if not isinstance(data, dict): - return + continue if data.get("id") != instance_signature["id"]: continue @@ -314,6 +315,7 @@ def list_instances(creator_id=None): return instances +# TODO: Function below is currently unused prototypes def remove_instance(instance): """Remove instance from current workfile. @@ -321,4 +323,4 @@ def remove_instance(instance): instance (dict): instance representation from subsetmanager model """ # Assume instance is a Fusion tool directly - instance.Delete() + instance["tool"].Delete() From d62e1eef82bbb84902a96d1d48fa26538f9a2f81 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 21 Sep 2022 14:21:28 +0200 Subject: [PATCH 008/912] Continue refactor to new publisher --- .../fusion/plugins/create/create_exr_saver.py | 74 ++++++++++++++++++- .../plugins/publish/collect_instances.py | 48 ++++-------- 2 files changed, 86 insertions(+), 36 deletions(-) diff --git a/openpype/hosts/fusion/plugins/create/create_exr_saver.py b/openpype/hosts/fusion/plugins/create/create_exr_saver.py index 4809832cd0..c2adb48bac 100644 --- a/openpype/hosts/fusion/plugins/create/create_exr_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_exr_saver.py @@ -1,5 +1,7 @@ import os +import qtawesome + from openpype.hosts.fusion.api import ( get_current_comp, comp_lock_and_undo_chunk, @@ -19,7 +21,9 @@ class CreateOpenEXRSaver(Creator): name = "openexrDefault" label = "Create OpenEXR Saver" family = "render" - default_variants = ["Main"] + default_variants = ["Main"] + + description = "Fusion Saver to generate EXR image sequence" selected_nodes = [] @@ -27,6 +31,10 @@ class CreateOpenEXRSaver(Creator): file_format = "OpenEXRFormat" + print(subset_name) + print(instance_data) + print(pre_create_data) + comp = get_current_comp() workdir = os.path.normpath(legacy_io.Session["AVALON_WORKDIR"]) @@ -53,17 +61,79 @@ class CreateOpenEXRSaver(Creator): saver[file_format]["Depth"] = 1 # int8 | int16 | float32 | other saver[file_format]["SaveAlpha"] = 0 + # Save all data in a "openpype.{key}" = value data + for key, value in instance_data.items(): + saver.SetData("openpype.{}".format(key), value) + def collect_instances(self): - for instance in list_instances(creator_id=self.identifier): + + comp = get_current_comp() + tools = comp.GetToolList(False, "Saver").values() + + # Allow regular non-managed savers to also be picked up + project = legacy_io.Session["AVALON_PROJECT"] + asset = legacy_io.Session["AVALON_ASSET"] + task = legacy_io.Session["AVALON_TASK"] + + for tool in tools: + + path = tool["Clip"][comp.TIME_UNDEFINED] + fname = os.path.basename(path) + fname, _ext = os.path.splitext(fname) + subset = fname.rstrip(".") + + attrs = tool.GetAttrs() + passthrough = attrs["TOOLB_PassThrough"] + variant = subset[len("render"):] + + # TODO: this should not be done this way - this should actually + # get the data as stored on the tool explicitly (however) + # that would disallow any 'regular saver' to be collected + # unless the instance data is stored on it to begin with + instance = { + # Required data + "project": project, + "asset": asset, + "subset": subset, + "task": task, + "variant": variant, + "active": not passthrough, + "family": self.family, + + # Fusion data + "tool_name": tool.Name + } + + # Use the explicit data on the saver (if any) + data = tool.GetData("openpype") + if data: + instance.update(data) + + # Add instance created_instance = CreatedInstance.from_existing(instance, self) + + # TODO: move this to lifetime data or alike + # (Doing this before CreatedInstance.from_existing wouldn't + # work because `tool` isn't JSON serializable) + created_instance["tool"] = tool + self._add_instance_to_context(created_instance) + def get_icon(self): + return qtawesome.icon("fa.eye", color="white") + def update_instances(self, update_list): + # TODO: Not sure what to do here? print(update_list) def remove_instances(self, instances): for instance in instances: + + # Remove the tool from the scene remove_instance(instance) + # Remove the collected CreatedInstance to remove from UI directly + self._remove_instance_from_context(instance) + def get_pre_create_attr_defs(self): return [] diff --git a/openpype/hosts/fusion/plugins/publish/collect_instances.py b/openpype/hosts/fusion/plugins/publish/collect_instances.py index fe60b83827..e42e7b5f70 100644 --- a/openpype/hosts/fusion/plugins/publish/collect_instances.py +++ b/openpype/hosts/fusion/plugins/publish/collect_instances.py @@ -30,7 +30,7 @@ class CollectInstances(pyblish.api.ContextPlugin): """ order = pyblish.api.CollectorOrder - label = "Collect Instances" + label = "Collect Instances Data" hosts = ["fusion"] def process(self, context): @@ -39,67 +39,47 @@ class CollectInstances(pyblish.api.ContextPlugin): from openpype.hosts.fusion.api.lib import get_frame_path comp = context.data["currentComp"] - - # Get all savers in the comp - tools = comp.GetToolList(False).values() - savers = [tool for tool in tools if tool.ID == "Saver"] - start, end, global_start, global_end = get_comp_render_range(comp) context.data["frameStart"] = int(start) context.data["frameEnd"] = int(end) context.data["frameStartHandle"] = int(global_start) context.data["frameEndHandle"] = int(global_end) - for tool in savers: + # Comp tools by name + tools = {tool.Name: tool for tool in comp.GetToolList(False).values()} + + for instance in context: + + tool_name = instance.data["tool_name"] + tool = tools[tool_name] + path = tool["Clip"][comp.TIME_UNDEFINED] - - tool_attrs = tool.GetAttrs() - active = not tool_attrs["TOOLB_PassThrough"] - - if not path: - self.log.warning("Skipping saver because it " - "has no path set: {}".format(tool.Name)) - continue - filename = os.path.basename(path) head, padding, tail = get_frame_path(filename) ext = os.path.splitext(path)[1] assert tail == ext, ("Tail does not match %s" % ext) - subset = head.rstrip("_. ") # subset is head of the filename # Include start and end render frame in label + subset = instance.data["subset"] label = "{subset} ({start}-{end})".format(subset=subset, start=int(start), end=int(end)) - - instance = context.create_instance(subset) instance.data.update({ - "asset": os.environ["AVALON_ASSET"], # todo: not a constant - "subset": subset, "path": path, "outputDir": os.path.dirname(path), - "ext": ext, # todo: should be redundant + "ext": ext, # todo: should be redundant? "label": label, + # todo: Allow custom frame range per instance "frameStart": context.data["frameStart"], "frameEnd": context.data["frameEnd"], "frameStartHandle": context.data["frameStartHandle"], "frameEndHandle": context.data["frameStartHandle"], "fps": context.data["fps"], "families": ["render", "review"], - "family": "render", - "active": active, - "publish": active # backwards compatibility + "family": "render" }) + # Add tool itself as member instance.append(tool) self.log.info("Found: \"%s\" " % path) - - # Sort/grouped by family (preserving local index) - context[:] = sorted(context, key=self.sort_by_family) - - return context - - def sort_by_family(self, instance): - """Sort by family""" - return instance.data.get("families", instance.data.get("family")) From 33cf1c3089cfa91601e9a10afc8df926ef5db95a Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 21 Sep 2022 19:57:45 +0200 Subject: [PATCH 009/912] Cleanup and fixes --- .../fusion/plugins/create/create_exr_saver.py | 59 ++++++++++--------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/openpype/hosts/fusion/plugins/create/create_exr_saver.py b/openpype/hosts/fusion/plugins/create/create_exr_saver.py index c2adb48bac..e0366c6532 100644 --- a/openpype/hosts/fusion/plugins/create/create_exr_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_exr_saver.py @@ -4,9 +4,7 @@ import qtawesome from openpype.hosts.fusion.api import ( get_current_comp, - comp_lock_and_undo_chunk, - remove_instance, - list_instances + comp_lock_and_undo_chunk ) from openpype.pipeline import ( @@ -16,25 +14,20 @@ from openpype.pipeline import ( ) -class CreateOpenEXRSaver(Creator): +class CreateSaver(Creator): identifier = "io.openpype.creators.fusion.saver" - name = "openexrDefault" - label = "Create OpenEXR Saver" + name = "saver" + label = "Create Saver" family = "render" default_variants = ["Main"] - description = "Fusion Saver to generate EXR image sequence" - - selected_nodes = [] + description = "Fusion Saver to generate image sequence" def create(self, subset_name, instance_data, pre_create_data): + # TODO: Add pre_create attributes to choose file format? file_format = "OpenEXRFormat" - print(subset_name) - print(instance_data) - print(pre_create_data) - comp = get_current_comp() workdir = os.path.normpath(legacy_io.Session["AVALON_WORKDIR"]) @@ -61,9 +54,7 @@ class CreateOpenEXRSaver(Creator): saver[file_format]["Depth"] = 1 # int8 | int16 | float32 | other saver[file_format]["SaveAlpha"] = 0 - # Save all data in a "openpype.{key}" = value data - for key, value in instance_data.items(): - saver.SetData("openpype.{}".format(key), value) + self._imprint(saver, instance_data) def collect_instances(self): @@ -112,28 +103,42 @@ class CreateOpenEXRSaver(Creator): # Add instance created_instance = CreatedInstance.from_existing(instance, self) - # TODO: move this to lifetime data or alike - # (Doing this before CreatedInstance.from_existing wouldn't - # work because `tool` isn't JSON serializable) - created_instance["tool"] = tool - self._add_instance_to_context(created_instance) def get_icon(self): return qtawesome.icon("fa.eye", color="white") def update_instances(self, update_list): - # TODO: Not sure what to do here? - print(update_list) + for update in update_list: + instance = update.instance + changes = update.changes + tool = self._get_instance_tool(instance) + self._imprint(tool, changes) def remove_instances(self, instances): for instance in instances: - # Remove the tool from the scene - remove_instance(instance) + tool = self._get_instance_tool(instance) + if tool: + tool.Delete() # Remove the collected CreatedInstance to remove from UI directly self._remove_instance_from_context(instance) - def get_pre_create_attr_defs(self): - return [] + def _imprint(self, tool, data): + + # Save all data in a "openpype.{key}" = value data + for key, value in data.items(): + tool.SetData("openpype.{}".format(key), value) + + def _get_instance_tool(self, instance): + # finds tool name of instance in currently active comp + # TODO: assign `tool` as some sort of lifetime data or alike so that + # the actual tool can be retrieved in current session. We can't store + # it in the instance itself since instance needs to be serializable + comp = get_current_comp() + tool_name = instance["tool_name"] + print(tool_name) + return { + tool.Name: tool for tool in comp.GetToolList(False).values() + }.get(tool_name) From 450a471c42a13d670eaf96a4323c92629c0b20a5 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 21 Sep 2022 19:58:42 +0200 Subject: [PATCH 010/912] Rename `create_exr_saver.py` -> `create_saver.py` --- .../plugins/create/{create_exr_saver.py => create_saver.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename openpype/hosts/fusion/plugins/create/{create_exr_saver.py => create_saver.py} (100%) diff --git a/openpype/hosts/fusion/plugins/create/create_exr_saver.py b/openpype/hosts/fusion/plugins/create/create_saver.py similarity index 100% rename from openpype/hosts/fusion/plugins/create/create_exr_saver.py rename to openpype/hosts/fusion/plugins/create/create_saver.py From 7a046dd446bef43606317df47c487b7809701a81 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 21 Sep 2022 20:02:58 +0200 Subject: [PATCH 011/912] Register the saver directly on create --- openpype/hosts/fusion/plugins/create/create_saver.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/openpype/hosts/fusion/plugins/create/create_saver.py b/openpype/hosts/fusion/plugins/create/create_saver.py index e0366c6532..a0ab1c1fcf 100644 --- a/openpype/hosts/fusion/plugins/create/create_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_saver.py @@ -56,6 +56,16 @@ class CreateSaver(Creator): self._imprint(saver, instance_data) + # Register the CreatedInstance + instance = CreatedInstance( + family=self.family, + subset_name=subset_name, + instance_data=instance_data, + creator=self) + self._add_instance_to_context(instance) + + return instance + def collect_instances(self): comp = get_current_comp() From cd0825756e753de983c651413affdcaad110120a Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 21 Sep 2022 20:04:17 +0200 Subject: [PATCH 012/912] Fix keyword --- openpype/hosts/fusion/plugins/create/create_saver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/plugins/create/create_saver.py b/openpype/hosts/fusion/plugins/create/create_saver.py index a0ab1c1fcf..c2c9ad1cb7 100644 --- a/openpype/hosts/fusion/plugins/create/create_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_saver.py @@ -60,7 +60,7 @@ class CreateSaver(Creator): instance = CreatedInstance( family=self.family, subset_name=subset_name, - instance_data=instance_data, + data=instance_data, creator=self) self._add_instance_to_context(instance) From 01167e84caf8e1e047ecffc93d7350b34d8ada46 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 21 Sep 2022 23:11:05 +0200 Subject: [PATCH 013/912] Barebones refactor of validators to raise PublishValidationError --- .../publish/validate_background_depth.py | 7 +++- .../plugins/publish/validate_comp_saved.py | 7 +++- .../publish/validate_create_folder_checked.py | 6 ++- .../validate_filename_has_extension.py | 4 +- .../publish/validate_saver_has_input.py | 8 +++- .../publish/validate_saver_passthrough.py | 7 ++-- .../publish/validate_unique_subsets.py | 41 ++++++++++++++----- 7 files changed, 57 insertions(+), 23 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/validate_background_depth.py b/openpype/hosts/fusion/plugins/publish/validate_background_depth.py index 4268fab528..f057989535 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_background_depth.py +++ b/openpype/hosts/fusion/plugins/publish/validate_background_depth.py @@ -1,6 +1,7 @@ import pyblish.api from openpype.pipeline.publish import RepairAction +from openpype.pipeline import PublishValidationError class ValidateBackgroundDepth(pyblish.api.InstancePlugin): @@ -29,8 +30,10 @@ class ValidateBackgroundDepth(pyblish.api.InstancePlugin): def process(self, instance): invalid = self.get_invalid(instance) if invalid: - raise RuntimeError("Found %i nodes which are not set to float32" - % len(invalid)) + raise PublishValidationError( + "Found {} Backgrounds tools which" + " are not set to float32".format(len(invalid)), + title=self.label) @classmethod def repair(cls, instance): diff --git a/openpype/hosts/fusion/plugins/publish/validate_comp_saved.py b/openpype/hosts/fusion/plugins/publish/validate_comp_saved.py index cabe65af6e..748047e8cf 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_comp_saved.py +++ b/openpype/hosts/fusion/plugins/publish/validate_comp_saved.py @@ -1,6 +1,7 @@ import os import pyblish.api +from openpype.pipeline import PublishValidationError class ValidateFusionCompSaved(pyblish.api.ContextPlugin): @@ -19,10 +20,12 @@ class ValidateFusionCompSaved(pyblish.api.ContextPlugin): filename = attrs["COMPS_FileName"] if not filename: - raise RuntimeError("Comp is not saved.") + raise PublishValidationError("Comp is not saved.", + title=self.label) if not os.path.exists(filename): - raise RuntimeError("Comp file does not exist: %s" % filename) + raise PublishValidationError( + "Comp file does not exist: %s" % filename, title=self.label) if attrs["COMPB_Modified"]: self.log.warning("Comp is modified. Save your comp to ensure your " diff --git a/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py b/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py index f6beefefc1..3674b33644 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py +++ b/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py @@ -1,6 +1,7 @@ import pyblish.api from openpype.pipeline.publish import RepairAction +from openpype.pipeline import PublishValidationError class ValidateCreateFolderChecked(pyblish.api.InstancePlugin): @@ -31,8 +32,9 @@ class ValidateCreateFolderChecked(pyblish.api.InstancePlugin): def process(self, instance): invalid = self.get_invalid(instance) if invalid: - raise RuntimeError("Found Saver with Create Folder During " - "Render checked off") + raise PublishValidationError( + "Found Saver with Create Folder During Render checked off", + title=self.label) @classmethod def repair(cls, instance): diff --git a/openpype/hosts/fusion/plugins/publish/validate_filename_has_extension.py b/openpype/hosts/fusion/plugins/publish/validate_filename_has_extension.py index 4795a2aa05..22f1db809c 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_filename_has_extension.py +++ b/openpype/hosts/fusion/plugins/publish/validate_filename_has_extension.py @@ -1,6 +1,7 @@ import os import pyblish.api +from openpype.pipeline import PublishValidationError class ValidateFilenameHasExtension(pyblish.api.InstancePlugin): @@ -20,7 +21,8 @@ class ValidateFilenameHasExtension(pyblish.api.InstancePlugin): def process(self, instance): invalid = self.get_invalid(instance) if invalid: - raise RuntimeError("Found Saver without an extension") + raise PublishValidationError("Found Saver without an extension", + title=self.label) @classmethod def get_invalid(cls, instance): diff --git a/openpype/hosts/fusion/plugins/publish/validate_saver_has_input.py b/openpype/hosts/fusion/plugins/publish/validate_saver_has_input.py index 7243b44a3e..8d961525f0 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_saver_has_input.py +++ b/openpype/hosts/fusion/plugins/publish/validate_saver_has_input.py @@ -1,4 +1,5 @@ import pyblish.api +from openpype.pipeline import PublishValidationError class ValidateSaverHasInput(pyblish.api.InstancePlugin): @@ -25,5 +26,8 @@ class ValidateSaverHasInput(pyblish.api.InstancePlugin): def process(self, instance): invalid = self.get_invalid(instance) if invalid: - raise RuntimeError("Saver has no incoming connection: " - "{} ({})".format(instance, invalid[0].Name)) + saver_name = invalid[0].Name + raise PublishValidationError( + "Saver has no incoming connection: {} ({})".format(instance, + saver_name), + title=self.label) diff --git a/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py b/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py index aed3835de3..c191d6669c 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py +++ b/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py @@ -1,4 +1,5 @@ import pyblish.api +from openpype.pipeline import PublishValidationError class ValidateSaverPassthrough(pyblish.api.ContextPlugin): @@ -27,8 +28,8 @@ class ValidateSaverPassthrough(pyblish.api.ContextPlugin): if invalid_instances: self.log.info("Reset pyblish to collect your current scene state, " "that should fix error.") - raise RuntimeError("Invalid instances: " - "{0}".format(invalid_instances)) + raise PublishValidationError( + "Invalid instances: {0}".format(invalid_instances)) def is_invalid(self, instance): @@ -36,7 +37,7 @@ class ValidateSaverPassthrough(pyblish.api.ContextPlugin): attr = saver.GetAttrs() active = not attr["TOOLB_PassThrough"] - if active != instance.data["publish"]: + if active != instance.data.get("publish", True): self.log.info("Saver has different passthrough state than " "Pyblish: {} ({})".format(instance, saver.Name)) return [saver] diff --git a/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py b/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py index b218a311ba..b78f185a3a 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py +++ b/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py @@ -1,7 +1,10 @@ +from collections import defaultdict + import pyblish.api +from openpype.pipeline import PublishValidationError -class ValidateUniqueSubsets(pyblish.api.InstancePlugin): +class ValidateUniqueSubsets(pyblish.api.ContextPlugin): """Ensure all instances have a unique subset name""" order = pyblish.api.ValidatorOrder @@ -10,20 +13,36 @@ class ValidateUniqueSubsets(pyblish.api.InstancePlugin): hosts = ["fusion"] @classmethod - def get_invalid(cls, instance): + def get_invalid(cls, context): - context = instance.context - subset = instance.data["subset"] - for other_instance in context: - if other_instance == instance: - continue + # Collect instances per subset per asset + instances_per_subset_asset = defaultdict(lambda: defaultdict(list)) + for instance in context: + asset = instance.data.get("asset", context.data.get("asset")) + subset = instance.data.get("subset", context.data.get("subset")) + instances_per_subset_asset[asset][subset].append(instance) - if other_instance.data["subset"] == subset: - return [instance] # current instance is invalid + # Find which asset + subset combination has more than one instance + # Those are considered invalid because they'd integrate to the same + # destination. + invalid = [] + for asset, instances_per_subset in instances_per_subset_asset.items(): + for subset, instances in instances_per_subset.items(): + if len(instances) > 1: + cls.log.warning( + "{asset} > {subset} used by more than " + "one instance: {instances}".format( + asset=asset, + subset=subset, + instances=instances + )) + invalid.extend(instances) - return [] + return invalid def process(self, instance): invalid = self.get_invalid(instance) if invalid: - raise RuntimeError("Animation content is invalid. See log.") + raise PublishValidationError("Multiple instances are set to " + "the same asset > subset.", + title=self.label) From ce954651182b2f4c526f981fcd5c086989f23b36 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 21 Sep 2022 23:17:31 +0200 Subject: [PATCH 014/912] Fix bugs in Creator --- .../fusion/plugins/create/create_saver.py | 154 +++++++++++------- 1 file changed, 99 insertions(+), 55 deletions(-) diff --git a/openpype/hosts/fusion/plugins/create/create_saver.py b/openpype/hosts/fusion/plugins/create/create_saver.py index c2c9ad1cb7..347aaaf497 100644 --- a/openpype/hosts/fusion/plugins/create/create_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_saver.py @@ -29,20 +29,12 @@ class CreateSaver(Creator): file_format = "OpenEXRFormat" comp = get_current_comp() - - workdir = os.path.normpath(legacy_io.Session["AVALON_WORKDIR"]) - - filename = "{}..exr".format(subset_name) - filepath = os.path.join(workdir, "render", filename) - with comp_lock_and_undo_chunk(comp): args = (-32768, -32768) # Magical position numbers saver = comp.AddTool("Saver", *args) - saver.SetAttrs({"TOOLS_Name": subset_name}) - # Setting input attributes is different from basic attributes - # Not confused with "MainInputAttributes" which - saver["Clip"] = filepath + self._update_tool_with_data(saver, data=instance_data) + saver["OutputFormat"] = file_format # Check file format settings are available @@ -54,6 +46,9 @@ class CreateSaver(Creator): saver[file_format]["Depth"] = 1 # int8 | int16 | float32 | other saver[file_format]["SaveAlpha"] = 0 + # Fusion data for the instance data + instance_data["tool_name"] = saver.Name + self._imprint(saver, instance_data) # Register the CreatedInstance @@ -70,49 +65,17 @@ class CreateSaver(Creator): comp = get_current_comp() tools = comp.GetToolList(False, "Saver").values() - - # Allow regular non-managed savers to also be picked up - project = legacy_io.Session["AVALON_PROJECT"] - asset = legacy_io.Session["AVALON_ASSET"] - task = legacy_io.Session["AVALON_TASK"] - for tool in tools: - path = tool["Clip"][comp.TIME_UNDEFINED] - fname = os.path.basename(path) - fname, _ext = os.path.splitext(fname) - subset = fname.rstrip(".") + data = self.get_managed_tool_data(tool) + if not data: + data = self._collect_unmanaged_saver(tool) - attrs = tool.GetAttrs() - passthrough = attrs["TOOLB_PassThrough"] - variant = subset[len("render"):] - - # TODO: this should not be done this way - this should actually - # get the data as stored on the tool explicitly (however) - # that would disallow any 'regular saver' to be collected - # unless the instance data is stored on it to begin with - instance = { - # Required data - "project": project, - "asset": asset, - "subset": subset, - "task": task, - "variant": variant, - "active": not passthrough, - "family": self.family, - - # Fusion data - "tool_name": tool.Name - } - - # Use the explicit data on the saver (if any) - data = tool.GetData("openpype") - if data: - instance.update(data) + # Collect non-stored data + data["tool_name"] = tool.Name # Add instance - created_instance = CreatedInstance.from_existing(instance, self) - + created_instance = CreatedInstance.from_existing(data, self) self._add_instance_to_context(created_instance) def get_icon(self): @@ -121,9 +84,18 @@ class CreateSaver(Creator): def update_instances(self, update_list): for update in update_list: instance = update.instance - changes = update.changes + + # Get the new values after the changes by key, ignore old value + new_data = { + key: new for key, (_old, new) in update.changes.items() + } + tool = self._get_instance_tool(instance) - self._imprint(tool, changes) + self._update_tool_with_data(tool, new_data) + self._imprint(tool, new_data) + + # Ensure tool name is up-to-date + instance["tool_name"] = tool.Name def remove_instances(self, instances): for instance in instances: @@ -136,19 +108,91 @@ class CreateSaver(Creator): self._remove_instance_from_context(instance) def _imprint(self, tool, data): - # Save all data in a "openpype.{key}" = value data for key, value in data.items(): tool.SetData("openpype.{}".format(key), value) def _get_instance_tool(self, instance): # finds tool name of instance in currently active comp - # TODO: assign `tool` as some sort of lifetime data or alike so that - # the actual tool can be retrieved in current session. We can't store - # it in the instance itself since instance needs to be serializable + # TODO: assign `tool` as 'lifetime' data instead of name so the + # tool can be retrieved in current session. We can't store currently + # in the CreatedInstance data because it needs to be serializable comp = get_current_comp() tool_name = instance["tool_name"] - print(tool_name) return { tool.Name: tool for tool in comp.GetToolList(False).values() }.get(tool_name) + + def _update_tool_with_data(self, tool, data): + """Update tool node name and output path based on subset data""" + if "subset" not in data: + return + + original_subset = tool.GetData("openpype.subset") + subset = data["subset"] + if original_subset != subset: + # Subset change detected + # Update output filepath + workdir = os.path.normpath(legacy_io.Session["AVALON_WORKDIR"]) + filename = "{}..exr".format(subset) + filepath = os.path.join(workdir, "render", subset, filename) + tool["Clip"] = filepath + + # Rename tool + if tool.Name != subset: + print(f"Renaming {tool.Name} -> {subset}") + tool.SetAttrs({"TOOLS_Name": subset}) + + def _collect_unmanaged_saver(self, tool): + + # TODO: this should not be done this way - this should actually + # get the data as stored on the tool explicitly (however) + # that would disallow any 'regular saver' to be collected + # unless the instance data is stored on it to begin with + + print("Collecting unmanaged saver..") + comp = tool.Comp() + + # Allow regular non-managed savers to also be picked up + project = legacy_io.Session["AVALON_PROJECT"] + asset = legacy_io.Session["AVALON_ASSET"] + task = legacy_io.Session["AVALON_TASK"] + + path = tool["Clip"][comp.TIME_UNDEFINED] + fname = os.path.basename(path) + fname, _ext = os.path.splitext(fname) + subset = fname.rstrip(".") + + attrs = tool.GetAttrs() + passthrough = attrs["TOOLB_PassThrough"] + variant = subset[len("render"):] + return { + # Required data + "project": project, + "asset": asset, + "subset": subset, + "task": task, + "variant": variant, + "active": not passthrough, + "family": self.family, + + # Unique identifier for instance and this creator + "id": "pyblish.avalon.instance", + "creator_identifier": self.identifier + } + + def get_managed_tool_data(self, tool): + """Return data of the tool if it matches creator identifier""" + data = tool.GetData('openpype') + if not isinstance(data, dict): + return + + required = { + "id": "pyblish.avalon.instance", + "creator_identifier": self.identifier + } + for key, value in required.items(): + if key not in data or data[key] != value: + return + + return data From af8662c87525012a8c7fd9915dcc1f2ce725c967 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 21 Sep 2022 23:24:28 +0200 Subject: [PATCH 015/912] Fix refactor to ContextPlugin --- .../hosts/fusion/plugins/publish/validate_unique_subsets.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py b/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py index b78f185a3a..5f0f93f764 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py +++ b/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py @@ -40,8 +40,8 @@ class ValidateUniqueSubsets(pyblish.api.ContextPlugin): return invalid - def process(self, instance): - invalid = self.get_invalid(instance) + def process(self, context): + invalid = self.get_invalid(context) if invalid: raise PublishValidationError("Multiple instances are set to " "the same asset > subset.", From fe857b84429cda78235084d16c32ba3e58701aba Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 21 Sep 2022 23:26:03 +0200 Subject: [PATCH 016/912] Add title to error --- .../hosts/fusion/plugins/publish/validate_saver_passthrough.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py b/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py index c191d6669c..bbafd8949e 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py +++ b/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py @@ -29,7 +29,8 @@ class ValidateSaverPassthrough(pyblish.api.ContextPlugin): self.log.info("Reset pyblish to collect your current scene state, " "that should fix error.") raise PublishValidationError( - "Invalid instances: {0}".format(invalid_instances)) + "Invalid instances: {0}".format(invalid_instances), + title=self.label) def is_invalid(self, instance): From 6abfabed4057292419059fa193bf5ffcbc8b9d21 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 21 Sep 2022 23:33:13 +0200 Subject: [PATCH 017/912] Fix missing import --- openpype/hosts/fusion/api/pipeline.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/fusion/api/pipeline.py b/openpype/hosts/fusion/api/pipeline.py index 1587381b1a..6fc3902949 100644 --- a/openpype/hosts/fusion/api/pipeline.py +++ b/openpype/hosts/fusion/api/pipeline.py @@ -2,6 +2,7 @@ Basic avalon integration """ import os +import sys import logging import contextlib From bdfe2414583480c06f0ee35113b0deea3fced1c6 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 23 Sep 2022 17:31:35 +0200 Subject: [PATCH 018/912] Refactor new publish logic to make use of "transientData" on the Creator --- .../fusion/plugins/create/create_saver.py | 33 +++++++------------ .../plugins/publish/collect_instances.py | 11 +++---- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/openpype/hosts/fusion/plugins/create/create_saver.py b/openpype/hosts/fusion/plugins/create/create_saver.py index 347aaaf497..b3a912c56a 100644 --- a/openpype/hosts/fusion/plugins/create/create_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_saver.py @@ -46,9 +46,6 @@ class CreateSaver(Creator): saver[file_format]["Depth"] = 1 # int8 | int16 | float32 | other saver[file_format]["SaveAlpha"] = 0 - # Fusion data for the instance data - instance_data["tool_name"] = saver.Name - self._imprint(saver, instance_data) # Register the CreatedInstance @@ -57,6 +54,10 @@ class CreateSaver(Creator): subset_name=subset_name, data=instance_data, creator=self) + + # Insert the transient data + instance.transient_data["tool"] = saver + self._add_instance_to_context(instance) return instance @@ -71,11 +72,12 @@ class CreateSaver(Creator): if not data: data = self._collect_unmanaged_saver(tool) - # Collect non-stored data - data["tool_name"] = tool.Name - # Add instance created_instance = CreatedInstance.from_existing(data, self) + + # Collect transient data + created_instance.transient_data["tool"] = tool + self._add_instance_to_context(created_instance) def get_icon(self): @@ -90,17 +92,15 @@ class CreateSaver(Creator): key: new for key, (_old, new) in update.changes.items() } - tool = self._get_instance_tool(instance) + tool = instance.transient_data["tool"] self._update_tool_with_data(tool, new_data) self._imprint(tool, new_data) - # Ensure tool name is up-to-date - instance["tool_name"] = tool.Name - def remove_instances(self, instances): for instance in instances: # Remove the tool from the scene - tool = self._get_instance_tool(instance) + + tool = instance.transient_data["tool"] if tool: tool.Delete() @@ -112,17 +112,6 @@ class CreateSaver(Creator): for key, value in data.items(): tool.SetData("openpype.{}".format(key), value) - def _get_instance_tool(self, instance): - # finds tool name of instance in currently active comp - # TODO: assign `tool` as 'lifetime' data instead of name so the - # tool can be retrieved in current session. We can't store currently - # in the CreatedInstance data because it needs to be serializable - comp = get_current_comp() - tool_name = instance["tool_name"] - return { - tool.Name: tool for tool in comp.GetToolList(False).values() - }.get(tool_name) - def _update_tool_with_data(self, tool, data): """Update tool node name and output path based on subset data""" if "subset" not in data: diff --git a/openpype/hosts/fusion/plugins/publish/collect_instances.py b/openpype/hosts/fusion/plugins/publish/collect_instances.py index e42e7b5f70..2f3e82fded 100644 --- a/openpype/hosts/fusion/plugins/publish/collect_instances.py +++ b/openpype/hosts/fusion/plugins/publish/collect_instances.py @@ -45,13 +45,9 @@ class CollectInstances(pyblish.api.ContextPlugin): context.data["frameStartHandle"] = int(global_start) context.data["frameEndHandle"] = int(global_end) - # Comp tools by name - tools = {tool.Name: tool for tool in comp.GetToolList(False).values()} - for instance in context: - tool_name = instance.data["tool_name"] - tool = tools[tool_name] + tool = instance.data["transientData"]["tool"] path = tool["Clip"][comp.TIME_UNDEFINED] filename = os.path.basename(path) @@ -76,7 +72,10 @@ class CollectInstances(pyblish.api.ContextPlugin): "frameEndHandle": context.data["frameStartHandle"], "fps": context.data["fps"], "families": ["render", "review"], - "family": "render" + "family": "render", + + # Backwards compatibility: embed tool in instance.data + "tool": tool }) # Add tool itself as member From 87621c14f5d47de295ae476879c00fbbe7efcf14 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 23 Sep 2022 17:34:47 +0200 Subject: [PATCH 019/912] Refactor `INewPublisher` to `IPublishHost` --- openpype/hosts/fusion/api/pipeline.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/api/pipeline.py b/openpype/hosts/fusion/api/pipeline.py index 6fc3902949..3e30c5eaf5 100644 --- a/openpype/hosts/fusion/api/pipeline.py +++ b/openpype/hosts/fusion/api/pipeline.py @@ -20,7 +20,7 @@ from openpype.pipeline import ( ) from openpype.pipeline.load import any_outdated_containers from openpype.hosts.fusion import FUSION_HOST_DIR -from openpype.host import HostBase, IWorkfileHost, ILoadHost, INewPublisher +from openpype.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost from openpype.tools.utils import host_tools @@ -48,7 +48,7 @@ class CompLogHandler(logging.Handler): comp.Print(entry) -class FusionHost(HostBase, IWorkfileHost, ILoadHost, INewPublisher): +class FusionHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): name = "fusion" def install(self): From 11bd9e8bb1f5a62c501f4fe4388c79fe82d8bc8a Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 23 Sep 2022 17:44:05 +0200 Subject: [PATCH 020/912] Add Select Invalid Action --- openpype/hosts/fusion/api/action.py | 54 +++++++++++++++++++ .../publish/validate_saver_has_input.py | 3 ++ 2 files changed, 57 insertions(+) create mode 100644 openpype/hosts/fusion/api/action.py diff --git a/openpype/hosts/fusion/api/action.py b/openpype/hosts/fusion/api/action.py new file mode 100644 index 0000000000..1750920950 --- /dev/null +++ b/openpype/hosts/fusion/api/action.py @@ -0,0 +1,54 @@ +import pyblish.api + + +from openpype.hosts.fusion.api.lib import get_current_comp +from openpype.pipeline.publish import get_errored_instances_from_context + + +class SelectInvalidAction(pyblish.api.Action): + """Select invalid nodes in Maya when plug-in failed. + + To retrieve the invalid nodes this assumes a static `get_invalid()` + method is available on the plugin. + + """ + label = "Select invalid" + on = "failed" # This action is only available on a failed plug-in + icon = "search" # Icon from Awesome Icon + + def process(self, context, plugin): + errored_instances = get_errored_instances_from_context(context) + + # Apply pyblish.logic to get the instances for the plug-in + instances = pyblish.api.instances_by_plugin(errored_instances, plugin) + + # Get the invalid nodes for the plug-ins + self.log.info("Finding invalid nodes..") + invalid = list() + for instance in instances: + invalid_nodes = plugin.get_invalid(instance) + if invalid_nodes: + if isinstance(invalid_nodes, (list, tuple)): + invalid.extend(invalid_nodes) + else: + self.log.warning("Plug-in returned to be invalid, " + "but has no selectable nodes.") + + if not invalid: + # Assume relevant comp is current comp and clear selection + self.log.info("No invalid tools found.") + comp = get_current_comp() + flow = comp.CurrentFrame.FlowView + flow.Select() # No args equals clearing selection + return + + # Assume a single comp + first_tool = invalid[0] + comp = first_tool.Comp() + flow = comp.CurrentFrame.FlowView + flow.Select() # No args equals clearing selection + names = set() + for tool in invalid: + flow.Select(tool, True) + names.add(tool.Name) + self.log.info("Selecting invalid tools: %s" % ", ".join(sorted(names))) diff --git a/openpype/hosts/fusion/plugins/publish/validate_saver_has_input.py b/openpype/hosts/fusion/plugins/publish/validate_saver_has_input.py index 8d961525f0..e02125f531 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_saver_has_input.py +++ b/openpype/hosts/fusion/plugins/publish/validate_saver_has_input.py @@ -1,6 +1,8 @@ import pyblish.api from openpype.pipeline import PublishValidationError +from openpype.hosts.fusion.api.action import SelectInvalidAction + class ValidateSaverHasInput(pyblish.api.InstancePlugin): """Validate saver has incoming connection @@ -13,6 +15,7 @@ class ValidateSaverHasInput(pyblish.api.InstancePlugin): label = "Validate Saver Has Input" families = ["render"] hosts = ["fusion"] + actions = [SelectInvalidAction] @classmethod def get_invalid(cls, instance): From 0f1ed036231d91ba6f8105d85b0c6e341e5b6487 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 23 Sep 2022 17:47:19 +0200 Subject: [PATCH 021/912] Add Select Invalid action to more validators --- .../fusion/plugins/publish/validate_background_depth.py | 4 ++++ .../plugins/publish/validate_create_folder_checked.py | 3 +++ .../plugins/publish/validate_filename_has_extension.py | 3 +++ .../fusion/plugins/publish/validate_saver_passthrough.py | 3 +++ .../hosts/fusion/plugins/publish/validate_unique_subsets.py | 6 ++++++ 5 files changed, 19 insertions(+) diff --git a/openpype/hosts/fusion/plugins/publish/validate_background_depth.py b/openpype/hosts/fusion/plugins/publish/validate_background_depth.py index f057989535..261533de01 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_background_depth.py +++ b/openpype/hosts/fusion/plugins/publish/validate_background_depth.py @@ -3,6 +3,8 @@ import pyblish.api from openpype.pipeline.publish import RepairAction from openpype.pipeline import PublishValidationError +from openpype.hosts.fusion.api.action import SelectInvalidAction + class ValidateBackgroundDepth(pyblish.api.InstancePlugin): """Validate if all Background tool are set to float32 bit""" @@ -14,6 +16,8 @@ class ValidateBackgroundDepth(pyblish.api.InstancePlugin): families = ["render"] optional = True + actions = [SelectInvalidAction] + @classmethod def get_invalid(cls, instance): diff --git a/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py b/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py index 3674b33644..ba943abacb 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py +++ b/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py @@ -3,6 +3,8 @@ import pyblish.api from openpype.pipeline.publish import RepairAction from openpype.pipeline import PublishValidationError +from openpype.hosts.fusion.api.action import SelectInvalidAction + class ValidateCreateFolderChecked(pyblish.api.InstancePlugin): """Valid if all savers have the input attribute CreateDir checked on @@ -16,6 +18,7 @@ class ValidateCreateFolderChecked(pyblish.api.InstancePlugin): label = "Validate Create Folder Checked" families = ["render"] hosts = ["fusion"] + actions = [SelectInvalidAction] @classmethod def get_invalid(cls, instance): diff --git a/openpype/hosts/fusion/plugins/publish/validate_filename_has_extension.py b/openpype/hosts/fusion/plugins/publish/validate_filename_has_extension.py index 22f1db809c..bbba2dde6e 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_filename_has_extension.py +++ b/openpype/hosts/fusion/plugins/publish/validate_filename_has_extension.py @@ -3,6 +3,8 @@ import os import pyblish.api from openpype.pipeline import PublishValidationError +from openpype.hosts.fusion.api.action import SelectInvalidAction + class ValidateFilenameHasExtension(pyblish.api.InstancePlugin): """Ensure the Saver has an extension in the filename path @@ -17,6 +19,7 @@ class ValidateFilenameHasExtension(pyblish.api.InstancePlugin): label = "Validate Filename Has Extension" families = ["render"] hosts = ["fusion"] + actions = [SelectInvalidAction] def process(self, instance): invalid = self.get_invalid(instance) diff --git a/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py b/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py index bbafd8949e..56f2e7e6b8 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py +++ b/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py @@ -1,6 +1,8 @@ import pyblish.api from openpype.pipeline import PublishValidationError +from openpype.hosts.fusion.api.action import SelectInvalidAction + class ValidateSaverPassthrough(pyblish.api.ContextPlugin): """Validate saver passthrough is similar to Pyblish publish state""" @@ -9,6 +11,7 @@ class ValidateSaverPassthrough(pyblish.api.ContextPlugin): label = "Validate Saver Passthrough" families = ["render"] hosts = ["fusion"] + actions = [SelectInvalidAction] def process(self, context): diff --git a/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py b/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py index 5f0f93f764..28bab59949 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py +++ b/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py @@ -3,6 +3,8 @@ from collections import defaultdict import pyblish.api from openpype.pipeline import PublishValidationError +from openpype.hosts.fusion.api.action import SelectInvalidAction + class ValidateUniqueSubsets(pyblish.api.ContextPlugin): """Ensure all instances have a unique subset name""" @@ -11,6 +13,7 @@ class ValidateUniqueSubsets(pyblish.api.ContextPlugin): label = "Validate Unique Subsets" families = ["render"] hosts = ["fusion"] + actions = [SelectInvalidAction] @classmethod def get_invalid(cls, context): @@ -38,6 +41,9 @@ class ValidateUniqueSubsets(pyblish.api.ContextPlugin): )) invalid.extend(instances) + # Return tools for the invalid instances so they can be selected + invalid = [instance.data["tool"] for instance in invalid] + return invalid def process(self, context): From b823f3d80e0c898c53ca8aeda2536f8f114f3243 Mon Sep 17 00:00:00 2001 From: Allan Ihsan Date: Mon, 26 Sep 2022 08:22:41 +0300 Subject: [PATCH 022/912] 8c4e93cfc Merge branch 'develop' into enhancement/OP-3783_Maya-Playblast-Options --- .../defaults/project_settings/maya.json | 5 ++++ .../schemas/schema_maya_capture.json | 25 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index 76ef0a7338..daaa8da8e6 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -712,6 +712,11 @@ "motionBlurEnable": false, "motionBlurSampleCount": 8, "motionBlurShutterOpenFraction": 0.2, + "xray": false, + "udm": false, + "wos": false, + "jointXray": false, + "backfaceCulling": false, "cameras": false, "clipGhosts": false, "deformers": false, diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json index 62c33f55fc..02c25e8a03 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json @@ -348,6 +348,31 @@ "type": "label", "label": "Show" }, + { + "type": "boolean", + "key": "xray", + "label": "Toggle X-Ray Mode" + }, + { + "type": "boolean", + "key": "udm", + "label": "Use Default Material" + }, + { + "type": "boolean", + "key": "wos", + "label": "Wireframe On Shaded" + }, + { + "type": "boolean", + "key": "jointXray", + "label": "Toggle Joint X-Ray Mode" + }, + { + "type": "boolean", + "key": "backfaceCulling", + "label": "Enable Back Face Culling" + }, { "type": "boolean", "key": "cameras", From 486589ef3479af1907f813b08a20c319e5f60141 Mon Sep 17 00:00:00 2001 From: Allan Ihsan Date: Mon, 26 Sep 2022 08:24:50 +0300 Subject: [PATCH 023/912] 8c4e93cfc Merge branch 'develop' into enhancement/OP-3783_Maya-Playblast-Options --- openpype/settings/defaults/project_anatomy/attributes.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openpype/settings/defaults/project_anatomy/attributes.json b/openpype/settings/defaults/project_anatomy/attributes.json index 983ac603f9..bf8bbef8de 100644 --- a/openpype/settings/defaults/project_anatomy/attributes.json +++ b/openpype/settings/defaults/project_anatomy/attributes.json @@ -19,8 +19,7 @@ "blender/2-91", "harmony/20", "photoshop/2021", - "aftereffects/2021", - "unreal/4-26" + "aftereffects/2021" ], "tools_env": [], "active": true From 45732d884b89b9336bf8bb4e0387ac91cc916539 Mon Sep 17 00:00:00 2001 From: Allan Ihsan Date: Mon, 26 Sep 2022 08:25:45 +0300 Subject: [PATCH 024/912] 8c4e93cfc Merge branch 'develop' into enhancement/OP-3783_Maya-Playblast-Options --- .../schemas/schema_maya_capture.json | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json index 02c25e8a03..c3d051b56e 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json @@ -352,6 +352,34 @@ "type": "boolean", "key": "xray", "label": "Toggle X-Ray Mode" +<<<<<<< Updated upstream +======= + }, + { + "type": "boolean", + "key": "udm", + "label": "Use Default Material" + }, + { + "type": "boolean", + "key": "wos", + "label": "Wireframe On Shaded" + }, + { + "type": "boolean", + "key": "jointXray", + "label": "Toggle Joint X-Ray Mode" + }, + { + "type": "boolean", + "key": "backfaceCulling", + "label": "Enable Back Face Culling" + }, + { + "type": "boolean", + "key": "cameras", + "label": "cameras" +>>>>>>> Stashed changes }, { "type": "boolean", From 94cb7bee1f4b8c54e26b0364c3f272734305bba0 Mon Sep 17 00:00:00 2001 From: "Allan I. A" <76656700+Allan-I@users.noreply.github.com> Date: Mon, 26 Sep 2022 14:11:11 +0300 Subject: [PATCH 025/912] Move schema to a higher location. Co-authored-by: Roy Nieterau --- .../schemas/schema_maya_capture.json | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json index 02c25e8a03..88c994ca8f 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json @@ -349,10 +349,9 @@ "label": "Show" }, { - "type": "boolean", - "key": "xray", - "label": "Toggle X-Ray Mode" - }, + "type": "label", + "label": "Shading" + }, { "type": "boolean", "key": "udm", @@ -363,15 +362,20 @@ "key": "wos", "label": "Wireframe On Shaded" }, + { + "type": "boolean", + "key": "xray", + "label": "X-Ray" + }, { "type": "boolean", "key": "jointXray", - "label": "Toggle Joint X-Ray Mode" + "label": "X-Ray Joints" }, { "type": "boolean", "key": "backfaceCulling", - "label": "Enable Back Face Culling" + "label": "Backface Culling" }, { "type": "boolean", From cfddc9f9fe2d96b88b91c9a368af2a79c0a00550 Mon Sep 17 00:00:00 2001 From: "Allan I. A" <76656700+Allan-I@users.noreply.github.com> Date: Mon, 26 Sep 2022 14:25:06 +0300 Subject: [PATCH 026/912] Update openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json Co-authored-by: Roy Nieterau --- .../schemas/projects_schema/schemas/schema_maya_capture.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json index 88c994ca8f..1b9ef2c30b 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json @@ -354,12 +354,12 @@ }, { "type": "boolean", - "key": "udm", + "key": "useDefaultMaterial", "label": "Use Default Material" }, { "type": "boolean", - "key": "wos", + "key": "wireframeOnShaded", "label": "Wireframe On Shaded" }, { From 6e7309ea2dd077843e54456cd9b263651d73aa65 Mon Sep 17 00:00:00 2001 From: "Allan I. A" <76656700+Allan-I@users.noreply.github.com> Date: Mon, 26 Sep 2022 14:25:23 +0300 Subject: [PATCH 027/912] Update openpype/settings/defaults/project_settings/maya.json Co-authored-by: Roy Nieterau --- openpype/settings/defaults/project_settings/maya.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index daaa8da8e6..b873827df0 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -713,8 +713,8 @@ "motionBlurSampleCount": 8, "motionBlurShutterOpenFraction": 0.2, "xray": false, - "udm": false, - "wos": false, + "useDefaultMaterial": false, + "wireframeOnShaded": false, "jointXray": false, "backfaceCulling": false, "cameras": false, From a64a551fa19a472c4efe36528051394866f37cf1 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 27 Sep 2022 10:56:34 +0200 Subject: [PATCH 028/912] Tweak label --- openpype/hosts/fusion/plugins/create/create_saver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/plugins/create/create_saver.py b/openpype/hosts/fusion/plugins/create/create_saver.py index b3a912c56a..99aa7583f1 100644 --- a/openpype/hosts/fusion/plugins/create/create_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_saver.py @@ -17,7 +17,7 @@ from openpype.pipeline import ( class CreateSaver(Creator): identifier = "io.openpype.creators.fusion.saver" name = "saver" - label = "Create Saver" + label = "Saver" family = "render" default_variants = ["Main"] From 85cb398b6ee14b66ece629fb446c97ee9fd2347a Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 27 Sep 2022 10:59:41 +0200 Subject: [PATCH 029/912] Implement draft for Create Workfile --- .../fusion/plugins/create/create_workfile.py | 129 ++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 openpype/hosts/fusion/plugins/create/create_workfile.py diff --git a/openpype/hosts/fusion/plugins/create/create_workfile.py b/openpype/hosts/fusion/plugins/create/create_workfile.py new file mode 100644 index 0000000000..26a73abb64 --- /dev/null +++ b/openpype/hosts/fusion/plugins/create/create_workfile.py @@ -0,0 +1,129 @@ +import collections + +import qtawesome + +import openpype.hosts.fusion.api as api +from openpype.client import get_asset_by_name +from openpype.pipeline import ( + AutoCreator, + CreatedInstance, + legacy_io, +) + + +def flatten_dict(d, parent_key=None, separator="."): + items = [] + for key, v in d.items(): + new_key = parent_key + separator + key if parent_key else key + if isinstance(v, collections.MutableMapping): + items.extend(flatten_dict(v, new_key, separator=separator).items()) + else: + items.append((new_key, v)) + return dict(items) + + +class FusionWorkfileCreator(AutoCreator): + identifier = "workfile" + family = "workfile" + label = "Workfile" + + default_variant = "Main" + + create_allow_context_change = False + + data_key = "openpype.workfile" + + def collect_instances(self): + + comp = api.get_current_comp() + data = comp.GetData(self.data_key) + if not data: + return + + instance = CreatedInstance( + family=self.family, + subset_name=data["subset"], + data=data, + creator=self + ) + instance.transient_data["comp"] = comp + instance.transient_data["tool"] = None + + self._add_instance_to_context(instance) + + def update_instances(self, update_list): + for update in update_list: + instance = update.instance + comp = instance.transient_data["comp"] + if not hasattr(comp, "SetData"): + # Comp is not alive anymore, likely closed by the user + self.log.error("Workfile comp not found for existing instance." + " Comp might have been closed in the meantime.") + continue + + # TODO: It appears sometimes this could be 'nested' + # Get the new values after the changes by key, ignore old value + new_data = { + key: new for key, (_old, new) in update.changes.items() + } + self._imprint(comp, new_data) + + def create(self, options=None): + + comp = api.get_current_comp() + if not comp: + self.log.error("Unable to find current comp") + return + + # TODO: Is this really necessary? + # Force kill any existing "workfile" instances + for instance in self.create_context.instances: + if instance.family == self.family: + self.log.debug(f"Removing instance: {instance}") + self._remove_instance_from_context(instance) + + project_name = legacy_io.Session["AVALON_PROJECT"] + asset_name = legacy_io.Session["AVALON_ASSET"] + task_name = legacy_io.Session["AVALON_TASK"] + host_name = legacy_io.Session["AVALON_APP"] + + asset_doc = get_asset_by_name(project_name, asset_name) + subset_name = self.get_subset_name( + self.default_variant, task_name, asset_doc, + project_name, host_name + ) + data = { + "asset": asset_name, + "task": task_name, + "variant": self.default_variant + } + data.update(self.get_dynamic_data( + self.default_variant, task_name, asset_doc, + project_name, host_name + )) + + instance = CreatedInstance( + self.family, subset_name, data, self + ) + instance.transient_data["comp"] = comp + instance.transient_data["tool"] = None + self._add_instance_to_context(instance) + + self._imprint(comp, data) + + def get_icon(self): + return qtawesome.icon("fa.file-o", color="white") + + def _imprint(self, comp, data): + + # TODO: Should this keys persist or not? I'd prefer not + # Do not persist the current context for the Workfile + for key in ["variant", "subset", "asset", "task"]: + data.pop(key, None) + + # Flatten any potential nested dicts + data = flatten_dict(data, separator=".") + + # Prefix with data key openpype.workfile + data = {f"{self.data_key}.{key}" for key, value in data.items()} + comp.SetData(data) From f555c1bf9a11200d8a48a9a68bac6f5e4695e347 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 27 Sep 2022 11:00:35 +0200 Subject: [PATCH 030/912] Shush hound --- .../hosts/fusion/plugins/publish/validate_unique_subsets.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py b/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py index 28bab59949..5b6ceb2fdb 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py +++ b/openpype/hosts/fusion/plugins/publish/validate_unique_subsets.py @@ -38,7 +38,8 @@ class ValidateUniqueSubsets(pyblish.api.ContextPlugin): asset=asset, subset=subset, instances=instances - )) + ) + ) invalid.extend(instances) # Return tools for the invalid instances so they can be selected From b8f4a0a3969b841f50cb66f15e08717d3d3cd890 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 27 Sep 2022 11:41:55 +0200 Subject: [PATCH 031/912] Specifiy families explicitly (to avoid issues with workfile family not having a `tool`) --- openpype/hosts/fusion/plugins/publish/collect_inputs.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openpype/hosts/fusion/plugins/publish/collect_inputs.py b/openpype/hosts/fusion/plugins/publish/collect_inputs.py index 8f9857b02f..e06649da99 100644 --- a/openpype/hosts/fusion/plugins/publish/collect_inputs.py +++ b/openpype/hosts/fusion/plugins/publish/collect_inputs.py @@ -97,10 +97,15 @@ class CollectUpstreamInputs(pyblish.api.InstancePlugin): label = "Collect Inputs" order = pyblish.api.CollectorOrder + 0.2 hosts = ["fusion"] + families = ["render"] def process(self, instance): # Get all upstream and include itself + if not any(instance[:]): + self.log.debug("No tool found in instance, skipping..") + return + tool = instance[0] nodes = list(iter_upstream(tool)) nodes.append(tool) From 2afc8ba573ee06ed790146eb113d1a74cbe705b3 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 27 Sep 2022 11:42:38 +0200 Subject: [PATCH 032/912] Fix collector with workfile present --- .../plugins/publish/collect_instances.py | 46 +++++++++++-------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/collect_instances.py b/openpype/hosts/fusion/plugins/publish/collect_instances.py index 2f3e82fded..ad264f0478 100644 --- a/openpype/hosts/fusion/plugins/publish/collect_instances.py +++ b/openpype/hosts/fusion/plugins/publish/collect_instances.py @@ -46,24 +46,12 @@ class CollectInstances(pyblish.api.ContextPlugin): context.data["frameEndHandle"] = int(global_end) for instance in context: - - tool = instance.data["transientData"]["tool"] - - path = tool["Clip"][comp.TIME_UNDEFINED] - filename = os.path.basename(path) - head, padding, tail = get_frame_path(filename) - ext = os.path.splitext(path)[1] - assert tail == ext, ("Tail does not match %s" % ext) - # Include start and end render frame in label subset = instance.data["subset"] label = "{subset} ({start}-{end})".format(subset=subset, start=int(start), end=int(end)) instance.data.update({ - "path": path, - "outputDir": os.path.dirname(path), - "ext": ext, # todo: should be redundant? "label": label, # todo: Allow custom frame range per instance "frameStart": context.data["frameStart"], @@ -71,14 +59,32 @@ class CollectInstances(pyblish.api.ContextPlugin): "frameStartHandle": context.data["frameStartHandle"], "frameEndHandle": context.data["frameStartHandle"], "fps": context.data["fps"], - "families": ["render", "review"], - "family": "render", - - # Backwards compatibility: embed tool in instance.data - "tool": tool }) - # Add tool itself as member - instance.append(tool) + if instance.data["family"] == "render": + # TODO: This should probably move into a collector of + # its own for the "render" family + # This is only the case for savers currently but not + # for workfile instances. So we assume saver here. + tool = instance.data["transientData"]["tool"] + path = tool["Clip"][comp.TIME_UNDEFINED] - self.log.info("Found: \"%s\" " % path) + filename = os.path.basename(path) + head, padding, tail = get_frame_path(filename) + ext = os.path.splitext(path)[1] + assert tail == ext, ("Tail does not match %s" % ext) + + instance.data.update({ + "path": path, + "outputDir": os.path.dirname(path), + "ext": ext, # todo: should be redundant? + + "families": ["render", "review"], + "family": "render", + + # Backwards compatibility: embed tool in instance.data + "tool": tool + }) + + # Add tool itself as member + instance.append(tool) From d0ea9171b3cbd2c52ab3e027f496f75e6bb36768 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 27 Sep 2022 11:43:25 +0200 Subject: [PATCH 033/912] Remove storage of empty tool placeholder value --- openpype/hosts/fusion/plugins/create/create_workfile.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/openpype/hosts/fusion/plugins/create/create_workfile.py b/openpype/hosts/fusion/plugins/create/create_workfile.py index 26a73abb64..19ad04f572 100644 --- a/openpype/hosts/fusion/plugins/create/create_workfile.py +++ b/openpype/hosts/fusion/plugins/create/create_workfile.py @@ -47,7 +47,6 @@ class FusionWorkfileCreator(AutoCreator): creator=self ) instance.transient_data["comp"] = comp - instance.transient_data["tool"] = None self._add_instance_to_context(instance) @@ -106,7 +105,6 @@ class FusionWorkfileCreator(AutoCreator): self.family, subset_name, data, self ) instance.transient_data["comp"] = comp - instance.transient_data["tool"] = None self._add_instance_to_context(instance) self._imprint(comp, data) From 3a952d5038b51e7d05e64d70e10054a8c9b5bd4c Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 27 Sep 2022 11:43:37 +0200 Subject: [PATCH 034/912] Cosmetics/readability --- openpype/hosts/fusion/plugins/create/create_workfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/plugins/create/create_workfile.py b/openpype/hosts/fusion/plugins/create/create_workfile.py index 19ad04f572..783d3a147a 100644 --- a/openpype/hosts/fusion/plugins/create/create_workfile.py +++ b/openpype/hosts/fusion/plugins/create/create_workfile.py @@ -102,7 +102,10 @@ class FusionWorkfileCreator(AutoCreator): )) instance = CreatedInstance( - self.family, subset_name, data, self + family=self.family, + subset_name=subset_name, + data=data, + creator=self ) instance.transient_data["comp"] = comp self._add_instance_to_context(instance) From 00d9aa216bd8689862a189eb32fcd1dd692303fe Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 27 Sep 2022 12:01:11 +0200 Subject: [PATCH 035/912] Apply to workfile family - like other hosts do --- .../fusion/plugins/publish/increment_current_file_deadline.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/plugins/publish/increment_current_file_deadline.py b/openpype/hosts/fusion/plugins/publish/increment_current_file_deadline.py index 5c595638e9..42891446f7 100644 --- a/openpype/hosts/fusion/plugins/publish/increment_current_file_deadline.py +++ b/openpype/hosts/fusion/plugins/publish/increment_current_file_deadline.py @@ -11,7 +11,7 @@ class FusionIncrementCurrentFile(pyblish.api.ContextPlugin): label = "Increment current file" order = pyblish.api.IntegratorOrder + 9.0 hosts = ["fusion"] - families = ["render.farm"] + families = ["workfile"] optional = True def process(self, context): From 34c1346961a621726dfc4f9352606c038d650ec4 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 27 Sep 2022 12:01:28 +0200 Subject: [PATCH 036/912] Refactor filename --- ...crement_current_file_deadline.py => increment_current_file.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename openpype/hosts/fusion/plugins/publish/{increment_current_file_deadline.py => increment_current_file.py} (100%) diff --git a/openpype/hosts/fusion/plugins/publish/increment_current_file_deadline.py b/openpype/hosts/fusion/plugins/publish/increment_current_file.py similarity index 100% rename from openpype/hosts/fusion/plugins/publish/increment_current_file_deadline.py rename to openpype/hosts/fusion/plugins/publish/increment_current_file.py From d6080593e3213df882b5e4b6dc112223531d109e Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 27 Sep 2022 12:02:16 +0200 Subject: [PATCH 037/912] Include workfile family --- openpype/hosts/fusion/plugins/publish/save_scene.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/plugins/publish/save_scene.py b/openpype/hosts/fusion/plugins/publish/save_scene.py index 0cdfafa095..a249c453d8 100644 --- a/openpype/hosts/fusion/plugins/publish/save_scene.py +++ b/openpype/hosts/fusion/plugins/publish/save_scene.py @@ -7,7 +7,7 @@ class FusionSaveComp(pyblish.api.ContextPlugin): label = "Save current file" order = pyblish.api.ExtractorOrder - 0.49 hosts = ["fusion"] - families = ["render"] + families = ["render", "workfile"] def process(self, context): From eed65758e651acf372d6814b4d7061990d6ad993 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 27 Sep 2022 12:21:31 +0200 Subject: [PATCH 038/912] Move Submit Fusion Deadline to Deadline Module --- .../deadline/plugins/publish/submit_fusion_deadline.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename openpype/{hosts/fusion/plugins/publish/submit_deadline.py => modules/deadline/plugins/publish/submit_fusion_deadline.py} (100%) diff --git a/openpype/hosts/fusion/plugins/publish/submit_deadline.py b/openpype/modules/deadline/plugins/publish/submit_fusion_deadline.py similarity index 100% rename from openpype/hosts/fusion/plugins/publish/submit_deadline.py rename to openpype/modules/deadline/plugins/publish/submit_fusion_deadline.py From aeef0a484e257e868c9f5ec334e98bf4ad013f39 Mon Sep 17 00:00:00 2001 From: Allan Ihsan Date: Wed, 28 Sep 2022 15:06:20 +0300 Subject: [PATCH 039/912] Fix bug --- .../schemas/projects_schema/schemas/schema_maya_capture.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json index 0a28cc2552..aba6a020f8 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json @@ -348,8 +348,6 @@ "type": "label", "label": "Show" }, - { - "type": "label", { "type": "boolean", "key": "useDefaultMaterial", @@ -379,7 +377,6 @@ "type": "boolean", "key": "cameras", "label": "cameras" ->>>>>>> Stashed changes }, { "type": "boolean", From 3d7af9e434e283b0606814b75589ef4643e150cd Mon Sep 17 00:00:00 2001 From: Allan Ihsan Date: Wed, 28 Sep 2022 15:27:01 +0300 Subject: [PATCH 040/912] Remove redundant, move playblast options. --- .../schemas/schema_maya_capture.json | 75 +++++++------------ 1 file changed, 25 insertions(+), 50 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json index aba6a020f8..ff3c5a79f4 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json @@ -221,6 +221,31 @@ { "type": "splitter" }, + { + "type": "boolean", + "key": "useDefaultMaterial", + "label": "Use Default Material" + }, + { + "type": "boolean", + "key": "wireframeOnShaded", + "label": "Wireframe On Shaded" + }, + { + "type": "boolean", + "key": "xray", + "label": "X-Ray" + }, + { + "type": "boolean", + "key": "jointXray", + "label": "X-Ray Joints" + }, + { + "type": "boolean", + "key": "backfaceCulling", + "label": "Backface Culling" + }, { "type": "boolean", "key": "ssaoEnable", @@ -348,56 +373,6 @@ "type": "label", "label": "Show" }, - { - "type": "boolean", - "key": "useDefaultMaterial", - "label": "Use Default Material" - }, - { - "type": "boolean", - "key": "wireframeOnShaded", - "label": "Wireframe On Shaded" - }, - { - "type": "boolean", - "key": "xray", - "label": "X-Ray" - }, - { - "type": "boolean", - "key": "jointXray", - "label": "X-Ray Joints" - }, - { - "type": "boolean", - "key": "backfaceCulling", - "label": "Backface Culling" - }, - { - "type": "boolean", - "key": "cameras", - "label": "cameras" - }, - { - "type": "boolean", - "key": "udm", - "label": "Use Default Material" - }, - { - "type": "boolean", - "key": "wos", - "label": "Wireframe On Shaded" - }, - { - "type": "boolean", - "key": "jointXray", - "label": "Toggle Joint X-Ray Mode" - }, - { - "type": "boolean", - "key": "backfaceCulling", - "label": "Enable Back Face Culling" - }, { "type": "boolean", "key": "cameras", From 4d15535163119fbe2989ff068740477418eb28cf Mon Sep 17 00:00:00 2001 From: Allan Ihsan Date: Mon, 3 Oct 2022 13:43:26 +0300 Subject: [PATCH 041/912] remove unnecessary line --- openpype/settings/defaults/project_anatomy/attributes.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openpype/settings/defaults/project_anatomy/attributes.json b/openpype/settings/defaults/project_anatomy/attributes.json index bf8bbef8de..c2d2aa9b15 100644 --- a/openpype/settings/defaults/project_anatomy/attributes.json +++ b/openpype/settings/defaults/project_anatomy/attributes.json @@ -18,9 +18,8 @@ "houdini/18-5", "blender/2-91", "harmony/20", - "photoshop/2021", - "aftereffects/2021" + "photoshop/2021" ], "tools_env": [], "active": true -} \ No newline at end of file +} From f6f3abf33811d875cce9a9f11829996d38645a61 Mon Sep 17 00:00:00 2001 From: Allan Ihsan Date: Tue, 4 Oct 2022 10:58:26 +0300 Subject: [PATCH 042/912] Add label below splitter. --- .../schemas/projects_schema/schemas/schema_maya_capture.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json index ff3c5a79f4..1f0e4eeffb 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json @@ -184,6 +184,10 @@ { "type": "splitter" }, + { + "type": "label", + "label": "Display" + }, { "type":"boolean", "key": "renderDepthOfField", From 3c7fa6faa5af05e96fc3a42c3ca5d5175b910301 Mon Sep 17 00:00:00 2001 From: Allan Ihsan Date: Tue, 4 Oct 2022 10:58:37 +0300 Subject: [PATCH 043/912] Reorder defaults --- openpype/settings/defaults/project_settings/maya.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index b873827df0..e2a3357cfe 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -695,6 +695,11 @@ "twoSidedLighting": true, "lineAAEnable": true, "multiSample": 8, + "useDefaultMaterial": false, + "wireframeOnShaded": false, + "xray": false, + "jointXray": false, + "backfaceCulling": false, "ssaoEnable": false, "ssaoAmount": 1, "ssaoRadius": 16, @@ -712,11 +717,6 @@ "motionBlurEnable": false, "motionBlurSampleCount": 8, "motionBlurShutterOpenFraction": 0.2, - "xray": false, - "useDefaultMaterial": false, - "wireframeOnShaded": false, - "jointXray": false, - "backfaceCulling": false, "cameras": false, "clipGhosts": false, "deformers": false, From dc2baf29069afddad2c1c3a9acff64c85b7d8968 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 4 Jan 2023 14:56:40 +0800 Subject: [PATCH 044/912] check whether the ocio config enabled in maya for colorspace in maya --- .../hosts/maya/plugins/publish/extract_look.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/extract_look.py b/openpype/hosts/maya/plugins/publish/extract_look.py index df07a674dc..efe6c3c062 100644 --- a/openpype/hosts/maya/plugins/publish/extract_look.py +++ b/openpype/hosts/maya/plugins/publish/extract_look.py @@ -367,10 +367,19 @@ class ExtractLook(publish.Extractor): for filepath in files_metadata: linearize = False - if do_maketx and files_metadata[filepath]["color_space"].lower() == "srgb": # noqa: E501 - linearize = True - # set its file node to 'raw' as tx will be linearized - files_metadata[filepath]["color_space"] = "Raw" + # if OCIO color management enabled + # it wont take the condition of the files_metadata + + # TODO: if do_maketx: linearize=False + ocio_maya = cmds.colorManagementPrefs(q=True, + cmConfigFileEnabled=True, + cmEnabled=True) + + if do_maketx and not ocio_maya: + if files_metadata[filepath]["color_space"].lower() == "srgb": # noqa: E501 + linearize = True + # set its file node to 'raw' as tx will be linearized + files_metadata[filepath]["color_space"] = "Raw" # if do_maketx: # color_space = "Raw" @@ -421,6 +430,7 @@ class ExtractLook(publish.Extractor): color_space_attr = resource["node"] + ".colorSpace" try: color_space = cmds.getAttr(color_space_attr) + self.log.info("current colorspace: {0}".format(color_space)) except ValueError: # node doesn't have color space attribute color_space = "Raw" From e045cc95be4d9dc242536bfa5388a002171659b5 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 4 Jan 2023 15:10:43 +0800 Subject: [PATCH 045/912] check whether the ocio config enabled in maya for colorspace in maya --- openpype/hosts/maya/plugins/publish/extract_look.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/extract_look.py b/openpype/hosts/maya/plugins/publish/extract_look.py index efe6c3c062..878c2dceae 100644 --- a/openpype/hosts/maya/plugins/publish/extract_look.py +++ b/openpype/hosts/maya/plugins/publish/extract_look.py @@ -370,7 +370,6 @@ class ExtractLook(publish.Extractor): # if OCIO color management enabled # it wont take the condition of the files_metadata - # TODO: if do_maketx: linearize=False ocio_maya = cmds.colorManagementPrefs(q=True, cmConfigFileEnabled=True, cmEnabled=True) @@ -430,7 +429,6 @@ class ExtractLook(publish.Extractor): color_space_attr = resource["node"] + ".colorSpace" try: color_space = cmds.getAttr(color_space_attr) - self.log.info("current colorspace: {0}".format(color_space)) except ValueError: # node doesn't have color space attribute color_space = "Raw" From 1ba5223801fa9fa6695fa62a59dd53eaca7be27c Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 4 Jan 2023 23:49:07 +0800 Subject: [PATCH 046/912] adding optional validator for maya color space --- .../publish/validate_look_color_space.py | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 openpype/hosts/maya/plugins/publish/validate_look_color_space.py diff --git a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py new file mode 100644 index 0000000000..6839df1d72 --- /dev/null +++ b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py @@ -0,0 +1,28 @@ +from maya import cmds + +import pyblish.api +import openpype.hosts.maya.api.action +from openpype.pipeline.publish import ValidateContentsOrder + + +class ValidateMayaColorSpace(pyblish.api.InstancePlugin): + """ + Check if the OCIO Color Management and maketx options + enabled at the same time + + """ + + order = ValidateContentsOrder + families = ['look'] + hosts = ['maya'] + label = 'Maya Color Space' + optional = True + + def process(self, instance): + ocio_maya = cmds.colorManagementPrefs(q=True, + cmConfigFileEnabled=True, + cmEnabled=True) + maketx = instance.data["maketx"] + + if ocio_maya and maketx: + raise Exception("Maya is color managed and maketx option is on. OpenPype doesn't support this combination yet.") # noqa From e9b149ee6a62372daf903b0f0060b58e566eaa9a Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 4 Jan 2023 23:50:05 +0800 Subject: [PATCH 047/912] adding optional validator for maya color space --- openpype/hosts/maya/plugins/publish/validate_look_color_space.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py index 6839df1d72..e309e25da9 100644 --- a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py +++ b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py @@ -1,7 +1,6 @@ from maya import cmds import pyblish.api -import openpype.hosts.maya.api.action from openpype.pipeline.publish import ValidateContentsOrder From e436dbb57e86948b54cc4f54591376f5f6ff42ca Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 5 Jan 2023 11:53:17 +0800 Subject: [PATCH 048/912] add the validator into the settings --- .../hosts/maya/plugins/publish/validate_look_color_space.py | 1 - openpype/settings/defaults/project_settings/maya.json | 5 +++++ .../schemas/projects_schema/schemas/schema_maya_publish.json | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py index e309e25da9..933951501c 100644 --- a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py +++ b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py @@ -15,7 +15,6 @@ class ValidateMayaColorSpace(pyblish.api.InstancePlugin): families = ['look'] hosts = ['maya'] label = 'Maya Color Space' - optional = True def process(self, instance): ocio_maya = cmds.colorManagementPrefs(q=True, diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index 5f40c2a10c..21815278a8 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -306,6 +306,11 @@ "optional": true, "active": true }, + "ValidateMayaColorSpace": { + "enabled": true, + "optional": true, + "active": true + }, "ValidateAttributes": { "enabled": false, "attributes": {} diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json index 9aaff248ab..a920d5aeae 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json @@ -144,6 +144,10 @@ { "key": "ValidateShadingEngine", "label": "Validate Look Shading Engine Naming" + }, + { + "key": "ValidateMayaColorSpace", + "label": "ValidateMayaColorSpace" } ] }, From edc10cd85f232d132266b00dae6392ab33945b3f Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 11:57:51 +0100 Subject: [PATCH 049/912] OP-4643 - added Settings for ExtractColorTranscode --- .../defaults/project_settings/global.json | 8 +- .../schemas/schema_global_publish.json | 73 +++++++++++++++++++ 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index 0b4e4c74e6..167f7611ce 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -70,6 +70,10 @@ "output": [] } }, + "ExtractColorTranscode": { + "enabled": true, + "profiles": [] + }, "ExtractReview": { "enabled": true, "profiles": [ @@ -442,7 +446,9 @@ "template": "{family}{Task}" }, { - "families": ["render"], + "families": [ + "render" + ], "hosts": [ "aftereffects" ], diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 5388d04bc9..46ae6ba554 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -197,6 +197,79 @@ } ] }, + { + "type": "dict", + "collapsible": true, + "key": "ExtractColorTranscode", + "label": "ExtractColorTranscode", + "checkbox_key": "enabled", + "is_group": true, + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "list", + "key": "profiles", + "label": "Profiles", + "object_type": { + "type": "dict", + "children": [ + { + "key": "families", + "label": "Families", + "type": "list", + "object_type": "text" + }, + { + "key": "hosts", + "label": "Host names", + "type": "hosts-enum", + "multiselection": true + }, + { + "key": "task_types", + "label": "Task types", + "type": "task-types-enum" + }, + { + "key": "task_names", + "label": "Task names", + "type": "list", + "object_type": "text" + }, + { + "key": "subsets", + "label": "Subset names", + "type": "list", + "object_type": "text" + }, + { + "type": "splitter" + }, + { + "key": "ext", + "label": "Output extension", + "type": "text" + }, + { + "key": "output_colorspace", + "label": "Output colorspace", + "type": "text" + }, + { + "key": "custom_tags", + "label": "Custom Tags", + "type": "list", + "object_type": "text" + } + ] + } + } + ] + }, { "type": "dict", "collapsible": true, From c9996bb0c00b2fdb3d4db964efe1933bc99438e1 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 11:58:51 +0100 Subject: [PATCH 050/912] OP-4643 - added ExtractColorTranscode Added method to convert from one colorspace to another to transcoding lib --- openpype/lib/transcoding.py | 53 ++++++++ .../publish/extract_color_transcode.py | 124 ++++++++++++++++++ 2 files changed, 177 insertions(+) create mode 100644 openpype/plugins/publish/extract_color_transcode.py diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 57279d0380..6899811ed5 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1037,3 +1037,56 @@ def convert_ffprobe_fps_to_float(value): if divisor == 0.0: return 0.0 return dividend / divisor + + +def convert_colorspace_for_input_paths( + input_paths, + output_dir, + source_color_space, + target_color_space, + logger=None +): + """Convert source files from one color space to another. + + Filenames of input files are kept so make sure that output directory + is not the same directory as input files have. + - This way it can handle gaps and can keep input filenames without handling + frame template + + Args: + input_paths (str): Paths that should be converted. It is expected that + contains single file or image sequence of samy type. + output_dir (str): Path to directory where output will be rendered. + Must not be same as input's directory. + source_color_space (str): ocio valid color space of source files + target_color_space (str): ocio valid target color space + logger (logging.Logger): Logger used for logging. + + """ + if logger is None: + logger = logging.getLogger(__name__) + + input_arg = "-i" + oiio_cmd = [ + get_oiio_tools_path(), + + # Don't add any additional attributes + "--nosoftwareattrib", + "--colorconvert", source_color_space, target_color_space + ] + for input_path in input_paths: + # Prepare subprocess arguments + + oiio_cmd.extend([ + input_arg, input_path, + ]) + + # Add last argument - path to output + base_filename = os.path.basename(input_path) + output_path = os.path.join(output_dir, base_filename) + oiio_cmd.extend([ + "-o", output_path + ]) + + logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) + run_subprocess(oiio_cmd, logger=logger) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py new file mode 100644 index 0000000000..58508ab18f --- /dev/null +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -0,0 +1,124 @@ +import pyblish.api + +from openpype.pipeline import publish +from openpype.lib import ( + + is_oiio_supported, +) + +from openpype.lib.transcoding import ( + convert_colorspace_for_input_paths, + get_transcode_temp_directory, +) + +from openpype.lib.profiles_filtering import filter_profiles + + +class ExtractColorTranscode(publish.Extractor): + """ + Extractor to convert colors from one colorspace to different. + """ + + label = "Transcode color spaces" + order = pyblish.api.ExtractorOrder + 0.01 + + optional = True + + # Configurable by Settings + profiles = None + options = None + + def process(self, instance): + if not self.profiles: + self.log.warning("No profiles present for create burnin") + return + + if "representations" not in instance.data: + self.log.warning("No representations, skipping.") + return + + if not is_oiio_supported(): + self.log.warning("OIIO not supported, no transcoding possible.") + return + + colorspace_data = instance.data.get("colorspaceData") + if not colorspace_data: + # TODO get_colorspace ?? + self.log.warning("Instance has not colorspace data, skipping") + return + source_color_space = colorspace_data["colorspace"] + + host_name = instance.context.data["hostName"] + family = instance.data["family"] + task_data = instance.data["anatomyData"].get("task", {}) + task_name = task_data.get("name") + task_type = task_data.get("type") + subset = instance.data["subset"] + + filtering_criteria = { + "hosts": host_name, + "families": family, + "task_names": task_name, + "task_types": task_type, + "subset": subset + } + profile = filter_profiles(self.profiles, filtering_criteria, + logger=self.log) + + if not profile: + self.log.info(( + "Skipped instance. None of profiles in presets are for" + " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" + " | Task type \"{}\" | Subset \"{}\" " + ).format(host_name, family, task_name, task_type, subset)) + return + + self.log.debug("profile: {}".format(profile)) + + target_colorspace = profile["output_colorspace"] + if not target_colorspace: + raise RuntimeError("Target colorspace must be set") + + repres = instance.data.get("representations") or [] + for idx, repre in enumerate(repres): + self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) + if not self.repre_is_valid(repre): + continue + + new_staging_dir = get_transcode_temp_directory() + repre["stagingDir"] = new_staging_dir + files_to_remove = repre["files"] + if not isinstance(files_to_remove, list): + files_to_remove = [files_to_remove] + instance.context.data["cleanupFullPaths"].extend(files_to_remove) + + convert_colorspace_for_input_paths( + repre["files"], + new_staging_dir, + source_color_space, + target_colorspace, + self.log + ) + + def repre_is_valid(self, repre): + """Validation if representation should be processed. + + Args: + repre (dict): Representation which should be checked. + + Returns: + bool: False if can't be processed else True. + """ + + if "review" not in (repre.get("tags") or []): + self.log.info(( + "Representation \"{}\" don't have \"review\" tag. Skipped." + ).format(repre["name"])) + return False + + if not repre.get("files"): + self.log.warning(( + "Representation \"{}\" have empty files. Skipped." + ).format(repre["name"])) + return False + return True From 23a5f21f6b54f4f01d40c73ef5bdb032a2c7440f Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 12:05:57 +0100 Subject: [PATCH 051/912] OP-4643 - extractor must run just before ExtractReview Nuke render local is set to 0.01 --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 58508ab18f..5163cd4045 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -20,7 +20,7 @@ class ExtractColorTranscode(publish.Extractor): """ label = "Transcode color spaces" - order = pyblish.api.ExtractorOrder + 0.01 + order = pyblish.api.ExtractorOrder + 0.019 optional = True From 9f8107df36dd8d281482d93fb6a0e3530d91fe91 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:03:22 +0100 Subject: [PATCH 052/912] OP-4643 - fix for full file paths --- .../publish/extract_color_transcode.py | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 5163cd4045..6ad7599f2c 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -1,3 +1,4 @@ +import os import pyblish.api from openpype.pipeline import publish @@ -41,13 +42,6 @@ class ExtractColorTranscode(publish.Extractor): self.log.warning("OIIO not supported, no transcoding possible.") return - colorspace_data = instance.data.get("colorspaceData") - if not colorspace_data: - # TODO get_colorspace ?? - self.log.warning("Instance has not colorspace data, skipping") - return - source_color_space = colorspace_data["colorspace"] - host_name = instance.context.data["hostName"] family = instance.data["family"] task_data = instance.data["anatomyData"].get("task", {}) @@ -82,18 +76,32 @@ class ExtractColorTranscode(publish.Extractor): repres = instance.data.get("representations") or [] for idx, repre in enumerate(repres): self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) - if not self.repre_is_valid(repre): + # if not self.repre_is_valid(repre): + # continue + + colorspace_data = repre.get("colorspaceData") + if not colorspace_data: + # TODO get_colorspace ?? + self.log.warning("Repre has not colorspace data, skipping") + continue + source_color_space = colorspace_data["colorspace"] + config_path = colorspace_data.get("configData", {}).get("path") + if not os.path.exists(config_path): + self.log.warning("Config file doesn't exist, skipping") continue new_staging_dir = get_transcode_temp_directory() + original_staging_dir = repre["stagingDir"] repre["stagingDir"] = new_staging_dir - files_to_remove = repre["files"] - if not isinstance(files_to_remove, list): - files_to_remove = [files_to_remove] - instance.context.data["cleanupFullPaths"].extend(files_to_remove) + files_to_convert = repre["files"] + if not isinstance(files_to_convert, list): + files_to_convert = [files_to_convert] + files_to_convert = [os.path.join(original_staging_dir, path) + for path in files_to_convert] + instance.context.data["cleanupFullPaths"].extend(files_to_convert) convert_colorspace_for_input_paths( - repre["files"], + files_to_convert, new_staging_dir, source_color_space, target_colorspace, From d588ee7ed967e34adfd4017824d9f323e2ab7ad4 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:04:06 +0100 Subject: [PATCH 053/912] OP-4643 - pass path for ocio config --- openpype/lib/transcoding.py | 3 +++ openpype/plugins/publish/extract_color_transcode.py | 1 + 2 files changed, 4 insertions(+) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 6899811ed5..792e8ddd1e 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1042,6 +1042,7 @@ def convert_ffprobe_fps_to_float(value): def convert_colorspace_for_input_paths( input_paths, output_dir, + config_path, source_color_space, target_color_space, logger=None @@ -1058,6 +1059,7 @@ def convert_colorspace_for_input_paths( contains single file or image sequence of samy type. output_dir (str): Path to directory where output will be rendered. Must not be same as input's directory. + config_path (str): path to OCIO config file source_color_space (str): ocio valid color space of source files target_color_space (str): ocio valid target color space logger (logging.Logger): Logger used for logging. @@ -1072,6 +1074,7 @@ def convert_colorspace_for_input_paths( # Don't add any additional attributes "--nosoftwareattrib", + "--colorconfig", config_path, "--colorconvert", source_color_space, target_color_space ] for input_path in input_paths: diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 6ad7599f2c..fdb13a47e8 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -103,6 +103,7 @@ class ExtractColorTranscode(publish.Extractor): convert_colorspace_for_input_paths( files_to_convert, new_staging_dir, + config_path, source_color_space, target_colorspace, self.log From 5ca4f825006d28bed4d0c01df71af3b3ffe21deb Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:15:33 +0100 Subject: [PATCH 054/912] OP-4643 - add custom_tags --- openpype/plugins/publish/extract_color_transcode.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index fdb13a47e8..ab932b2476 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -72,6 +72,7 @@ class ExtractColorTranscode(publish.Extractor): target_colorspace = profile["output_colorspace"] if not target_colorspace: raise RuntimeError("Target colorspace must be set") + custom_tags = profile["custom_tags"] repres = instance.data.get("representations") or [] for idx, repre in enumerate(repres): @@ -109,6 +110,11 @@ class ExtractColorTranscode(publish.Extractor): self.log ) + if custom_tags: + if not repre.get("custom_tags"): + repre["custom_tags"] = [] + repre["custom_tags"].extend(custom_tags) + def repre_is_valid(self, repre): """Validation if representation should be processed. From 4854b521d408d326f741cc73cda0ddc3e67795ce Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:18:38 +0100 Subject: [PATCH 055/912] OP-4643 - added docstring --- openpype/plugins/publish/extract_color_transcode.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index ab932b2476..88e2eed90f 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -18,6 +18,17 @@ from openpype.lib.profiles_filtering import filter_profiles class ExtractColorTranscode(publish.Extractor): """ Extractor to convert colors from one colorspace to different. + + Expects "colorspaceData" on representation. This dictionary is collected + previously and denotes that representation files should be converted. + This dict contains source colorspace information, collected by hosts. + + Target colorspace is selected by profiles in the Settings, based on: + - families + - host + - task types + - task names + - subset names """ label = "Transcode color spaces" From 39b8c111cfd418b74e0cf915590bcae2547c30ae Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:15:44 +0100 Subject: [PATCH 056/912] OP-4643 - updated Settings schema --- .../schemas/schema_global_publish.json | 48 +++++++++++++------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 46ae6ba554..c2c911d7d6 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -246,24 +246,44 @@ "type": "list", "object_type": "text" }, + { + "type": "boolean", + "key": "delete_original", + "label": "Delete Original Representation" + }, { "type": "splitter" }, { - "key": "ext", - "label": "Output extension", - "type": "text" - }, - { - "key": "output_colorspace", - "label": "Output colorspace", - "type": "text" - }, - { - "key": "custom_tags", - "label": "Custom Tags", - "type": "list", - "object_type": "text" + "key": "outputs", + "label": "Output Definitions", + "type": "dict-modifiable", + "highlight_content": true, + "object_type": { + "type": "dict", + "children": [ + { + "key": "output_extension", + "label": "Output extension", + "type": "text" + }, + { + "key": "output_colorspace", + "label": "Output colorspace", + "type": "text" + }, + { + "type": "schema", + "name": "schema_representation_tags" + }, + { + "key": "custom_tags", + "label": "Custom Tags", + "type": "list", + "object_type": "text" + } + ] + } } ] } From a63ddebc19c7078c33b49029e5de3059b0fcdd9d Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:17:25 +0100 Subject: [PATCH 057/912] OP-4643 - skip video files Only frames currently supported. --- .../plugins/publish/extract_color_transcode.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 88e2eed90f..a0714c9a33 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -36,6 +36,9 @@ class ExtractColorTranscode(publish.Extractor): optional = True + # Supported extensions + supported_exts = ["exr", "jpg", "jpeg", "png", "dpx"] + # Configurable by Settings profiles = None options = None @@ -88,13 +91,7 @@ class ExtractColorTranscode(publish.Extractor): repres = instance.data.get("representations") or [] for idx, repre in enumerate(repres): self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) - # if not self.repre_is_valid(repre): - # continue - - colorspace_data = repre.get("colorspaceData") - if not colorspace_data: - # TODO get_colorspace ?? - self.log.warning("Repre has not colorspace data, skipping") + if not self._repre_is_valid(repre): continue source_color_space = colorspace_data["colorspace"] config_path = colorspace_data.get("configData", {}).get("path") @@ -136,9 +133,9 @@ class ExtractColorTranscode(publish.Extractor): bool: False if can't be processed else True. """ - if "review" not in (repre.get("tags") or []): - self.log.info(( - "Representation \"{}\" don't have \"review\" tag. Skipped." + if repre.get("ext") not in self.supported_exts: + self.log.warning(( + "Representation \"{}\" of unsupported extension. Skipped." ).format(repre["name"])) return False From eced917d1a06fb6c973396c22c37db70bf71e4d4 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:19:08 +0100 Subject: [PATCH 058/912] OP-4643 - refactored profile, delete of original Implemented multiple outputs from single input representation --- .../publish/extract_color_transcode.py | 156 ++++++++++++------ 1 file changed, 109 insertions(+), 47 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index a0714c9a33..b0c851d5f4 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -1,4 +1,6 @@ import os +import copy + import pyblish.api from openpype.pipeline import publish @@ -56,13 +58,94 @@ class ExtractColorTranscode(publish.Extractor): self.log.warning("OIIO not supported, no transcoding possible.") return + profile = self._get_profile(instance) + if not profile: + return + + repres = instance.data.get("representations") or [] + for idx, repre in enumerate(list(repres)): + self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) + if not self._repre_is_valid(repre): + continue + + colorspace_data = repre["colorspaceData"] + source_color_space = colorspace_data["colorspace"] + config_path = colorspace_data.get("configData", {}).get("path") + if not os.path.exists(config_path): + self.log.warning("Config file doesn't exist, skipping") + continue + + repre = self._handle_original_repre(repre, profile) + + for _, output_def in profile.get("outputs", {}).items(): + new_repre = copy.deepcopy(repre) + + new_staging_dir = get_transcode_temp_directory() + original_staging_dir = new_repre["stagingDir"] + new_repre["stagingDir"] = new_staging_dir + files_to_convert = new_repre["files"] + if not isinstance(files_to_convert, list): + files_to_convert = [files_to_convert] + + files_to_delete = copy.deepcopy(files_to_convert) + + output_extension = output_def["output_extension"] + files_to_convert = self._rename_output_files(files_to_convert, + output_extension) + + files_to_convert = [os.path.join(original_staging_dir, path) + for path in files_to_convert] + + target_colorspace = output_def["output_colorspace"] + if not target_colorspace: + raise RuntimeError("Target colorspace must be set") + + convert_colorspace_for_input_paths( + files_to_convert, + new_staging_dir, + config_path, + source_color_space, + target_colorspace, + self.log + ) + + instance.context.data["cleanupFullPaths"].extend( + files_to_delete) + + custom_tags = output_def.get("custom_tags") + if custom_tags: + if not new_repre.get("custom_tags"): + new_repre["custom_tags"] = [] + new_repre["custom_tags"].extend(custom_tags) + + # Add additional tags from output definition to representation + for tag in output_def["tags"]: + if tag not in new_repre["tags"]: + new_repre["tags"].append(tag) + + instance.data["representations"].append(new_repre) + + def _rename_output_files(self, files_to_convert, output_extension): + """Change extension of converted files.""" + if output_extension: + output_extension = output_extension.replace('.', '') + renamed_files = [] + for file_name in files_to_convert: + file_name, _ = os.path.splitext(file_name) + new_file_name = '{}.{}'.format(file_name, + output_extension) + renamed_files.append(new_file_name) + files_to_convert = renamed_files + return files_to_convert + + def _get_profile(self, instance): + """Returns profile if and how repre should be color transcoded.""" host_name = instance.context.data["hostName"] family = instance.data["family"] task_data = instance.data["anatomyData"].get("task", {}) task_name = task_data.get("name") task_type = task_data.get("type") subset = instance.data["subset"] - filtering_criteria = { "hosts": host_name, "families": family, @@ -75,55 +158,15 @@ class ExtractColorTranscode(publish.Extractor): if not profile: self.log.info(( - "Skipped instance. None of profiles in presets are for" - " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" - " | Task type \"{}\" | Subset \"{}\" " - ).format(host_name, family, task_name, task_type, subset)) - return + "Skipped instance. None of profiles in presets are for" + " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" + " | Task type \"{}\" | Subset \"{}\" " + ).format(host_name, family, task_name, task_type, subset)) self.log.debug("profile: {}".format(profile)) + return profile - target_colorspace = profile["output_colorspace"] - if not target_colorspace: - raise RuntimeError("Target colorspace must be set") - custom_tags = profile["custom_tags"] - - repres = instance.data.get("representations") or [] - for idx, repre in enumerate(repres): - self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) - if not self._repre_is_valid(repre): - continue - source_color_space = colorspace_data["colorspace"] - config_path = colorspace_data.get("configData", {}).get("path") - if not os.path.exists(config_path): - self.log.warning("Config file doesn't exist, skipping") - continue - - new_staging_dir = get_transcode_temp_directory() - original_staging_dir = repre["stagingDir"] - repre["stagingDir"] = new_staging_dir - files_to_convert = repre["files"] - if not isinstance(files_to_convert, list): - files_to_convert = [files_to_convert] - files_to_convert = [os.path.join(original_staging_dir, path) - for path in files_to_convert] - instance.context.data["cleanupFullPaths"].extend(files_to_convert) - - convert_colorspace_for_input_paths( - files_to_convert, - new_staging_dir, - config_path, - source_color_space, - target_colorspace, - self.log - ) - - if custom_tags: - if not repre.get("custom_tags"): - repre["custom_tags"] = [] - repre["custom_tags"].extend(custom_tags) - - def repre_is_valid(self, repre): + def _repre_is_valid(self, repre): """Validation if representation should be processed. Args: @@ -144,4 +187,23 @@ class ExtractColorTranscode(publish.Extractor): "Representation \"{}\" have empty files. Skipped." ).format(repre["name"])) return False + + if not repre.get("colorspaceData"): + self.log.warning("Repre has not colorspace data, skipping") + return False + return True + + def _handle_original_repre(self, repre, profile): + delete_original = profile["delete_original"] + + if delete_original: + if not repre.get("tags"): + repre["tags"] = [] + + if "review" in repre["tags"]: + repre["tags"].remove("review") + if "delete" not in repre["tags"]: + repre["tags"].append("delete") + + return repre From 82a8fda4d6fd319be4f570d0731881d0effb3dac Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:23:01 +0100 Subject: [PATCH 059/912] OP-4643 - switched logging levels Do not use warning unnecessary. --- openpype/plugins/publish/extract_color_transcode.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index b0c851d5f4..4d38514b8b 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -47,11 +47,11 @@ class ExtractColorTranscode(publish.Extractor): def process(self, instance): if not self.profiles: - self.log.warning("No profiles present for create burnin") + self.log.debug("No profiles present for color transcode") return if "representations" not in instance.data: - self.log.warning("No representations, skipping.") + self.log.debug("No representations, skipping.") return if not is_oiio_supported(): @@ -177,19 +177,19 @@ class ExtractColorTranscode(publish.Extractor): """ if repre.get("ext") not in self.supported_exts: - self.log.warning(( + self.log.debug(( "Representation \"{}\" of unsupported extension. Skipped." ).format(repre["name"])) return False if not repre.get("files"): - self.log.warning(( + self.log.debug(( "Representation \"{}\" have empty files. Skipped." ).format(repre["name"])) return False if not repre.get("colorspaceData"): - self.log.warning("Repre has not colorspace data, skipping") + self.log.debug("Repre has no colorspace data. Skipped.") return False return True From 6f7e1c3cb49fe0162220919d398e86cddf68d0fa Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:46:14 +0100 Subject: [PATCH 060/912] OP-4643 - propagate new extension to representation --- .../publish/extract_color_transcode.py | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 4d38514b8b..62cf8f0dee 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -90,8 +90,13 @@ class ExtractColorTranscode(publish.Extractor): files_to_delete = copy.deepcopy(files_to_convert) output_extension = output_def["output_extension"] - files_to_convert = self._rename_output_files(files_to_convert, - output_extension) + output_extension = output_extension.replace('.', '') + if output_extension: + new_repre["name"] = output_extension + new_repre["ext"] = output_extension + + files_to_convert = self._rename_output_files( + files_to_convert, output_extension) files_to_convert = [os.path.join(original_staging_dir, path) for path in files_to_convert] @@ -127,15 +132,13 @@ class ExtractColorTranscode(publish.Extractor): def _rename_output_files(self, files_to_convert, output_extension): """Change extension of converted files.""" - if output_extension: - output_extension = output_extension.replace('.', '') - renamed_files = [] - for file_name in files_to_convert: - file_name, _ = os.path.splitext(file_name) - new_file_name = '{}.{}'.format(file_name, - output_extension) - renamed_files.append(new_file_name) - files_to_convert = renamed_files + renamed_files = [] + for file_name in files_to_convert: + file_name, _ = os.path.splitext(file_name) + new_file_name = '{}.{}'.format(file_name, + output_extension) + renamed_files.append(new_file_name) + files_to_convert = renamed_files return files_to_convert def _get_profile(self, instance): From d27dab7c970903e483aa6335ebee62ffffbab191 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:46:35 +0100 Subject: [PATCH 061/912] OP-4643 - added label to Settings --- .../projects_schema/schemas/schema_global_publish.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index c2c911d7d6..7155510fef 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -201,10 +201,14 @@ "type": "dict", "collapsible": true, "key": "ExtractColorTranscode", - "label": "ExtractColorTranscode", + "label": "ExtractColorTranscode (ImageIO)", "checkbox_key": "enabled", "is_group": true, "children": [ + { + "type": "label", + "label": "Configure output format(s) and color spaces for matching representations. Empty 'Output extension' denotes keeping source extension." + }, { "type": "boolean", "key": "enabled", From baca6a93c3d1208960b68d95dbc3b19bd58d5725 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Mon, 9 Jan 2023 16:44:40 +0800 Subject: [PATCH 062/912] remove the validator for color-space --- .../publish/validate_look_color_space.py | 26 ------------------- .../defaults/project_settings/maya.json | 5 ---- .../schemas/schema_maya_publish.json | 4 --- 3 files changed, 35 deletions(-) delete mode 100644 openpype/hosts/maya/plugins/publish/validate_look_color_space.py diff --git a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py deleted file mode 100644 index 933951501c..0000000000 --- a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py +++ /dev/null @@ -1,26 +0,0 @@ -from maya import cmds - -import pyblish.api -from openpype.pipeline.publish import ValidateContentsOrder - - -class ValidateMayaColorSpace(pyblish.api.InstancePlugin): - """ - Check if the OCIO Color Management and maketx options - enabled at the same time - - """ - - order = ValidateContentsOrder - families = ['look'] - hosts = ['maya'] - label = 'Maya Color Space' - - def process(self, instance): - ocio_maya = cmds.colorManagementPrefs(q=True, - cmConfigFileEnabled=True, - cmEnabled=True) - maketx = instance.data["maketx"] - - if ocio_maya and maketx: - raise Exception("Maya is color managed and maketx option is on. OpenPype doesn't support this combination yet.") # noqa diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index 21815278a8..5f40c2a10c 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -306,11 +306,6 @@ "optional": true, "active": true }, - "ValidateMayaColorSpace": { - "enabled": true, - "optional": true, - "active": true - }, "ValidateAttributes": { "enabled": false, "attributes": {} diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json index a920d5aeae..9aaff248ab 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json @@ -144,10 +144,6 @@ { "key": "ValidateShadingEngine", "label": "Validate Look Shading Engine Naming" - }, - { - "key": "ValidateMayaColorSpace", - "label": "ValidateMayaColorSpace" } ] }, From a380069aad8ff9445666637aac638ae37f04eac4 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Mon, 9 Jan 2023 16:23:46 +0000 Subject: [PATCH 063/912] Hound fixes --- openpype/hosts/blender/api/capture.py | 2 +- openpype/hosts/blender/api/lib.py | 1 + openpype/hosts/blender/plugins/publish/collect_review.py | 2 +- openpype/hosts/blender/plugins/publish/extract_playblast.py | 3 +-- openpype/hosts/blender/plugins/publish/extract_thumbnail.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/blender/api/capture.py b/openpype/hosts/blender/api/capture.py index 7cf9e52cb6..849f8ee629 100644 --- a/openpype/hosts/blender/api/capture.py +++ b/openpype/hosts/blender/api/capture.py @@ -275,4 +275,4 @@ def _independent_window(): try: yield window finally: - bpy.ops.wm.window_close(context) \ No newline at end of file + bpy.ops.wm.window_close(context) diff --git a/openpype/hosts/blender/api/lib.py b/openpype/hosts/blender/api/lib.py index dd3cc48a98..6526f1fb87 100644 --- a/openpype/hosts/blender/api/lib.py +++ b/openpype/hosts/blender/api/lib.py @@ -285,6 +285,7 @@ def maintained_selection(): # context. log.exception("Failed to set active object.") + @contextlib.contextmanager def maintained_time(): """Maintain current frame during context.""" diff --git a/openpype/hosts/blender/plugins/publish/collect_review.py b/openpype/hosts/blender/plugins/publish/collect_review.py index 09b5558d31..d6abd9d967 100644 --- a/openpype/hosts/blender/plugins/publish/collect_review.py +++ b/openpype/hosts/blender/plugins/publish/collect_review.py @@ -61,4 +61,4 @@ class CollectReview(pyblish.api.InstancePlugin): "offset": track.offset.get(), "filename": track.filename.get(), } - ) \ No newline at end of file + ) diff --git a/openpype/hosts/blender/plugins/publish/extract_playblast.py b/openpype/hosts/blender/plugins/publish/extract_playblast.py index d07968d469..1114b633be 100644 --- a/openpype/hosts/blender/plugins/publish/extract_playblast.py +++ b/openpype/hosts/blender/plugins/publish/extract_playblast.py @@ -23,7 +23,6 @@ class ExtractPlayblast(openpype.api.Extractor): optional = True order = pyblish.api.ExtractorOrder + 0.01 - def process(self, instance): self.log.info("Extracting capture..") @@ -122,4 +121,4 @@ class ExtractPlayblast(openpype.api.Extractor): "tags": tags, "camera_name": camera } - instance.data["representations"].append(representation) \ No newline at end of file + instance.data["representations"].append(representation) diff --git a/openpype/hosts/blender/plugins/publish/extract_thumbnail.py b/openpype/hosts/blender/plugins/publish/extract_thumbnail.py index 3fabdf61e0..5e9d876989 100644 --- a/openpype/hosts/blender/plugins/publish/extract_thumbnail.py +++ b/openpype/hosts/blender/plugins/publish/extract_thumbnail.py @@ -99,4 +99,4 @@ class ExtractThumbnail(openpype.api.Extractor): raise RuntimeError(f"Couldn't find playblast from: {filepath}") filepath = max(files, key=os.path.getmtime) - return filepath \ No newline at end of file + return filepath From ce0a6d8ba4ba2ceae2c32cf61e4f8ec52c5f9700 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 10 Jan 2023 09:21:09 +0000 Subject: [PATCH 064/912] Fix --- openpype/hosts/maya/api/lib_renderproducts.py | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py index c54e3ab3e0..fcc844d5d6 100644 --- a/openpype/hosts/maya/api/lib_renderproducts.py +++ b/openpype/hosts/maya/api/lib_renderproducts.py @@ -797,6 +797,11 @@ class RenderProductsVray(ARenderProducts): if default_ext in {"exr (multichannel)", "exr (deep)"}: default_ext = "exr" + # Define multipart. + multipart = False + if image_format_str == "exr (multichannel)": + multipart = True + products = [] # add beauty as default when not disabled @@ -804,23 +809,28 @@ class RenderProductsVray(ARenderProducts): if not dont_save_rgb: for camera in cameras: products.append( - RenderProduct(productName="", - ext=default_ext, - camera=camera)) + RenderProduct( + productName="", + ext=default_ext, + camera=camera, + multipart=multipart + ) + ) # separate alpha file separate_alpha = self._get_attr("vraySettings.separateAlpha") if separate_alpha: for camera in cameras: products.append( - RenderProduct(productName="Alpha", - ext=default_ext, - camera=camera) + RenderProduct( + productName="Alpha", + ext=default_ext, + camera=camera, + multipart=multipart + ) ) - - if image_format_str == "exr (multichannel)": + if multipart: # AOVs are merged in m-channel file, only main layer is rendered - self.multipart = True return products # handle aovs from references From 5bb1405a5506ceec98f885237da9a372c210e91a Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 10 Jan 2023 09:21:17 +0000 Subject: [PATCH 065/912] Code cosmetics --- openpype/hosts/maya/plugins/publish/collect_render.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/publish/collect_render.py b/openpype/hosts/maya/plugins/publish/collect_render.py index b1ad3ca58e..23fcd730d5 100644 --- a/openpype/hosts/maya/plugins/publish/collect_render.py +++ b/openpype/hosts/maya/plugins/publish/collect_render.py @@ -42,7 +42,6 @@ Provides: import re import os import platform -import json from maya import cmds import maya.app.renderSetup.model.renderSetup as renderSetup From 6f404ed450f2141a2f1efba13c87918ee74948c1 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 10 Jan 2023 09:21:38 +0000 Subject: [PATCH 066/912] Improve debug logging. --- .../deadline/plugins/publish/submit_publish_job.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 5c5c54febb..4d98cabe25 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -503,6 +503,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): # toggle preview on if multipart is on if instance_data.get("multipartExr"): + self.log.debug("Adding preview tag because its multipartExr") preview = True self.log.debug("preview:{}".format(preview)) new_instance = deepcopy(instance_data) @@ -582,6 +583,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): if instance["useSequenceForReview"]: # toggle preview on if multipart is on if instance.get("multipartExr", False): + self.log.debug("Adding preview tag because its multipartExr") preview = True else: render_file_name = list(collection)[0] @@ -689,8 +691,14 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): if preview: if "ftrack" not in families: if os.environ.get("FTRACK_SERVER"): + self.log.debug( + "Adding \"ftrack\" to families because of preview tag." + ) families.append("ftrack") if "review" not in families: + self.log.debug( + "Adding \"review\" to families because of preview tag." + ) families.append("review") instance["families"] = families From a09667670a3c84afb87f95427500a9e1dc4461b5 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 10 Jan 2023 09:29:23 +0000 Subject: [PATCH 067/912] Hound --- .../modules/deadline/plugins/publish/submit_publish_job.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 4d98cabe25..45463ead1b 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -583,7 +583,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): if instance["useSequenceForReview"]: # toggle preview on if multipart is on if instance.get("multipartExr", False): - self.log.debug("Adding preview tag because its multipartExr") + self.log.debug( + "Adding preview tag because its multipartExr" + ) preview = True else: render_file_name = list(collection)[0] From 1575f24539b134f4e19315529338060c4d6ab00f Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Wed, 11 Jan 2023 15:51:01 +0000 Subject: [PATCH 068/912] Remove OCIO submodule --- vendor/configs/OpenColorIO-Configs | 1 - 1 file changed, 1 deletion(-) delete mode 160000 vendor/configs/OpenColorIO-Configs diff --git a/vendor/configs/OpenColorIO-Configs b/vendor/configs/OpenColorIO-Configs deleted file mode 160000 index 0bb079c08b..0000000000 --- a/vendor/configs/OpenColorIO-Configs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0bb079c08be410030669cbf5f19ff869b88af953 From 255fd940a1bb2c9cfab2bca9e064a036abf86ab4 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Wed, 11 Jan 2023 15:51:28 +0000 Subject: [PATCH 069/912] Fix default settings syntax error --- openpype/settings/defaults/project_settings/blender.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_settings/blender.json b/openpype/settings/defaults/project_settings/blender.json index e0adeb96da..7eabec6106 100644 --- a/openpype/settings/defaults/project_settings/blender.json +++ b/openpype/settings/defaults/project_settings/blender.json @@ -65,7 +65,7 @@ "enabled": true, "optional": true, "active": false - } + }, "ExtractThumbnail": { "enabled": true, "optional": true, From 1f45f8c5b37a3d42936ff068467ba78725fad84b Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Fri, 13 Jan 2023 23:08:23 +0800 Subject: [PATCH 070/912] add validator to the look publish --- .../publish/validate_look_color_space.py | 25 +++++++++++++++++++ .../defaults/project_settings/maya.json | 5 ++++ .../schemas/schema_maya_publish.json | 4 +++ 3 files changed, 34 insertions(+) create mode 100644 openpype/hosts/maya/plugins/publish/validate_look_color_space.py diff --git a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py new file mode 100644 index 0000000000..05a10fd9f6 --- /dev/null +++ b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py @@ -0,0 +1,25 @@ +from maya import cmds + +import pyblish.api +from openpype.pipeline.publish import ValidateContentsOrder + + +class ValidateMayaColorSpace(pyblish.api.InstancePlugin): + """ + Check if the OCIO Color Management and maketx options + enabled at the same time + """ + + order = ValidateContentsOrder + families = ['look'] + hosts = ['maya'] + label = 'Maya Color Space' + + def process(self, instance): + ocio_maya = cmds.colorManagementPrefs(q=True, + cmConfigFileEnabled=True, + cmEnabled=True) + maketx = instance.data["maketx"] + + if ocio_maya and maketx: + raise Exception("Maya is color managed and maketx option is on. OpenPype doesn't support this combination yet.") # noqa diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index 5f40c2a10c..21815278a8 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -306,6 +306,11 @@ "optional": true, "active": true }, + "ValidateMayaColorSpace": { + "enabled": true, + "optional": true, + "active": true + }, "ValidateAttributes": { "enabled": false, "attributes": {} diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json index 9aaff248ab..a920d5aeae 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json @@ -144,6 +144,10 @@ { "key": "ValidateShadingEngine", "label": "Validate Look Shading Engine Naming" + }, + { + "key": "ValidateMayaColorSpace", + "label": "ValidateMayaColorSpace" } ] }, From d206a64e936569c6b0b3719279dc82716ff9ba60 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Sat, 14 Jan 2023 00:09:16 +0800 Subject: [PATCH 071/912] adding info to tell user the tx conversion based on ocio.config --- openpype/hosts/maya/plugins/publish/extract_look.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openpype/hosts/maya/plugins/publish/extract_look.py b/openpype/hosts/maya/plugins/publish/extract_look.py index 878c2dceae..860872c3a6 100644 --- a/openpype/hosts/maya/plugins/publish/extract_look.py +++ b/openpype/hosts/maya/plugins/publish/extract_look.py @@ -535,6 +535,9 @@ class ExtractLook(publish.Extractor): self.log.info("tx: converting sRGB -> linear") additional_args.extend(["--colorconvert", "sRGB", "linear"]) + self.log.info("Using nuke-default ocio config instead of maya ocio config!") # noqa + self.log.info("The tx conversion is different from the maya tx conversion!") # noqa + config_path = get_ocio_config_path("nuke-default") additional_args.extend(["--colorconfig", config_path]) # Ensure folder exists From 1da3854c82e6145e42d2e986263e4dbe7f5d950e Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Mon, 16 Jan 2023 11:04:22 +0000 Subject: [PATCH 072/912] Implemented suggestions --- .../hosts/blender/plugins/publish/extract_thumbnail.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/blender/plugins/publish/extract_thumbnail.py b/openpype/hosts/blender/plugins/publish/extract_thumbnail.py index 5e9d876989..ba455cf450 100644 --- a/openpype/hosts/blender/plugins/publish/extract_thumbnail.py +++ b/openpype/hosts/blender/plugins/publish/extract_thumbnail.py @@ -21,6 +21,7 @@ class ExtractThumbnail(openpype.api.Extractor): hosts = ["blender"] families = ["review"] order = pyblish.api.ExtractorOrder + 0.01 + presets = {} def process(self, instance): self.log.info("Extracting capture..") @@ -36,11 +37,7 @@ class ExtractThumbnail(openpype.api.Extractor): family = instance.data.get("family") isolate = instance.data("isolate", None) - project_settings = instance.context.data["project_settings"]["blender"] - extractor_settings = project_settings["publish"]["ExtractThumbnail"] - presets = extractor_settings.get("presets") - - preset = presets.get(family, {}) + preset = self.presets.get(family, {}) preset.update({ "camera": camera, From 58808104280eba59fed182af0849a66e366450f3 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 16 Jan 2023 13:44:57 +0100 Subject: [PATCH 073/912] OP-4642 - refactor weird assignment Co-authored-by: Roy Nieterau --- openpype/plugins/publish/extract_color_transcode.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 62cf8f0dee..835b64b685 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -138,8 +138,7 @@ class ExtractColorTranscode(publish.Extractor): new_file_name = '{}.{}'.format(file_name, output_extension) renamed_files.append(new_file_name) - files_to_convert = renamed_files - return files_to_convert + return renamed_files def _get_profile(self, instance): """Returns profile if and how repre should be color transcoded.""" From 93c5d507a3fa6d8ea8592e1ad5217cc31fa0fbb9 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Mon, 16 Jan 2023 22:25:54 +0800 Subject: [PATCH 074/912] use RuntimeError instead of Exception and rename the validator --- .../hosts/maya/plugins/publish/validate_look_color_space.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py index 05a10fd9f6..9225feda24 100644 --- a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py +++ b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py @@ -1,3 +1,4 @@ +import os from maya import cmds import pyblish.api @@ -13,7 +14,7 @@ class ValidateMayaColorSpace(pyblish.api.InstancePlugin): order = ValidateContentsOrder families = ['look'] hosts = ['maya'] - label = 'Maya Color Space' + label = 'Color Management with maketx' def process(self, instance): ocio_maya = cmds.colorManagementPrefs(q=True, @@ -22,4 +23,4 @@ class ValidateMayaColorSpace(pyblish.api.InstancePlugin): maketx = instance.data["maketx"] if ocio_maya and maketx: - raise Exception("Maya is color managed and maketx option is on. OpenPype doesn't support this combination yet.") # noqa + raise RuntimeError("Maya is color managed and maketx option is on. OpenPype doesn't support this combination yet.") # noqa From d57a7c67cd7ded6eae21ebf0145acf2642b54e63 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Mon, 16 Jan 2023 22:26:59 +0800 Subject: [PATCH 075/912] use RuntimeError instead of Exception and rename the validator --- openpype/hosts/maya/plugins/publish/validate_look_color_space.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py index 9225feda24..b354d51fef 100644 --- a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py +++ b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py @@ -1,4 +1,3 @@ -import os from maya import cmds import pyblish.api From b35ee739bcfcc158daa9ef2d9261f3bda328d4cc Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 11:57:51 +0100 Subject: [PATCH 076/912] OP-4643 - added Settings for ExtractColorTranscode --- .../defaults/project_settings/global.json | 4 + .../schemas/schema_global_publish.json | 73 +++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index 0e078dc157..474e878cb6 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -68,6 +68,10 @@ "output": [] } }, + "ExtractColorTranscode": { + "enabled": true, + "profiles": [] + }, "ExtractReview": { "enabled": true, "profiles": [ diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 5388d04bc9..46ae6ba554 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -197,6 +197,79 @@ } ] }, + { + "type": "dict", + "collapsible": true, + "key": "ExtractColorTranscode", + "label": "ExtractColorTranscode", + "checkbox_key": "enabled", + "is_group": true, + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "list", + "key": "profiles", + "label": "Profiles", + "object_type": { + "type": "dict", + "children": [ + { + "key": "families", + "label": "Families", + "type": "list", + "object_type": "text" + }, + { + "key": "hosts", + "label": "Host names", + "type": "hosts-enum", + "multiselection": true + }, + { + "key": "task_types", + "label": "Task types", + "type": "task-types-enum" + }, + { + "key": "task_names", + "label": "Task names", + "type": "list", + "object_type": "text" + }, + { + "key": "subsets", + "label": "Subset names", + "type": "list", + "object_type": "text" + }, + { + "type": "splitter" + }, + { + "key": "ext", + "label": "Output extension", + "type": "text" + }, + { + "key": "output_colorspace", + "label": "Output colorspace", + "type": "text" + }, + { + "key": "custom_tags", + "label": "Custom Tags", + "type": "list", + "object_type": "text" + } + ] + } + } + ] + }, { "type": "dict", "collapsible": true, From 687d6dbf2811db3b8c6f46ee10726b26c1120772 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 11:58:51 +0100 Subject: [PATCH 077/912] OP-4643 - added ExtractColorTranscode Added method to convert from one colorspace to another to transcoding lib --- openpype/lib/transcoding.py | 53 ++++++++ .../publish/extract_color_transcode.py | 124 ++++++++++++++++++ 2 files changed, 177 insertions(+) create mode 100644 openpype/plugins/publish/extract_color_transcode.py diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 57279d0380..6899811ed5 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1037,3 +1037,56 @@ def convert_ffprobe_fps_to_float(value): if divisor == 0.0: return 0.0 return dividend / divisor + + +def convert_colorspace_for_input_paths( + input_paths, + output_dir, + source_color_space, + target_color_space, + logger=None +): + """Convert source files from one color space to another. + + Filenames of input files are kept so make sure that output directory + is not the same directory as input files have. + - This way it can handle gaps and can keep input filenames without handling + frame template + + Args: + input_paths (str): Paths that should be converted. It is expected that + contains single file or image sequence of samy type. + output_dir (str): Path to directory where output will be rendered. + Must not be same as input's directory. + source_color_space (str): ocio valid color space of source files + target_color_space (str): ocio valid target color space + logger (logging.Logger): Logger used for logging. + + """ + if logger is None: + logger = logging.getLogger(__name__) + + input_arg = "-i" + oiio_cmd = [ + get_oiio_tools_path(), + + # Don't add any additional attributes + "--nosoftwareattrib", + "--colorconvert", source_color_space, target_color_space + ] + for input_path in input_paths: + # Prepare subprocess arguments + + oiio_cmd.extend([ + input_arg, input_path, + ]) + + # Add last argument - path to output + base_filename = os.path.basename(input_path) + output_path = os.path.join(output_dir, base_filename) + oiio_cmd.extend([ + "-o", output_path + ]) + + logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) + run_subprocess(oiio_cmd, logger=logger) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py new file mode 100644 index 0000000000..58508ab18f --- /dev/null +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -0,0 +1,124 @@ +import pyblish.api + +from openpype.pipeline import publish +from openpype.lib import ( + + is_oiio_supported, +) + +from openpype.lib.transcoding import ( + convert_colorspace_for_input_paths, + get_transcode_temp_directory, +) + +from openpype.lib.profiles_filtering import filter_profiles + + +class ExtractColorTranscode(publish.Extractor): + """ + Extractor to convert colors from one colorspace to different. + """ + + label = "Transcode color spaces" + order = pyblish.api.ExtractorOrder + 0.01 + + optional = True + + # Configurable by Settings + profiles = None + options = None + + def process(self, instance): + if not self.profiles: + self.log.warning("No profiles present for create burnin") + return + + if "representations" not in instance.data: + self.log.warning("No representations, skipping.") + return + + if not is_oiio_supported(): + self.log.warning("OIIO not supported, no transcoding possible.") + return + + colorspace_data = instance.data.get("colorspaceData") + if not colorspace_data: + # TODO get_colorspace ?? + self.log.warning("Instance has not colorspace data, skipping") + return + source_color_space = colorspace_data["colorspace"] + + host_name = instance.context.data["hostName"] + family = instance.data["family"] + task_data = instance.data["anatomyData"].get("task", {}) + task_name = task_data.get("name") + task_type = task_data.get("type") + subset = instance.data["subset"] + + filtering_criteria = { + "hosts": host_name, + "families": family, + "task_names": task_name, + "task_types": task_type, + "subset": subset + } + profile = filter_profiles(self.profiles, filtering_criteria, + logger=self.log) + + if not profile: + self.log.info(( + "Skipped instance. None of profiles in presets are for" + " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" + " | Task type \"{}\" | Subset \"{}\" " + ).format(host_name, family, task_name, task_type, subset)) + return + + self.log.debug("profile: {}".format(profile)) + + target_colorspace = profile["output_colorspace"] + if not target_colorspace: + raise RuntimeError("Target colorspace must be set") + + repres = instance.data.get("representations") or [] + for idx, repre in enumerate(repres): + self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) + if not self.repre_is_valid(repre): + continue + + new_staging_dir = get_transcode_temp_directory() + repre["stagingDir"] = new_staging_dir + files_to_remove = repre["files"] + if not isinstance(files_to_remove, list): + files_to_remove = [files_to_remove] + instance.context.data["cleanupFullPaths"].extend(files_to_remove) + + convert_colorspace_for_input_paths( + repre["files"], + new_staging_dir, + source_color_space, + target_colorspace, + self.log + ) + + def repre_is_valid(self, repre): + """Validation if representation should be processed. + + Args: + repre (dict): Representation which should be checked. + + Returns: + bool: False if can't be processed else True. + """ + + if "review" not in (repre.get("tags") or []): + self.log.info(( + "Representation \"{}\" don't have \"review\" tag. Skipped." + ).format(repre["name"])) + return False + + if not repre.get("files"): + self.log.warning(( + "Representation \"{}\" have empty files. Skipped." + ).format(repre["name"])) + return False + return True From e36cf8004706a7d70133d79ea5e0ddd1f208f4c3 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 12:05:57 +0100 Subject: [PATCH 078/912] OP-4643 - extractor must run just before ExtractReview Nuke render local is set to 0.01 --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 58508ab18f..5163cd4045 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -20,7 +20,7 @@ class ExtractColorTranscode(publish.Extractor): """ label = "Transcode color spaces" - order = pyblish.api.ExtractorOrder + 0.01 + order = pyblish.api.ExtractorOrder + 0.019 optional = True From cb27e5a4d6b512dfa193b031ab266340975245f0 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:03:22 +0100 Subject: [PATCH 079/912] OP-4643 - fix for full file paths --- .../publish/extract_color_transcode.py | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 5163cd4045..6ad7599f2c 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -1,3 +1,4 @@ +import os import pyblish.api from openpype.pipeline import publish @@ -41,13 +42,6 @@ class ExtractColorTranscode(publish.Extractor): self.log.warning("OIIO not supported, no transcoding possible.") return - colorspace_data = instance.data.get("colorspaceData") - if not colorspace_data: - # TODO get_colorspace ?? - self.log.warning("Instance has not colorspace data, skipping") - return - source_color_space = colorspace_data["colorspace"] - host_name = instance.context.data["hostName"] family = instance.data["family"] task_data = instance.data["anatomyData"].get("task", {}) @@ -82,18 +76,32 @@ class ExtractColorTranscode(publish.Extractor): repres = instance.data.get("representations") or [] for idx, repre in enumerate(repres): self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) - if not self.repre_is_valid(repre): + # if not self.repre_is_valid(repre): + # continue + + colorspace_data = repre.get("colorspaceData") + if not colorspace_data: + # TODO get_colorspace ?? + self.log.warning("Repre has not colorspace data, skipping") + continue + source_color_space = colorspace_data["colorspace"] + config_path = colorspace_data.get("configData", {}).get("path") + if not os.path.exists(config_path): + self.log.warning("Config file doesn't exist, skipping") continue new_staging_dir = get_transcode_temp_directory() + original_staging_dir = repre["stagingDir"] repre["stagingDir"] = new_staging_dir - files_to_remove = repre["files"] - if not isinstance(files_to_remove, list): - files_to_remove = [files_to_remove] - instance.context.data["cleanupFullPaths"].extend(files_to_remove) + files_to_convert = repre["files"] + if not isinstance(files_to_convert, list): + files_to_convert = [files_to_convert] + files_to_convert = [os.path.join(original_staging_dir, path) + for path in files_to_convert] + instance.context.data["cleanupFullPaths"].extend(files_to_convert) convert_colorspace_for_input_paths( - repre["files"], + files_to_convert, new_staging_dir, source_color_space, target_colorspace, From 7201c57ddc71cac47f6ea38fdbf7d6c1d2d03577 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:04:06 +0100 Subject: [PATCH 080/912] OP-4643 - pass path for ocio config --- openpype/lib/transcoding.py | 3 +++ openpype/plugins/publish/extract_color_transcode.py | 1 + 2 files changed, 4 insertions(+) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 6899811ed5..792e8ddd1e 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1042,6 +1042,7 @@ def convert_ffprobe_fps_to_float(value): def convert_colorspace_for_input_paths( input_paths, output_dir, + config_path, source_color_space, target_color_space, logger=None @@ -1058,6 +1059,7 @@ def convert_colorspace_for_input_paths( contains single file or image sequence of samy type. output_dir (str): Path to directory where output will be rendered. Must not be same as input's directory. + config_path (str): path to OCIO config file source_color_space (str): ocio valid color space of source files target_color_space (str): ocio valid target color space logger (logging.Logger): Logger used for logging. @@ -1072,6 +1074,7 @@ def convert_colorspace_for_input_paths( # Don't add any additional attributes "--nosoftwareattrib", + "--colorconfig", config_path, "--colorconvert", source_color_space, target_color_space ] for input_path in input_paths: diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 6ad7599f2c..fdb13a47e8 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -103,6 +103,7 @@ class ExtractColorTranscode(publish.Extractor): convert_colorspace_for_input_paths( files_to_convert, new_staging_dir, + config_path, source_color_space, target_colorspace, self.log From dc796b71b4c50d2bb0240667cf9d0f19d85ad5dc Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:15:33 +0100 Subject: [PATCH 081/912] OP-4643 - add custom_tags --- openpype/plugins/publish/extract_color_transcode.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index fdb13a47e8..ab932b2476 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -72,6 +72,7 @@ class ExtractColorTranscode(publish.Extractor): target_colorspace = profile["output_colorspace"] if not target_colorspace: raise RuntimeError("Target colorspace must be set") + custom_tags = profile["custom_tags"] repres = instance.data.get("representations") or [] for idx, repre in enumerate(repres): @@ -109,6 +110,11 @@ class ExtractColorTranscode(publish.Extractor): self.log ) + if custom_tags: + if not repre.get("custom_tags"): + repre["custom_tags"] = [] + repre["custom_tags"].extend(custom_tags) + def repre_is_valid(self, repre): """Validation if representation should be processed. From 50ff228070729e87dc0a846aa82461fdcc8b08b7 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:18:38 +0100 Subject: [PATCH 082/912] OP-4643 - added docstring --- openpype/plugins/publish/extract_color_transcode.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index ab932b2476..88e2eed90f 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -18,6 +18,17 @@ from openpype.lib.profiles_filtering import filter_profiles class ExtractColorTranscode(publish.Extractor): """ Extractor to convert colors from one colorspace to different. + + Expects "colorspaceData" on representation. This dictionary is collected + previously and denotes that representation files should be converted. + This dict contains source colorspace information, collected by hosts. + + Target colorspace is selected by profiles in the Settings, based on: + - families + - host + - task types + - task names + - subset names """ label = "Transcode color spaces" From 7a162f9dba79e1c829b9a01338917033607ec074 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:15:44 +0100 Subject: [PATCH 083/912] OP-4643 - updated Settings schema --- .../schemas/schema_global_publish.json | 48 +++++++++++++------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 46ae6ba554..c2c911d7d6 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -246,24 +246,44 @@ "type": "list", "object_type": "text" }, + { + "type": "boolean", + "key": "delete_original", + "label": "Delete Original Representation" + }, { "type": "splitter" }, { - "key": "ext", - "label": "Output extension", - "type": "text" - }, - { - "key": "output_colorspace", - "label": "Output colorspace", - "type": "text" - }, - { - "key": "custom_tags", - "label": "Custom Tags", - "type": "list", - "object_type": "text" + "key": "outputs", + "label": "Output Definitions", + "type": "dict-modifiable", + "highlight_content": true, + "object_type": { + "type": "dict", + "children": [ + { + "key": "output_extension", + "label": "Output extension", + "type": "text" + }, + { + "key": "output_colorspace", + "label": "Output colorspace", + "type": "text" + }, + { + "type": "schema", + "name": "schema_representation_tags" + }, + { + "key": "custom_tags", + "label": "Custom Tags", + "type": "list", + "object_type": "text" + } + ] + } } ] } From 171af695c3ebfdb5a946af8897002e853f34af81 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:17:25 +0100 Subject: [PATCH 084/912] OP-4643 - skip video files Only frames currently supported. --- .../plugins/publish/extract_color_transcode.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 88e2eed90f..a0714c9a33 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -36,6 +36,9 @@ class ExtractColorTranscode(publish.Extractor): optional = True + # Supported extensions + supported_exts = ["exr", "jpg", "jpeg", "png", "dpx"] + # Configurable by Settings profiles = None options = None @@ -88,13 +91,7 @@ class ExtractColorTranscode(publish.Extractor): repres = instance.data.get("representations") or [] for idx, repre in enumerate(repres): self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) - # if not self.repre_is_valid(repre): - # continue - - colorspace_data = repre.get("colorspaceData") - if not colorspace_data: - # TODO get_colorspace ?? - self.log.warning("Repre has not colorspace data, skipping") + if not self._repre_is_valid(repre): continue source_color_space = colorspace_data["colorspace"] config_path = colorspace_data.get("configData", {}).get("path") @@ -136,9 +133,9 @@ class ExtractColorTranscode(publish.Extractor): bool: False if can't be processed else True. """ - if "review" not in (repre.get("tags") or []): - self.log.info(( - "Representation \"{}\" don't have \"review\" tag. Skipped." + if repre.get("ext") not in self.supported_exts: + self.log.warning(( + "Representation \"{}\" of unsupported extension. Skipped." ).format(repre["name"])) return False From c7b443519e220ca14dc32ee135c6dcc8085c7d88 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:19:08 +0100 Subject: [PATCH 085/912] OP-4643 - refactored profile, delete of original Implemented multiple outputs from single input representation --- .../publish/extract_color_transcode.py | 156 ++++++++++++------ 1 file changed, 109 insertions(+), 47 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index a0714c9a33..b0c851d5f4 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -1,4 +1,6 @@ import os +import copy + import pyblish.api from openpype.pipeline import publish @@ -56,13 +58,94 @@ class ExtractColorTranscode(publish.Extractor): self.log.warning("OIIO not supported, no transcoding possible.") return + profile = self._get_profile(instance) + if not profile: + return + + repres = instance.data.get("representations") or [] + for idx, repre in enumerate(list(repres)): + self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) + if not self._repre_is_valid(repre): + continue + + colorspace_data = repre["colorspaceData"] + source_color_space = colorspace_data["colorspace"] + config_path = colorspace_data.get("configData", {}).get("path") + if not os.path.exists(config_path): + self.log.warning("Config file doesn't exist, skipping") + continue + + repre = self._handle_original_repre(repre, profile) + + for _, output_def in profile.get("outputs", {}).items(): + new_repre = copy.deepcopy(repre) + + new_staging_dir = get_transcode_temp_directory() + original_staging_dir = new_repre["stagingDir"] + new_repre["stagingDir"] = new_staging_dir + files_to_convert = new_repre["files"] + if not isinstance(files_to_convert, list): + files_to_convert = [files_to_convert] + + files_to_delete = copy.deepcopy(files_to_convert) + + output_extension = output_def["output_extension"] + files_to_convert = self._rename_output_files(files_to_convert, + output_extension) + + files_to_convert = [os.path.join(original_staging_dir, path) + for path in files_to_convert] + + target_colorspace = output_def["output_colorspace"] + if not target_colorspace: + raise RuntimeError("Target colorspace must be set") + + convert_colorspace_for_input_paths( + files_to_convert, + new_staging_dir, + config_path, + source_color_space, + target_colorspace, + self.log + ) + + instance.context.data["cleanupFullPaths"].extend( + files_to_delete) + + custom_tags = output_def.get("custom_tags") + if custom_tags: + if not new_repre.get("custom_tags"): + new_repre["custom_tags"] = [] + new_repre["custom_tags"].extend(custom_tags) + + # Add additional tags from output definition to representation + for tag in output_def["tags"]: + if tag not in new_repre["tags"]: + new_repre["tags"].append(tag) + + instance.data["representations"].append(new_repre) + + def _rename_output_files(self, files_to_convert, output_extension): + """Change extension of converted files.""" + if output_extension: + output_extension = output_extension.replace('.', '') + renamed_files = [] + for file_name in files_to_convert: + file_name, _ = os.path.splitext(file_name) + new_file_name = '{}.{}'.format(file_name, + output_extension) + renamed_files.append(new_file_name) + files_to_convert = renamed_files + return files_to_convert + + def _get_profile(self, instance): + """Returns profile if and how repre should be color transcoded.""" host_name = instance.context.data["hostName"] family = instance.data["family"] task_data = instance.data["anatomyData"].get("task", {}) task_name = task_data.get("name") task_type = task_data.get("type") subset = instance.data["subset"] - filtering_criteria = { "hosts": host_name, "families": family, @@ -75,55 +158,15 @@ class ExtractColorTranscode(publish.Extractor): if not profile: self.log.info(( - "Skipped instance. None of profiles in presets are for" - " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" - " | Task type \"{}\" | Subset \"{}\" " - ).format(host_name, family, task_name, task_type, subset)) - return + "Skipped instance. None of profiles in presets are for" + " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" + " | Task type \"{}\" | Subset \"{}\" " + ).format(host_name, family, task_name, task_type, subset)) self.log.debug("profile: {}".format(profile)) + return profile - target_colorspace = profile["output_colorspace"] - if not target_colorspace: - raise RuntimeError("Target colorspace must be set") - custom_tags = profile["custom_tags"] - - repres = instance.data.get("representations") or [] - for idx, repre in enumerate(repres): - self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) - if not self._repre_is_valid(repre): - continue - source_color_space = colorspace_data["colorspace"] - config_path = colorspace_data.get("configData", {}).get("path") - if not os.path.exists(config_path): - self.log.warning("Config file doesn't exist, skipping") - continue - - new_staging_dir = get_transcode_temp_directory() - original_staging_dir = repre["stagingDir"] - repre["stagingDir"] = new_staging_dir - files_to_convert = repre["files"] - if not isinstance(files_to_convert, list): - files_to_convert = [files_to_convert] - files_to_convert = [os.path.join(original_staging_dir, path) - for path in files_to_convert] - instance.context.data["cleanupFullPaths"].extend(files_to_convert) - - convert_colorspace_for_input_paths( - files_to_convert, - new_staging_dir, - config_path, - source_color_space, - target_colorspace, - self.log - ) - - if custom_tags: - if not repre.get("custom_tags"): - repre["custom_tags"] = [] - repre["custom_tags"].extend(custom_tags) - - def repre_is_valid(self, repre): + def _repre_is_valid(self, repre): """Validation if representation should be processed. Args: @@ -144,4 +187,23 @@ class ExtractColorTranscode(publish.Extractor): "Representation \"{}\" have empty files. Skipped." ).format(repre["name"])) return False + + if not repre.get("colorspaceData"): + self.log.warning("Repre has not colorspace data, skipping") + return False + return True + + def _handle_original_repre(self, repre, profile): + delete_original = profile["delete_original"] + + if delete_original: + if not repre.get("tags"): + repre["tags"] = [] + + if "review" in repre["tags"]: + repre["tags"].remove("review") + if "delete" not in repre["tags"]: + repre["tags"].append("delete") + + return repre From 69c04bb01dc7bc220318a3d6f63e4ed568bddff2 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:23:01 +0100 Subject: [PATCH 086/912] OP-4643 - switched logging levels Do not use warning unnecessary. --- openpype/plugins/publish/extract_color_transcode.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index b0c851d5f4..4d38514b8b 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -47,11 +47,11 @@ class ExtractColorTranscode(publish.Extractor): def process(self, instance): if not self.profiles: - self.log.warning("No profiles present for create burnin") + self.log.debug("No profiles present for color transcode") return if "representations" not in instance.data: - self.log.warning("No representations, skipping.") + self.log.debug("No representations, skipping.") return if not is_oiio_supported(): @@ -177,19 +177,19 @@ class ExtractColorTranscode(publish.Extractor): """ if repre.get("ext") not in self.supported_exts: - self.log.warning(( + self.log.debug(( "Representation \"{}\" of unsupported extension. Skipped." ).format(repre["name"])) return False if not repre.get("files"): - self.log.warning(( + self.log.debug(( "Representation \"{}\" have empty files. Skipped." ).format(repre["name"])) return False if not repre.get("colorspaceData"): - self.log.warning("Repre has not colorspace data, skipping") + self.log.debug("Repre has no colorspace data. Skipped.") return False return True From 44e12b05b95db1f0b1a43ad506850b5578705942 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:46:14 +0100 Subject: [PATCH 087/912] OP-4643 - propagate new extension to representation --- .../publish/extract_color_transcode.py | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 4d38514b8b..62cf8f0dee 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -90,8 +90,13 @@ class ExtractColorTranscode(publish.Extractor): files_to_delete = copy.deepcopy(files_to_convert) output_extension = output_def["output_extension"] - files_to_convert = self._rename_output_files(files_to_convert, - output_extension) + output_extension = output_extension.replace('.', '') + if output_extension: + new_repre["name"] = output_extension + new_repre["ext"] = output_extension + + files_to_convert = self._rename_output_files( + files_to_convert, output_extension) files_to_convert = [os.path.join(original_staging_dir, path) for path in files_to_convert] @@ -127,15 +132,13 @@ class ExtractColorTranscode(publish.Extractor): def _rename_output_files(self, files_to_convert, output_extension): """Change extension of converted files.""" - if output_extension: - output_extension = output_extension.replace('.', '') - renamed_files = [] - for file_name in files_to_convert: - file_name, _ = os.path.splitext(file_name) - new_file_name = '{}.{}'.format(file_name, - output_extension) - renamed_files.append(new_file_name) - files_to_convert = renamed_files + renamed_files = [] + for file_name in files_to_convert: + file_name, _ = os.path.splitext(file_name) + new_file_name = '{}.{}'.format(file_name, + output_extension) + renamed_files.append(new_file_name) + files_to_convert = renamed_files return files_to_convert def _get_profile(self, instance): From 85fc41bd7427a395fbf1454b12a6ee6fea34e594 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:46:35 +0100 Subject: [PATCH 088/912] OP-4643 - added label to Settings --- .../projects_schema/schemas/schema_global_publish.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index c2c911d7d6..7155510fef 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -201,10 +201,14 @@ "type": "dict", "collapsible": true, "key": "ExtractColorTranscode", - "label": "ExtractColorTranscode", + "label": "ExtractColorTranscode (ImageIO)", "checkbox_key": "enabled", "is_group": true, "children": [ + { + "type": "label", + "label": "Configure output format(s) and color spaces for matching representations. Empty 'Output extension' denotes keeping source extension." + }, { "type": "boolean", "key": "enabled", From 24abe69437801ea4f022d3a0816664e93b2072f4 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 16 Jan 2023 18:22:08 +0100 Subject: [PATCH 089/912] OP-4643 - refactored according to review Function turned into single filepath input. --- openpype/lib/transcoding.py | 43 ++++++----- .../publish/extract_color_transcode.py | 72 ++++++++++--------- 2 files changed, 57 insertions(+), 58 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 792e8ddd1e..8e3432e0e9 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1039,12 +1039,12 @@ def convert_ffprobe_fps_to_float(value): return dividend / divisor -def convert_colorspace_for_input_paths( - input_paths, - output_dir, +def convert_colorspace( + input_path, + out_filepath, config_path, - source_color_space, - target_color_space, + source_colorspace, + target_colorspace, logger=None ): """Convert source files from one color space to another. @@ -1055,13 +1055,13 @@ def convert_colorspace_for_input_paths( frame template Args: - input_paths (str): Paths that should be converted. It is expected that + input_path (str): Paths that should be converted. It is expected that contains single file or image sequence of samy type. - output_dir (str): Path to directory where output will be rendered. + out_filepath (str): Path to directory where output will be rendered. Must not be same as input's directory. config_path (str): path to OCIO config file - source_color_space (str): ocio valid color space of source files - target_color_space (str): ocio valid target color space + source_colorspace (str): ocio valid color space of source files + target_colorspace (str): ocio valid target color space logger (logging.Logger): Logger used for logging. """ @@ -1075,21 +1075,18 @@ def convert_colorspace_for_input_paths( # Don't add any additional attributes "--nosoftwareattrib", "--colorconfig", config_path, - "--colorconvert", source_color_space, target_color_space + "--colorconvert", source_colorspace, target_colorspace ] - for input_path in input_paths: - # Prepare subprocess arguments + # Prepare subprocess arguments - oiio_cmd.extend([ - input_arg, input_path, - ]) + oiio_cmd.extend([ + input_arg, input_path, + ]) - # Add last argument - path to output - base_filename = os.path.basename(input_path) - output_path = os.path.join(output_dir, base_filename) - oiio_cmd.extend([ - "-o", output_path - ]) + # Add last argument - path to output + oiio_cmd.extend([ + "-o", out_filepath + ]) - logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) - run_subprocess(oiio_cmd, logger=logger) + logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) + run_subprocess(oiio_cmd, logger=logger) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 62cf8f0dee..3a05426432 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -10,7 +10,7 @@ from openpype.lib import ( ) from openpype.lib.transcoding import ( - convert_colorspace_for_input_paths, + convert_colorspace, get_transcode_temp_directory, ) @@ -69,7 +69,7 @@ class ExtractColorTranscode(publish.Extractor): continue colorspace_data = repre["colorspaceData"] - source_color_space = colorspace_data["colorspace"] + source_colorspace = colorspace_data["colorspace"] config_path = colorspace_data.get("configData", {}).get("path") if not os.path.exists(config_path): self.log.warning("Config file doesn't exist, skipping") @@ -80,8 +80,8 @@ class ExtractColorTranscode(publish.Extractor): for _, output_def in profile.get("outputs", {}).items(): new_repre = copy.deepcopy(repre) - new_staging_dir = get_transcode_temp_directory() original_staging_dir = new_repre["stagingDir"] + new_staging_dir = get_transcode_temp_directory() new_repre["stagingDir"] = new_staging_dir files_to_convert = new_repre["files"] if not isinstance(files_to_convert, list): @@ -92,27 +92,28 @@ class ExtractColorTranscode(publish.Extractor): output_extension = output_def["output_extension"] output_extension = output_extension.replace('.', '') if output_extension: - new_repre["name"] = output_extension + if new_repre["name"] == new_repre["ext"]: + new_repre["name"] = output_extension new_repre["ext"] = output_extension - files_to_convert = self._rename_output_files( - files_to_convert, output_extension) - - files_to_convert = [os.path.join(original_staging_dir, path) - for path in files_to_convert] - target_colorspace = output_def["output_colorspace"] if not target_colorspace: raise RuntimeError("Target colorspace must be set") - convert_colorspace_for_input_paths( - files_to_convert, - new_staging_dir, - config_path, - source_color_space, - target_colorspace, - self.log - ) + for file_name in files_to_convert: + input_filepath = os.path.join(original_staging_dir, + file_name) + output_path = self._get_output_file_path(input_filepath, + new_staging_dir, + output_extension) + convert_colorspace( + input_filepath, + output_path, + config_path, + source_colorspace, + target_colorspace, + self.log + ) instance.context.data["cleanupFullPaths"].extend( files_to_delete) @@ -130,16 +131,16 @@ class ExtractColorTranscode(publish.Extractor): instance.data["representations"].append(new_repre) - def _rename_output_files(self, files_to_convert, output_extension): - """Change extension of converted files.""" - renamed_files = [] - for file_name in files_to_convert: - file_name, _ = os.path.splitext(file_name) - new_file_name = '{}.{}'.format(file_name, - output_extension) - renamed_files.append(new_file_name) - files_to_convert = renamed_files - return files_to_convert + def _get_output_file_path(self, input_filepath, output_dir, + output_extension): + """Create output file name path.""" + file_name = os.path.basename(input_filepath) + file_name, input_extension = os.path.splitext(file_name) + if not output_extension: + output_extension = input_extension + new_file_name = '{}.{}'.format(file_name, + output_extension) + return os.path.join(output_dir, new_file_name) def _get_profile(self, instance): """Returns profile if and how repre should be color transcoded.""" @@ -161,10 +162,10 @@ class ExtractColorTranscode(publish.Extractor): if not profile: self.log.info(( - "Skipped instance. None of profiles in presets are for" - " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" - " | Task type \"{}\" | Subset \"{}\" " - ).format(host_name, family, task_name, task_type, subset)) + "Skipped instance. None of profiles in presets are for" + " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" + " | Task type \"{}\" | Subset \"{}\" " + ).format(host_name, family, task_name, task_type, subset)) self.log.debug("profile: {}".format(profile)) return profile @@ -181,18 +182,19 @@ class ExtractColorTranscode(publish.Extractor): if repre.get("ext") not in self.supported_exts: self.log.debug(( - "Representation \"{}\" of unsupported extension. Skipped." + "Representation '{}' of unsupported extension. Skipped." ).format(repre["name"])) return False if not repre.get("files"): self.log.debug(( - "Representation \"{}\" have empty files. Skipped." + "Representation '{}' have empty files. Skipped." ).format(repre["name"])) return False if not repre.get("colorspaceData"): - self.log.debug("Repre has no colorspace data. Skipped.") + self.log.debug("Representation '{}' has no colorspace data. " + "Skipped.") return False return True From 53470bb0333cd8662e3bf4433fa78898bb29eb19 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 18 Jan 2023 09:56:29 +0000 Subject: [PATCH 090/912] Initial draft --- openpype/hosts/maya/api/lib_renderproducts.py | 73 ++++++++++++++----- .../maya/plugins/publish/collect_render.py | 4 +- openpype/hosts/maya/startup/userSetup.py | 8 +- .../plugins/publish/submit_publish_job.py | 33 ++++++++- 4 files changed, 92 insertions(+), 26 deletions(-) diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py index c54e3ab3e0..b76b441588 100644 --- a/openpype/hosts/maya/api/lib_renderproducts.py +++ b/openpype/hosts/maya/api/lib_renderproducts.py @@ -127,6 +127,7 @@ class RenderProduct(object): """ productName = attr.ib() ext = attr.ib() # extension + colorspace = attr.ib() # colorspace aov = attr.ib(default=None) # source aov driver = attr.ib(default=None) # source driver multipart = attr.ib(default=False) # multichannel file @@ -344,7 +345,6 @@ class ARenderProducts: separator = file_prefix[matches[0].end(1):matches[1].start(1)] return separator - def _get_layer_data(self): # type: () -> LayerMetadata # ______________________________________________ @@ -553,6 +553,9 @@ class RenderProductsArnold(ARenderProducts): ] for ai_driver in ai_drivers: + colorspace = self._get_colorspace( + ai_driver + ".colorManagement" + ) # todo: check aiAOVDriver.prefix as it could have # a custom path prefix set for this driver @@ -590,12 +593,15 @@ class RenderProductsArnold(ARenderProducts): global_aov = self._get_attr(aov, "globalAov") if global_aov: for camera in cameras: - product = RenderProduct(productName=name, - ext=ext, - aov=aov_name, - driver=ai_driver, - multipart=multipart, - camera=camera) + product = RenderProduct( + productName=name, + ext=ext, + aov=aov_name, + driver=ai_driver, + multipart=multipart, + camera=camera, + colorspace=colorspace + ) products.append(product) all_light_groups = self._get_attr(aov, "lightGroups") @@ -603,13 +609,16 @@ class RenderProductsArnold(ARenderProducts): # All light groups is enabled. A single multipart # Render Product for camera in cameras: - product = RenderProduct(productName=name + "_lgroups", - ext=ext, - aov=aov_name, - driver=ai_driver, - # Always multichannel output - multipart=True, - camera=camera) + product = RenderProduct( + productName=name + "_lgroups", + ext=ext, + aov=aov_name, + driver=ai_driver, + # Always multichannel output + multipart=True, + camera=camera, + colorspace=colorspace + ) products.append(product) else: value = self._get_attr(aov, "lightGroupsList") @@ -625,12 +634,28 @@ class RenderProductsArnold(ARenderProducts): aov=aov_name, driver=ai_driver, ext=ext, - camera=camera + camera=camera, + colorspace=colorspace ) products.append(product) return products + def _get_colorspace(self, attribute): + """Resolve colorspace from Arnold settings.""" + + def _view_transform(): + preferences = lib.get_color_management_preferences() + return preferences["view_transform"] + + resolved_values = { + "Raw": lambda: "Raw", + "Use View Transform": _view_transform, + # Default. Same as Maya Preferences. + "Use Output Transform": lib.get_color_management_output_transform + } + return resolved_values[self._get_attr(attribute)]() + def get_render_products(self): """Get all AOVs. @@ -659,11 +684,19 @@ class RenderProductsArnold(ARenderProducts): ] default_ext = self._get_attr("defaultRenderGlobals.imfPluginKey") - beauty_products = [RenderProduct( - productName="beauty", - ext=default_ext, - driver="defaultArnoldDriver", - camera=camera) for camera in cameras] + colorspace = self._get_colorspace( + "defaultArnoldDriver.colorManagement" + ) + beauty_products = [ + RenderProduct( + productName="beauty", + ext=default_ext, + driver="defaultArnoldDriver", + camera=camera, + colorspace=colorspace + ) for camera in cameras + ] + # AOVs > Legacy > Maya Render View > Mode aovs_enabled = bool( self._get_attr("defaultArnoldRenderOptions.aovMode") diff --git a/openpype/hosts/maya/plugins/publish/collect_render.py b/openpype/hosts/maya/plugins/publish/collect_render.py index b1ad3ca58e..2c89424381 100644 --- a/openpype/hosts/maya/plugins/publish/collect_render.py +++ b/openpype/hosts/maya/plugins/publish/collect_render.py @@ -42,7 +42,6 @@ Provides: import re import os import platform -import json from maya import cmds import maya.app.renderSetup.model.renderSetup as renderSetup @@ -318,6 +317,9 @@ class CollectMayaRender(pyblish.api.ContextPlugin): "aovSeparator": layer_render_products.layer_data.aov_separator, # noqa: E501 "renderSetupIncludeLights": render_instance.data.get( "renderSetupIncludeLights" + ), + "colorspaceConfig": ( + lib.get_color_management_preferences()["config"] ) } diff --git a/openpype/hosts/maya/startup/userSetup.py b/openpype/hosts/maya/startup/userSetup.py index 40cd51f2d8..cb5aa4a898 100644 --- a/openpype/hosts/maya/startup/userSetup.py +++ b/openpype/hosts/maya/startup/userSetup.py @@ -4,10 +4,16 @@ from openpype.pipeline import install_host from openpype.hosts.maya.api import MayaHost from maya import cmds +# MAYA_RESOURCES enviornment variable is referenced in default OCIO path but +# it's not part of the environment. Patching this so it works as expected. +if "MAYA_RESOURCES" not in os.environ: + os.environ["MAYA_RESOURCES"] = os.path.join( + os.environ["MAYA_LOCATION"], "resources" + ).replace("\\", "/") + host = MayaHost() install_host(host) - print("starting OpenPype usersetup") # build a shelf diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 7e39a644a2..8811fa5d34 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -427,7 +427,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): self.log.info( "Finished copying %i files" % len(resource_files)) - def _create_instances_for_aov(self, instance_data, exp_files): + def _create_instances_for_aov( + self, instance_data, exp_files, additional_data + ): """Create instance for each AOV found. This will create new instance for every aov it can detect in expected @@ -528,6 +530,14 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): else: files = os.path.basename(col) + # Copy render product "colorspace" data to representation. + colorspace = "" + products = additional_data["renderProducts"].layer_data.products + for product in products: + if product.productName == aov: + colorspace = product.colorspace + break + rep = { "name": ext, "ext": ext, @@ -537,7 +547,14 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): # If expectedFile are absolute, we need only filenames "stagingDir": staging, "fps": new_instance.get("fps"), - "tags": ["review"] if preview else [] + "tags": ["review"] if preview else [], + "colorspaceData": { + "colorspace": colorspace, + "configData": { + "path": additional_data["colorspaceConfig"], + "template": "" + } + } } # support conversion from tiled to scanline @@ -561,7 +578,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): self.log.debug("instances:{}".format(instances)) return instances - def _get_representations(self, instance, exp_files): + def _get_representations(self, instance, exp_files, additional_data): """Create representations for file sequences. This will return representations of expected files if they are not @@ -897,6 +914,11 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): self.log.info(data.get("expectedFiles")) + additional_data = { + "renderProducts": instance.data["renderProducts"], + "colorspaceConfig": instance.data["colorspaceConfig"] + } + if isinstance(data.get("expectedFiles")[0], dict): # we cannot attach AOVs to other subsets as we consider every # AOV subset of its own. @@ -911,12 +933,15 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): # there are multiple renderable cameras in scene) instances = self._create_instances_for_aov( instance_skeleton_data, - data.get("expectedFiles")) + data.get("expectedFiles"), + additional_data + ) self.log.info("got {} instance{}".format( len(instances), "s" if len(instances) > 1 else "")) else: + #Need to inject colorspace here. representations = self._get_representations( instance_skeleton_data, data.get("expectedFiles") From ab9b2d5970b458447e442d9d031bc3d8e76ddc7e Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 18 Jan 2023 15:13:12 +0000 Subject: [PATCH 091/912] Missing initial commit --- openpype/hosts/maya/api/lib.py | 45 ++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index dd5da275e8..95b4db1b42 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -5,6 +5,7 @@ import sys import platform import uuid import math +import re import json import logging @@ -3446,3 +3447,47 @@ def iter_visible_nodes_in_range(nodes, start, end): def get_attribute_input(attr): connections = cmds.listConnections(attr, plugs=True, destination=False) return connections[0] if connections else None + + +def get_color_management_preferences(): + """Get and resolve OCIO preferences.""" + data = { + # Is color management enabled. + "enabled": cmds.colorManagementPrefs( + query=True, cmEnabled=True + ), + "rendering_space": cmds.colorManagementPrefs( + query=True, renderingSpaceName=True + ), + "output_transform": cmds.colorManagementPrefs( + query=True, outputTransformName=True + ), + "output_transform_enabled": cmds.colorManagementPrefs( + query=True, outputTransformEnabled=True + ), + "view_transform": cmds.colorManagementPrefs( + query=True, viewTransformName=True + ) + } + + path = cmds.colorManagementPrefs( + query=True, configFilePath=True + ) + # Resolve environment variables in config path. "MAYA_RESOURCES" are in the + # path by default. + for group in re.search(r'(<.*>)', path).groups(): + path = path.replace( + group, os.environ[group[1:-1]] + ) + + data["config"] = path + + return data + + +def get_color_management_output_transform(): + preferences = get_color_management_preferences() + colorspace = preferences["rendering_space"] + if preferences["output_transform_enabled"]: + colorspace = preferences["output_transform"] + return colorspace From 3279634dacd18e6d38a29708596c822d276781c6 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 18 Jan 2023 17:57:28 +0000 Subject: [PATCH 092/912] Fix Environment variable substitution in path --- openpype/hosts/maya/api/lib.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index 95b4db1b42..b4aa18af65 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -3473,12 +3473,14 @@ def get_color_management_preferences(): path = cmds.colorManagementPrefs( query=True, configFilePath=True ) + # Resolve environment variables in config path. "MAYA_RESOURCES" are in the # path by default. - for group in re.search(r'(<.*>)', path).groups(): - path = path.replace( - group, os.environ[group[1:-1]] - ) + def _subst_with_env_value(match): + key = match.group(1) + return os.environ.get(key, "") + + path = re.sub(r'<([^>]+)>', _subst_with_env_value, path) data["config"] = path From 7a7f87e861abf4aae7fb3a96f660d74fe4866329 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 19 Jan 2023 09:30:11 +0000 Subject: [PATCH 093/912] Improvement Cleaner way to resolve in path. --- openpype/hosts/maya/api/lib.py | 11 ++++------- openpype/hosts/maya/startup/userSetup.py | 6 ------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index b4aa18af65..0807db88dc 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -3474,13 +3474,10 @@ def get_color_management_preferences(): query=True, configFilePath=True ) - # Resolve environment variables in config path. "MAYA_RESOURCES" are in the - # path by default. - def _subst_with_env_value(match): - key = match.group(1) - return os.environ.get(key, "") - - path = re.sub(r'<([^>]+)>', _subst_with_env_value, path) + # The OCIO config supports a custom token. + maya_resources_token = "" + maya_resources_path = om.MGlobal.getAbsolutePathToResources() + path = path.replace(maya_resources_token, maya_resources_path) data["config"] = path diff --git a/openpype/hosts/maya/startup/userSetup.py b/openpype/hosts/maya/startup/userSetup.py index cb5aa4a898..1104421cd9 100644 --- a/openpype/hosts/maya/startup/userSetup.py +++ b/openpype/hosts/maya/startup/userSetup.py @@ -4,12 +4,6 @@ from openpype.pipeline import install_host from openpype.hosts.maya.api import MayaHost from maya import cmds -# MAYA_RESOURCES enviornment variable is referenced in default OCIO path but -# it's not part of the environment. Patching this so it works as expected. -if "MAYA_RESOURCES" not in os.environ: - os.environ["MAYA_RESOURCES"] = os.path.join( - os.environ["MAYA_LOCATION"], "resources" - ).replace("\\", "/") host = MayaHost() install_host(host) From c2d0bc8f39f69fc8f2cea36972242e946a6c9deb Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 19 Jan 2023 09:34:55 +0000 Subject: [PATCH 094/912] HOund --- openpype/hosts/maya/api/lib.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index 0807db88dc..23f7319d4a 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -5,7 +5,6 @@ import sys import platform import uuid import math -import re import json import logging From a9a86d112093d6b4dd47f6edc5f9ac75ace3b13d Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 12:53:02 +0100 Subject: [PATCH 095/912] OP-4643 - updated schema Co-authored-by: Toke Jepsen --- .../projects_schema/schemas/schema_global_publish.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 7155510fef..80c18ce118 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -267,8 +267,8 @@ "type": "dict", "children": [ { - "key": "output_extension", - "label": "Output extension", + "key": "extension", + "label": "Extension", "type": "text" }, { From 0858c16ce0882949c570beeefe050f71219d28dc Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 12:54:46 +0100 Subject: [PATCH 096/912] OP-4643 - updated plugin name in schema MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jakub Ježek --- .../projects_schema/schemas/schema_global_publish.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 80c18ce118..357cbfb287 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -200,8 +200,8 @@ { "type": "dict", "collapsible": true, - "key": "ExtractColorTranscode", - "label": "ExtractColorTranscode (ImageIO)", + "key": "ExtractOIIOTranscode", + "label": "Extract OIIO Transcode", "checkbox_key": "enabled", "is_group": true, "children": [ From 875cac007dd0a3630b87cf545f73d038c4de79c0 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 12:55:57 +0100 Subject: [PATCH 097/912] OP-4643 - updated key in schema Co-authored-by: Toke Jepsen --- .../projects_schema/schemas/schema_global_publish.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 357cbfb287..0281b0ded6 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -272,8 +272,8 @@ "type": "text" }, { - "key": "output_colorspace", - "label": "Output colorspace", + "key": "colorspace", + "label": "Colorspace", "type": "text" }, { From 18b728aaf53a90422614a97ddf7e528ff9a50955 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 12:57:03 +0100 Subject: [PATCH 098/912] OP-4643 - changed oiio_cmd creation Co-authored-by: Toke Jepsen --- openpype/lib/transcoding.py | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 8e3432e0e9..828861e21e 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1068,25 +1068,15 @@ def convert_colorspace( if logger is None: logger = logging.getLogger(__name__) - input_arg = "-i" oiio_cmd = [ get_oiio_tools_path(), - + input_path, # Don't add any additional attributes "--nosoftwareattrib", "--colorconfig", config_path, - "--colorconvert", source_colorspace, target_colorspace - ] - # Prepare subprocess arguments - - oiio_cmd.extend([ - input_arg, input_path, - ]) - - # Add last argument - path to output - oiio_cmd.extend([ + "--colorconvert", source_colorspace, target_colorspace, "-o", out_filepath - ]) + ] logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) From 669e38d2c37481d089816d9dc663573f4a6895c3 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 13:44:45 +0100 Subject: [PATCH 099/912] OP-4643 - updated new keys into settings --- .../settings/defaults/project_settings/global.json | 2 +- .../projects_schema/schemas/schema_global_publish.json | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index 167f7611ce..f448f1a79a 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -70,7 +70,7 @@ "output": [] } }, - "ExtractColorTranscode": { + "ExtractOIIOTranscode": { "enabled": true, "profiles": [] }, diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 0281b0ded6..74b81b13af 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -276,6 +276,16 @@ "label": "Colorspace", "type": "text" }, + { + "key": "display", + "label": "Display", + "type": "text" + }, + { + "key": "view", + "label": "View", + "type": "text" + }, { "type": "schema", "name": "schema_representation_tags" From 104dd91bba17cb59f5254426cfc98b7b48dbe91f Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 13:45:42 +0100 Subject: [PATCH 100/912] OP-4643 - renanmed plugin, added new keys into outputs --- openpype/plugins/publish/extract_color_transcode.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 3a05426432..cc63b35988 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -17,7 +17,7 @@ from openpype.lib.transcoding import ( from openpype.lib.profiles_filtering import filter_profiles -class ExtractColorTranscode(publish.Extractor): +class ExtractOIIOTranscode(publish.Extractor): """ Extractor to convert colors from one colorspace to different. @@ -89,14 +89,14 @@ class ExtractColorTranscode(publish.Extractor): files_to_delete = copy.deepcopy(files_to_convert) - output_extension = output_def["output_extension"] + output_extension = output_def["extension"] output_extension = output_extension.replace('.', '') if output_extension: if new_repre["name"] == new_repre["ext"]: new_repre["name"] = output_extension new_repre["ext"] = output_extension - target_colorspace = output_def["output_colorspace"] + target_colorspace = output_def["colorspace"] if not target_colorspace: raise RuntimeError("Target colorspace must be set") From 4179a8e48c5603ac8b17fbd48783e372135c3c33 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 18:03:13 +0100 Subject: [PATCH 101/912] OP-4643 - fixed config path key --- openpype/plugins/publish/extract_color_transcode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index cc63b35988..245faeb306 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -70,8 +70,8 @@ class ExtractOIIOTranscode(publish.Extractor): colorspace_data = repre["colorspaceData"] source_colorspace = colorspace_data["colorspace"] - config_path = colorspace_data.get("configData", {}).get("path") - if not os.path.exists(config_path): + config_path = colorspace_data.get("config", {}).get("path") + if not config_path or not os.path.exists(config_path): self.log.warning("Config file doesn't exist, skipping") continue From 381f65bc8c973725f8d57a345d70a12ebcf95786 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 18:03:42 +0100 Subject: [PATCH 102/912] OP-4643 - fixed renaming files --- openpype/plugins/publish/extract_color_transcode.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 245faeb306..c079dcf70e 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -96,6 +96,14 @@ class ExtractOIIOTranscode(publish.Extractor): new_repre["name"] = output_extension new_repre["ext"] = output_extension + renamed_files = [] + _, orig_ext = os.path.splitext(files_to_convert[0]) + for file_name in files_to_convert: + file_name = file_name.replace(orig_ext, + "."+output_extension) + renamed_files.append(file_name) + new_repre["files"] = renamed_files + target_colorspace = output_def["colorspace"] if not target_colorspace: raise RuntimeError("Target colorspace must be set") From c1bb93d0fbf75f978b1a04195edc102e3b113f70 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 18:04:44 +0100 Subject: [PATCH 103/912] OP-4643 - updated to calculate sequence format --- .../publish/extract_color_transcode.py | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index c079dcf70e..09c86909cb 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -1,5 +1,6 @@ import os import copy +import clique import pyblish.api @@ -108,6 +109,8 @@ class ExtractOIIOTranscode(publish.Extractor): if not target_colorspace: raise RuntimeError("Target colorspace must be set") + files_to_convert = self._translate_to_sequence( + files_to_convert) for file_name in files_to_convert: input_filepath = os.path.join(original_staging_dir, file_name) @@ -139,6 +142,40 @@ class ExtractOIIOTranscode(publish.Extractor): instance.data["representations"].append(new_repre) + def _translate_to_sequence(self, files_to_convert): + """Returns original list of files or single sequence format filename. + + Uses clique to find frame sequence, in this case it merges all frames + into sequence format (%0X) and returns it. + If sequence not found, it returns original list + + Args: + files_to_convert (list): list of file names + Returns: + (list) of [file.%04.exr] or [fileA.exr, fileB.exr] + """ + pattern = [clique.PATTERNS["frames"]] + collections, remainder = clique.assemble( + files_to_convert, patterns=pattern, + assume_padded_when_ambiguous=True) + + if collections: + if len(collections) > 1: + raise ValueError( + "Too many collections {}".format(collections)) + + collection = collections[0] + padding = collection.padding + padding_str = "%0{}".format(padding) + frames = list(collection.indexes) + frame_str = "{}-{}#".format(frames[0], frames[-1]) + file_name = "{}{}{}".format(collection.head, frame_str, + collection.tail) + + files_to_convert = [file_name] + + return files_to_convert + def _get_output_file_path(self, input_filepath, output_dir, output_extension): """Create output file name path.""" From 5a386b58d6bc9125adf6148bbb854e0688a0adf0 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 18:54:02 +0100 Subject: [PATCH 104/912] OP-4643 - implemented display and viewer color space --- openpype/lib/transcoding.py | 23 +++++++++++++++++-- .../publish/extract_color_transcode.py | 13 +++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 828861e21e..fab9eeaaad 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1045,6 +1045,8 @@ def convert_colorspace( config_path, source_colorspace, target_colorspace, + view, + display, logger=None ): """Convert source files from one color space to another. @@ -1062,8 +1064,11 @@ def convert_colorspace( config_path (str): path to OCIO config file source_colorspace (str): ocio valid color space of source files target_colorspace (str): ocio valid target color space + view (str): name for viewer space (ocio valid) + display (str): name for display-referred reference space (ocio valid) logger (logging.Logger): Logger used for logging. - + Raises: + ValueError: if misconfigured """ if logger is None: logger = logging.getLogger(__name__) @@ -1074,9 +1079,23 @@ def convert_colorspace( # Don't add any additional attributes "--nosoftwareattrib", "--colorconfig", config_path, - "--colorconvert", source_colorspace, target_colorspace, "-o", out_filepath ] + if all([target_colorspace, view, display]): + raise ValueError("Colorspace and both screen and display" + " cannot be set together." + "Choose colorspace or screen and display") + if not target_colorspace and not all([view, display]): + raise ValueError("Both screen and display must be set.") + + if target_colorspace: + oiio_cmd.extend(["--colorconvert", + source_colorspace, + target_colorspace]) + if view and display: + oiio_cmd.extend(["--iscolorspace", source_colorspace]) + oiio_cmd.extend(["--ociodisplay", display, view]) + logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 09c86909cb..cd8421c0cd 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -106,8 +106,15 @@ class ExtractOIIOTranscode(publish.Extractor): new_repre["files"] = renamed_files target_colorspace = output_def["colorspace"] - if not target_colorspace: - raise RuntimeError("Target colorspace must be set") + view = output_def["view"] or colorspace_data.get("view") + display = (output_def["display"] or + colorspace_data.get("display")) + # both could be already collected by DCC, + # but could be overwritten + if view: + new_repre["colorspaceData"]["view"] = view + if display: + new_repre["colorspaceData"]["view"] = display files_to_convert = self._translate_to_sequence( files_to_convert) @@ -123,6 +130,8 @@ class ExtractOIIOTranscode(publish.Extractor): config_path, source_colorspace, target_colorspace, + view, + display, self.log ) From 2245869ffd0723177c2e76111723d9aeb43446c4 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 19:03:10 +0100 Subject: [PATCH 105/912] OP-4643 - fix wrong order of deletion of representation --- openpype/plugins/publish/extract_color_transcode.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index cd8421c0cd..9cca5cc969 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -69,6 +69,8 @@ class ExtractOIIOTranscode(publish.Extractor): if not self._repre_is_valid(repre): continue + added_representations = False + colorspace_data = repre["colorspaceData"] source_colorspace = colorspace_data["colorspace"] config_path = colorspace_data.get("config", {}).get("path") @@ -76,8 +78,6 @@ class ExtractOIIOTranscode(publish.Extractor): self.log.warning("Config file doesn't exist, skipping") continue - repre = self._handle_original_repre(repre, profile) - for _, output_def in profile.get("outputs", {}).items(): new_repre = copy.deepcopy(repre) @@ -150,6 +150,10 @@ class ExtractOIIOTranscode(publish.Extractor): new_repre["tags"].append(tag) instance.data["representations"].append(new_repre) + added_representations = True + + if added_representations: + self._mark_original_repre_for_deletion(repre, profile) def _translate_to_sequence(self, files_to_convert): """Returns original list of files or single sequence format filename. @@ -253,7 +257,8 @@ class ExtractOIIOTranscode(publish.Extractor): return True - def _handle_original_repre(self, repre, profile): + def _mark_original_repre_for_deletion(self, repre, profile): + """If new transcoded representation created, delete old.""" delete_original = profile["delete_original"] if delete_original: @@ -264,5 +269,3 @@ class ExtractOIIOTranscode(publish.Extractor): repre["tags"].remove("review") if "delete" not in repre["tags"]: repre["tags"].append("delete") - - return repre From ce784ac78207e1a16f2a14f7cdaaad5268fd6c26 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 11:26:27 +0100 Subject: [PATCH 106/912] OP-4643 - updated docstring, standardized arguments --- openpype/lib/transcoding.py | 19 +++++++---------- .../publish/extract_color_transcode.py | 21 +++++++++---------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index fab9eeaaad..752712166f 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1041,7 +1041,7 @@ def convert_ffprobe_fps_to_float(value): def convert_colorspace( input_path, - out_filepath, + output_path, config_path, source_colorspace, target_colorspace, @@ -1049,18 +1049,13 @@ def convert_colorspace( display, logger=None ): - """Convert source files from one color space to another. - - Filenames of input files are kept so make sure that output directory - is not the same directory as input files have. - - This way it can handle gaps and can keep input filenames without handling - frame template + """Convert source file from one color space to another. Args: - input_path (str): Paths that should be converted. It is expected that - contains single file or image sequence of samy type. - out_filepath (str): Path to directory where output will be rendered. - Must not be same as input's directory. + input_path (str): Path that should be converted. It is expected that + contains single file or image sequence of same type + (sequence in format 'file.FRAMESTART-FRAMEEND#.exr', see oiio docs) + output_path (str): Path to output filename. config_path (str): path to OCIO config file source_colorspace (str): ocio valid color space of source files target_colorspace (str): ocio valid target color space @@ -1079,7 +1074,7 @@ def convert_colorspace( # Don't add any additional attributes "--nosoftwareattrib", "--colorconfig", config_path, - "-o", out_filepath + "-o", output_path ] if all([target_colorspace, view, display]): diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 9cca5cc969..c4cef15ea6 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -119,13 +119,13 @@ class ExtractOIIOTranscode(publish.Extractor): files_to_convert = self._translate_to_sequence( files_to_convert) for file_name in files_to_convert: - input_filepath = os.path.join(original_staging_dir, - file_name) - output_path = self._get_output_file_path(input_filepath, + input_path = os.path.join(original_staging_dir, + file_name) + output_path = self._get_output_file_path(input_path, new_staging_dir, output_extension) convert_colorspace( - input_filepath, + input_path, output_path, config_path, source_colorspace, @@ -156,16 +156,17 @@ class ExtractOIIOTranscode(publish.Extractor): self._mark_original_repre_for_deletion(repre, profile) def _translate_to_sequence(self, files_to_convert): - """Returns original list of files or single sequence format filename. + """Returns original list or list with filename formatted in single + sequence format. Uses clique to find frame sequence, in this case it merges all frames - into sequence format (%0X) and returns it. + into sequence format (FRAMESTART-FRAMEEND#) and returns it. If sequence not found, it returns original list Args: files_to_convert (list): list of file names Returns: - (list) of [file.%04.exr] or [fileA.exr, fileB.exr] + (list) of [file.1001-1010#.exr] or [fileA.exr, fileB.exr] """ pattern = [clique.PATTERNS["frames"]] collections, remainder = clique.assemble( @@ -178,8 +179,6 @@ class ExtractOIIOTranscode(publish.Extractor): "Too many collections {}".format(collections)) collection = collections[0] - padding = collection.padding - padding_str = "%0{}".format(padding) frames = list(collection.indexes) frame_str = "{}-{}#".format(frames[0], frames[-1]) file_name = "{}{}{}".format(collection.head, frame_str, @@ -189,10 +188,10 @@ class ExtractOIIOTranscode(publish.Extractor): return files_to_convert - def _get_output_file_path(self, input_filepath, output_dir, + def _get_output_file_path(self, input_path, output_dir, output_extension): """Create output file name path.""" - file_name = os.path.basename(input_filepath) + file_name = os.path.basename(input_path) file_name, input_extension = os.path.splitext(file_name) if not output_extension: output_extension = input_extension From 02ad1d1998235e5416f41b3a973577659cb0d971 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 11:27:06 +0100 Subject: [PATCH 107/912] OP-4643 - fix wrong assignment --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index c4cef15ea6..4e899a519c 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -114,7 +114,7 @@ class ExtractOIIOTranscode(publish.Extractor): if view: new_repre["colorspaceData"]["view"] = view if display: - new_repre["colorspaceData"]["view"] = display + new_repre["colorspaceData"]["display"] = display files_to_convert = self._translate_to_sequence( files_to_convert) From 7d4a17169377dc8f8f68b54ae5338c296fd362a7 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 11:59:13 +0100 Subject: [PATCH 108/912] OP-4643 - fix files to delete --- .../publish/extract_color_transcode.py | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 4e899a519c..99e684ba21 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -84,26 +84,18 @@ class ExtractOIIOTranscode(publish.Extractor): original_staging_dir = new_repre["stagingDir"] new_staging_dir = get_transcode_temp_directory() new_repre["stagingDir"] = new_staging_dir - files_to_convert = new_repre["files"] - if not isinstance(files_to_convert, list): - files_to_convert = [files_to_convert] - files_to_delete = copy.deepcopy(files_to_convert) + if isinstance(new_repre["files"], list): + files_to_convert = copy.deepcopy(new_repre["files"]) + else: + files_to_convert = [new_repre["files"]] output_extension = output_def["extension"] output_extension = output_extension.replace('.', '') if output_extension: - if new_repre["name"] == new_repre["ext"]: - new_repre["name"] = output_extension - new_repre["ext"] = output_extension - - renamed_files = [] - _, orig_ext = os.path.splitext(files_to_convert[0]) - for file_name in files_to_convert: - file_name = file_name.replace(orig_ext, - "."+output_extension) - renamed_files.append(file_name) - new_repre["files"] = renamed_files + self._rename_in_representation(new_repre, + files_to_convert, + output_extension) target_colorspace = output_def["colorspace"] view = output_def["view"] or colorspace_data.get("view") @@ -135,8 +127,12 @@ class ExtractOIIOTranscode(publish.Extractor): self.log ) - instance.context.data["cleanupFullPaths"].extend( - files_to_delete) + # cleanup temporary transcoded files + for file_name in new_repre["files"]: + transcoded_file_path = os.path.join(new_staging_dir, + file_name) + instance.context.data["cleanupFullPaths"].append( + transcoded_file_path) custom_tags = output_def.get("custom_tags") if custom_tags: @@ -155,6 +151,21 @@ class ExtractOIIOTranscode(publish.Extractor): if added_representations: self._mark_original_repre_for_deletion(repre, profile) + def _rename_in_representation(self, new_repre, files_to_convert, + output_extension): + """Replace old extension with new one everywhere in representation.""" + if new_repre["name"] == new_repre["ext"]: + new_repre["name"] = output_extension + new_repre["ext"] = output_extension + + renamed_files = [] + for file_name in files_to_convert: + file_name, _ = os.path.splitext(file_name) + file_name = '{}.{}'.format(file_name, + output_extension) + renamed_files.append(file_name) + new_repre["files"] = renamed_files + def _translate_to_sequence(self, files_to_convert): """Returns original list or list with filename formatted in single sequence format. From 302a79095ec50031a2c411dd2704e75e6e51d6cf Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 13:17:59 +0100 Subject: [PATCH 109/912] OP-4643 - moved output argument to the end --- openpype/lib/transcoding.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 752712166f..1629058beb 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1073,8 +1073,7 @@ def convert_colorspace( input_path, # Don't add any additional attributes "--nosoftwareattrib", - "--colorconfig", config_path, - "-o", output_path + "--colorconfig", config_path ] if all([target_colorspace, view, display]): @@ -1092,5 +1091,7 @@ def convert_colorspace( oiio_cmd.extend(["--iscolorspace", source_colorspace]) oiio_cmd.extend(["--ociodisplay", display, view]) + oiio_cmd.extend(["-o", output_path]) + logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) From 1de178e98fd0a59533826ae132b86ec85b742ce8 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 13:18:33 +0100 Subject: [PATCH 110/912] OP-4643 - fix no tags in repre --- openpype/plugins/publish/extract_color_transcode.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 99e684ba21..3d897c6d9f 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -142,6 +142,8 @@ class ExtractOIIOTranscode(publish.Extractor): # Add additional tags from output definition to representation for tag in output_def["tags"]: + if not new_repre.get("tags"): + new_repre["tags"] = [] if tag not in new_repre["tags"]: new_repre["tags"].append(tag) From 8ce2c151ce920e22089712e81b0d782a66e8fa38 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 13:26:07 +0100 Subject: [PATCH 111/912] OP-4643 - changed docstring Elaborated more that 'target_colorspace' and ('view', 'display') are disjunctive. --- openpype/lib/transcoding.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 1629058beb..6d91f514ec 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1045,8 +1045,8 @@ def convert_colorspace( config_path, source_colorspace, target_colorspace, - view, - display, + view=None, + display=None, logger=None ): """Convert source file from one color space to another. @@ -1059,7 +1059,9 @@ def convert_colorspace( config_path (str): path to OCIO config file source_colorspace (str): ocio valid color space of source files target_colorspace (str): ocio valid target color space + if filled, 'view' and 'display' must be empty view (str): name for viewer space (ocio valid) + both 'view' and 'display' must be filled (if 'target_colorspace') display (str): name for display-referred reference space (ocio valid) logger (logging.Logger): Logger used for logging. Raises: From 9c221a36c30a05de6c9b67e17b4ca941f01a4c31 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Sun, 29 Jan 2023 15:22:52 +0300 Subject: [PATCH 112/912] use recommended Reactor env variables --- openpype/hosts/fusion/deploy/fusion_shared.prefs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/deploy/fusion_shared.prefs b/openpype/hosts/fusion/deploy/fusion_shared.prefs index 998c6a6d66..5bfde9a5c9 100644 --- a/openpype/hosts/fusion/deploy/fusion_shared.prefs +++ b/openpype/hosts/fusion/deploy/fusion_shared.prefs @@ -4,8 +4,7 @@ Global = { Paths = { Map = { ["OpenPype:"] = "$(OPENPYPE_FUSION)/deploy", - ["Reactor:"] = "$(REACTOR)", - + ["Reactor:"] = "$(REACTOR_INSTALL_PATHMAP)/Reactor", ["Config:"] = "UserPaths:Config;OpenPype:Config", ["Scripts:"] = "UserPaths:Scripts;Reactor:System/Scripts;OpenPype:Scripts", ["UserPaths:"] = "UserData:;AllData:;Fusion:;Reactor:Deploy" From bb0d128f1d4b22f6744eed58ad91f649b8642d83 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Sun, 29 Jan 2023 22:37:07 +0300 Subject: [PATCH 113/912] nightly version is not parsed --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ceab9eeff1..2fc4f6fe39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "OpenPype" -version = "3.15.1-nightly.1" # OpenPype +version = "3.15.1" # OpenPype description = "Open VFX and Animation pipeline with support." authors = ["OpenPype Team "] license = "MIT License" From c1f88602a09bd7b476344f2a1fbf8efb8789734d Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Tue, 31 Jan 2023 03:14:43 +0300 Subject: [PATCH 114/912] split get comp and get fusion, add get comp name just in case --- openpype/hosts/fusion/api/lib.py | 22 +++++++++++++++++++--- openpype/hosts/fusion/api/workio.py | 7 ++----- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/fusion/api/lib.py b/openpype/hosts/fusion/api/lib.py index a33e5cf289..851e9ec94a 100644 --- a/openpype/hosts/fusion/api/lib.py +++ b/openpype/hosts/fusion/api/lib.py @@ -302,10 +302,26 @@ def get_frame_path(path): return filename, padding, ext +def get_comp_name(comp=None): + """Get basename of the comp's filename""" + if comp: + comp_name = os.path.basename(comp.GetAttrs()["COMPS_FileName"]) + return comp_name + + +def get_fusion(): + """Get Fusion instance""" + app = getattr(sys.modules["BlackmagicFusion"], "scriptapp", None) + if app: + fusion = app("Fusion", "localhost") + return fusion + + def get_current_comp(): - """Hack to get current comp in this session""" - fusion = getattr(sys.modules["__main__"], "fusion", None) - return fusion.CurrentComp if fusion else None + """Get current comp in this session""" + fusion = get_fusion() + comp = fusion.CurrentComp + return comp @contextlib.contextmanager diff --git a/openpype/hosts/fusion/api/workio.py b/openpype/hosts/fusion/api/workio.py index 939b2ff4be..da36a83988 100644 --- a/openpype/hosts/fusion/api/workio.py +++ b/openpype/hosts/fusion/api/workio.py @@ -2,7 +2,7 @@ import sys import os -from .lib import get_current_comp +from .lib import get_fusion, get_current_comp def file_extensions(): @@ -20,10 +20,7 @@ def save_file(filepath): def open_file(filepath): - # Hack to get fusion, see - # openpype.hosts.fusion.api.pipeline.get_current_comp() - fusion = getattr(sys.modules["__main__"], "fusion", None) - + fusion = get_fusion() return fusion.LoadComp(filepath) From c0c859b6f1f0c34db4c0024a4b751c9715d5c6bf Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Tue, 31 Jan 2023 03:15:43 +0300 Subject: [PATCH 115/912] set a temporary profile folder, copy existing prefs there --- .../hosts/fusion/hooks/pre_fusion_setup.py | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index d043d54322..f6cec86e3b 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -1,4 +1,7 @@ import os +import shutil +import platform +from pathlib import Path from openpype.lib import PreLaunchHook, ApplicationLaunchFailed from openpype.hosts.fusion import FUSION_HOST_DIR @@ -17,6 +20,25 @@ class FusionPrelaunch(PreLaunchHook): """ app_groups = ["fusion"] + def get_profile_source(self): + fusion_prefs_path = "Blackmagic Design/Fusion/Profiles/Default/Fusion.prefs" + if platform.system() == "Windows": + prefs_source = Path(os.getenv("AppData")) / fusion_prefs_path + elif platform.system() == "Darwin": + prefs_source = Path(os.path.expanduser("~/Library/Application Support/")) / fusion_prefs_path + elif platform.system() == "Linux": + prefs_source = Path(os.path.expanduser("~/.fusion")) / fusion_prefs_path + + return str(prefs_source) + + def copy_existing_prefs(self, profile_directory: str): + dest_folder = os.path.join(profile_directory, "Default") + os.makedirs(dest_folder, exist_ok=True) + prefs_source = self.get_profile_source() + if os.path.exists(prefs_source): + shutil.copy(prefs_source, dest_folder) + self.log.info(f"successfully copied preferences:\n {prefs_source} to {dest_folder}") + def execute(self): # making sure python 3 is installed at provided path # Py 3.3-3.10 for Fusion 18+ or Py 3.6 for Fu 16-17 @@ -50,12 +72,20 @@ class FusionPrelaunch(PreLaunchHook): # TODO: Detect Fusion version to only set for specific Fusion build self.launch_context.env["FUSION16_PYTHON36_HOME"] = py3_dir - # Add our Fusion Master Prefs which is the only way to customize + # Add custom Fusion Master Prefs and the temporary profile directory variables to customize # Fusion to define where it can read custom scripts and tools from self.log.info(f"Setting OPENPYPE_FUSION: {FUSION_HOST_DIR}") self.launch_context.env["OPENPYPE_FUSION"] = FUSION_HOST_DIR + profile_dir_var = "FUSION16_PROFILE_DIR" # used by Fusion 16, 17 and 18 pref_var = "FUSION16_MasterPrefs" # used by Fusion 16, 17 and 18 + profile_dir = os.path.join(FUSION_HOST_DIR, "deploy", "Prefs") prefs = os.path.join(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") + + # now copy the default Fusion profile to a working directory + if not os.path.exists(profile_dir): + self.copy_existing_prefs(profile_dir) + self.log.info(f"Setting {profile_dir_var}: {profile_dir}") + self.launch_context.env[profile_dir_var] = profile_dir self.log.info(f"Setting {pref_var}: {prefs}") self.launch_context.env[pref_var] = prefs From 0c23f212c08811d2fb3cafa2980f0344afee5a5b Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Tue, 31 Jan 2023 03:18:20 +0300 Subject: [PATCH 116/912] remove Reactor mapping as it is copied from existing prefs --- openpype/hosts/fusion/deploy/fusion_shared.prefs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/deploy/fusion_shared.prefs b/openpype/hosts/fusion/deploy/fusion_shared.prefs index 5bfde9a5c9..d9451ea295 100644 --- a/openpype/hosts/fusion/deploy/fusion_shared.prefs +++ b/openpype/hosts/fusion/deploy/fusion_shared.prefs @@ -4,10 +4,9 @@ Global = { Paths = { Map = { ["OpenPype:"] = "$(OPENPYPE_FUSION)/deploy", - ["Reactor:"] = "$(REACTOR_INSTALL_PATHMAP)/Reactor", ["Config:"] = "UserPaths:Config;OpenPype:Config", ["Scripts:"] = "UserPaths:Scripts;Reactor:System/Scripts;OpenPype:Scripts", - ["UserPaths:"] = "UserData:;AllData:;Fusion:;Reactor:Deploy" + ["UserPaths:"] = "UserData:;GIT:;AllData:;Fusion:;Reactor:Deploy" }, }, Script = { From 3fa7610061298e4a3de96d176b74f5bd3ecca652 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 31 Jan 2023 18:35:50 +0000 Subject: [PATCH 117/912] Working version for Arnold. --- openpype/hosts/maya/api/lib.py | 13 +++++++++++-- openpype/hosts/maya/api/lib_renderproducts.py | 6 +++++- .../hosts/maya/plugins/publish/collect_render.py | 8 ++++---- .../deadline/plugins/publish/submit_publish_job.py | 10 +++++++--- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index f869dadaad..b31ab2408b 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -14,7 +14,7 @@ from math import ceil from six import string_types from maya import cmds, mel -import maya.api.OpenMaya as om +from maya.api import OpenMaya from openpype.client import ( get_project, @@ -3402,13 +3402,22 @@ def get_color_management_preferences(): ) } + # Split view and display from view_transform. view_transform comes in + # format of "{view} ({display})". + display = data["view_transform"].split("(")[-1].replace(")", "") + data.update({ + "display": display, + "view": data["view_transform"].replace("({})".format(display), "")[:-1] + }) + + # Get config absolute path. path = cmds.colorManagementPrefs( query=True, configFilePath=True ) # The OCIO config supports a custom token. maya_resources_token = "" - maya_resources_path = om.MGlobal.getAbsolutePathToResources() + maya_resources_path = OpenMaya.MGlobal.getAbsolutePathToResources() path = path.replace(maya_resources_token, maya_resources_path) data["config"] = path diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py index 0b585dc8cb..58ccbfd5a2 100644 --- a/openpype/hosts/maya/api/lib_renderproducts.py +++ b/openpype/hosts/maya/api/lib_renderproducts.py @@ -648,8 +648,12 @@ class RenderProductsArnold(ARenderProducts): preferences = lib.get_color_management_preferences() return preferences["view_transform"] + def _raw(): + preferences = lib.get_color_management_preferences() + return preferences["rendering_space"] + resolved_values = { - "Raw": lambda: "Raw", + "Raw": _raw, "Use View Transform": _view_transform, # Default. Same as Maya Preferences. "Use Output Transform": lib.get_color_management_output_transform diff --git a/openpype/hosts/maya/plugins/publish/collect_render.py b/openpype/hosts/maya/plugins/publish/collect_render.py index 2c89424381..d0164f30a8 100644 --- a/openpype/hosts/maya/plugins/publish/collect_render.py +++ b/openpype/hosts/maya/plugins/publish/collect_render.py @@ -264,7 +264,7 @@ class CollectMayaRender(pyblish.api.ContextPlugin): self.log.info(full_exp_files) self.log.info("collecting layer: {}".format(layer_name)) # Get layer specific settings, might be overrides - + colorspace_data = lib.get_color_management_preferences() data = { "subset": expected_layer_name, "attachTo": attach_to, @@ -318,9 +318,9 @@ class CollectMayaRender(pyblish.api.ContextPlugin): "renderSetupIncludeLights": render_instance.data.get( "renderSetupIncludeLights" ), - "colorspaceConfig": ( - lib.get_color_management_preferences()["config"] - ) + "colorspaceConfig": colorspace_data["config"], + "colorspaceDisplay": colorspace_data["display"], + "colorspaceView": colorspace_data["view"] } # Collect Deadline url if Deadline module is enabled diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 8811fa5d34..02aa1043d1 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -550,10 +550,12 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): "tags": ["review"] if preview else [], "colorspaceData": { "colorspace": colorspace, - "configData": { + "config": { "path": additional_data["colorspaceConfig"], "template": "" - } + }, + "display": additional_data["display"], + "view": additional_data["view"] } } @@ -916,7 +918,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): additional_data = { "renderProducts": instance.data["renderProducts"], - "colorspaceConfig": instance.data["colorspaceConfig"] + "colorspaceConfig": instance.data["colorspaceConfig"], + "display": instance.data["colorspaceDisplay"], + "view": instance.data["colorspaceView"] } if isinstance(data.get("expectedFiles")[0], dict): From a07aed0c40dfe7d8fc7c7ae83503020ef5238aec Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 1 Feb 2023 16:47:54 +0800 Subject: [PATCH 118/912] some edits on the color convert if the color workflow being linearized --- .../maya/plugins/publish/extract_look.py | 23 ++++++++++++++----- .../publish/validate_look_color_space.py | 1 + 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/extract_look.py b/openpype/hosts/maya/plugins/publish/extract_look.py index 860872c3a6..22c95d04dc 100644 --- a/openpype/hosts/maya/plugins/publish/extract_look.py +++ b/openpype/hosts/maya/plugins/publish/extract_look.py @@ -385,6 +385,7 @@ class ExtractLook(publish.Extractor): source, mode, texture_hash = self._process_texture( filepath, + resource, do_maketx, staging=staging_dir, linearize=linearize, @@ -490,7 +491,7 @@ class ExtractLook(publish.Extractor): resources_dir, basename + ext ) - def _process_texture(self, filepath, do_maketx, staging, linearize, force): + def _process_texture(self, filepath, resource, do_maketx, staging, linearize, force): """Process a single texture file on disk for publishing. This will: 1. Check whether it's already published, if so it will do hardlink @@ -532,11 +533,21 @@ class ExtractLook(publish.Extractor): texture_hash ] if linearize: - self.log.info("tx: converting sRGB -> linear") - additional_args.extend(["--colorconvert", "sRGB", "linear"]) - - self.log.info("Using nuke-default ocio config instead of maya ocio config!") # noqa - self.log.info("The tx conversion is different from the maya tx conversion!") # noqa + if cmds.colorManagementPrefs(query=True, cmEnabled=True): + render_colorspace = cmds.colorManagementPrefs(query=True, + renderingSpaceName=True) + color_space_attr = resource["node"] + ".colorSpace" + try: + color_space = cmds.getAttr(color_space_attr) + except ValueError: + # node doesn't have color space attribute + color_space = "Raw" + self.log.info("tx: converting {0} -> {1}".format(color_space, + render_colorspace)) + additional_args.extend(["--colorconvert", color_space, render_colorspace]) + else: + self.log.info("tx: converting sRGB -> linear") + additional_args.extend(["--colorconvert", "sRGB", "Raw"]) config_path = get_ocio_config_path("nuke-default") additional_args.extend(["--colorconfig", config_path]) diff --git a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py index b354d51fef..103ade09b1 100644 --- a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py +++ b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py @@ -14,6 +14,7 @@ class ValidateMayaColorSpace(pyblish.api.InstancePlugin): families = ['look'] hosts = ['maya'] label = 'Color Management with maketx' + optional = True def process(self, instance): ocio_maya = cmds.colorManagementPrefs(q=True, From aa2f845204b7b4f24e49811d4cb69ce4ccb3858e Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 1 Feb 2023 17:38:18 +0800 Subject: [PATCH 119/912] hound fix --- openpype/hosts/maya/plugins/publish/extract_look.py | 13 +++++++------ .../plugins/publish/validate_look_color_space.py | 1 - 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/extract_look.py b/openpype/hosts/maya/plugins/publish/extract_look.py index 22c95d04dc..54b093f7c3 100644 --- a/openpype/hosts/maya/plugins/publish/extract_look.py +++ b/openpype/hosts/maya/plugins/publish/extract_look.py @@ -491,7 +491,8 @@ class ExtractLook(publish.Extractor): resources_dir, basename + ext ) - def _process_texture(self, filepath, resource, do_maketx, staging, linearize, force): + def _process_texture(self, filepath, resource, + do_maketx, staging, linearize, force): """Process a single texture file on disk for publishing. This will: 1. Check whether it's already published, if so it will do hardlink @@ -534,17 +535,17 @@ class ExtractLook(publish.Extractor): ] if linearize: if cmds.colorManagementPrefs(query=True, cmEnabled=True): - render_colorspace = cmds.colorManagementPrefs(query=True, - renderingSpaceName=True) + render_colorspace = cmds.colorManagementPrefs(query=True, renderingSpaceName=True) # noqa color_space_attr = resource["node"] + ".colorSpace" try: color_space = cmds.getAttr(color_space_attr) except ValueError: # node doesn't have color space attribute color_space = "Raw" - self.log.info("tx: converting {0} -> {1}".format(color_space, - render_colorspace)) - additional_args.extend(["--colorconvert", color_space, render_colorspace]) + self.log.info("tx: converting {0} -> {1}".format(color_space, render_colorspace)) # noqa + additional_args.extend(["--colorconvert", + color_space, + render_colorspace]) else: self.log.info("tx: converting sRGB -> linear") additional_args.extend(["--colorconvert", "sRGB", "Raw"]) diff --git a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py index 103ade09b1..b354d51fef 100644 --- a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py +++ b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py @@ -14,7 +14,6 @@ class ValidateMayaColorSpace(pyblish.api.InstancePlugin): families = ['look'] hosts = ['maya'] label = 'Color Management with maketx' - optional = True def process(self, instance): ocio_maya = cmds.colorManagementPrefs(q=True, From 9f17a4803f4f6fdfb8858a841e20dbe283b119f2 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 1 Feb 2023 11:14:07 +0100 Subject: [PATCH 120/912] OP-4663 - fix double dots in extension Co-authored-by: Toke Jepsen --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 3d897c6d9f..bfed69c300 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -207,7 +207,7 @@ class ExtractOIIOTranscode(publish.Extractor): file_name = os.path.basename(input_path) file_name, input_extension = os.path.splitext(file_name) if not output_extension: - output_extension = input_extension + output_extension = input_extension.replace(".", "") new_file_name = '{}.{}'.format(file_name, output_extension) return os.path.join(output_dir, new_file_name) From e8d4a752a94e0f760bc2430536fdd8d87eda7636 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 1 Feb 2023 11:22:20 +0100 Subject: [PATCH 121/912] Fix pyproject.toml version because of Poetry Automatization injects wrong format --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 634aeda5ac..2fc4f6fe39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "OpenPype" -version = "3.15.1-nightly.2" # OpenPype +version = "3.15.1" # OpenPype description = "Open VFX and Animation pipeline with support." authors = ["OpenPype Team "] license = "MIT License" From 5c4856d72a302db1132b21f8fac87e751e045899 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 1 Feb 2023 12:05:38 +0000 Subject: [PATCH 122/912] BigRoy feedback --- openpype/hosts/maya/api/lib.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index b31ab2408b..d83f18bf30 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -5,6 +5,7 @@ import sys import platform import uuid import math +import re import json import logging @@ -3404,10 +3405,11 @@ def get_color_management_preferences(): # Split view and display from view_transform. view_transform comes in # format of "{view} ({display})". - display = data["view_transform"].split("(")[-1].replace(")", "") + regex = re.compile(r"^(?P.+) \((?P.+)\)$") + match = regex.match(data["view_transform"]) data.update({ - "display": display, - "view": data["view_transform"].replace("({})".format(display), "")[:-1] + "display": match.group("display"), + "view": match.group("view") }) # Get config absolute path. From 89d7edd8dfe0e6917c18870c92628659a8635541 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 1 Feb 2023 12:06:26 +0000 Subject: [PATCH 123/912] Support for Maya Hardware --- openpype/hosts/maya/api/lib_renderproducts.py | 7 ++++++- openpype/hosts/maya/api/lib_rendersettings.py | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py index 58ccbfd5a2..6a607e7ff3 100644 --- a/openpype/hosts/maya/api/lib_renderproducts.py +++ b/openpype/hosts/maya/api/lib_renderproducts.py @@ -1354,7 +1354,12 @@ class RenderProductsMayaHardware(ARenderProducts): products = [] for cam in self.get_renderable_cameras(): - product = RenderProduct(productName="beauty", ext=ext, camera=cam) + product = RenderProduct( + productName="beauty", + ext=ext, + camera=cam, + colorspace=lib.get_color_management_output_transform() + ) products.append(product) return products diff --git a/openpype/hosts/maya/api/lib_rendersettings.py b/openpype/hosts/maya/api/lib_rendersettings.py index 6190a49401..4710b10128 100644 --- a/openpype/hosts/maya/api/lib_rendersettings.py +++ b/openpype/hosts/maya/api/lib_rendersettings.py @@ -23,7 +23,8 @@ class RenderSettings(object): 'vray': 'vraySettings.fileNamePrefix', 'arnold': 'defaultRenderGlobals.imageFilePrefix', 'renderman': 'rmanGlobals.imageFileFormat', - 'redshift': 'defaultRenderGlobals.imageFilePrefix' + 'redshift': 'defaultRenderGlobals.imageFilePrefix', + 'mayahardware2': 'defaultRenderGlobals.imageFilePrefix' } _image_prefixes = { From 21d275d46ae2e7d8c1cc9fae67cd8512da46dec1 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 1 Feb 2023 12:27:48 +0000 Subject: [PATCH 124/912] Support for Vray --- openpype/hosts/maya/api/lib_renderproducts.py | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py index 6a607e7ff3..38415c2ae2 100644 --- a/openpype/hosts/maya/api/lib_renderproducts.py +++ b/openpype/hosts/maya/api/lib_renderproducts.py @@ -841,9 +841,13 @@ class RenderProductsVray(ARenderProducts): if not dont_save_rgb: for camera in cameras: products.append( - RenderProduct(productName="", - ext=default_ext, - camera=camera)) + RenderProduct( + productName="", + ext=default_ext, + camera=camera, + colorspace=lib.get_color_management_output_transform() + ) + ) # separate alpha file separate_alpha = self._get_attr("vraySettings.separateAlpha") @@ -895,10 +899,13 @@ class RenderProductsVray(ARenderProducts): aov_name = self._get_vray_aov_name(aov) for camera in cameras: - product = RenderProduct(productName=aov_name, - ext=default_ext, - aov=aov, - camera=camera) + product = RenderProduct( + productName=aov_name, + ext=default_ext, + aov=aov, + camera=camera, + colorspace=lib.get_color_management_output_transform() + ) products.append(product) return products From e7fbe105fdd312ecdf3560e1db5859dbbda39076 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 1 Feb 2023 16:11:45 +0100 Subject: [PATCH 125/912] OP-4643 - update documentation in Settings schema --- .../schemas/projects_schema/schemas/schema_global_publish.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 74b81b13af..3956f403f4 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -207,7 +207,7 @@ "children": [ { "type": "label", - "label": "Configure output format(s) and color spaces for matching representations. Empty 'Output extension' denotes keeping source extension." + "label": "Configure Output Definition(s) for new representation(s). \nEmpty 'Extension' denotes keeping source extension. \nName(key) of output definition will be used as new representation name \nunless 'passthrough' value is used to keep existing name. \nFill either 'Colorspace' (for target colorspace) or \nboth 'Display' and 'View' (for display and viewer colorspaces)." }, { "type": "boolean", From ed95995fc7b688d7ea5a66e6a818364a1aadc551 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 1 Feb 2023 16:13:59 +0100 Subject: [PATCH 126/912] OP-4643 - name of new representation from output definition key --- .../publish/extract_color_transcode.py | 49 +++++++++++++++---- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index bfed69c300..e39ea3add9 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -32,6 +32,25 @@ class ExtractOIIOTranscode(publish.Extractor): - task types - task names - subset names + + Can produce one or more representations (with different extensions) based + on output definition in format: + "output_name: { + "extension": "png", + "colorspace": "ACES - ACEScg", + "display": "", + "view": "", + "tags": [], + "custom_tags": [] + } + + If 'extension' is empty original representation extension is used. + 'output_name' will be used as name of new representation. In case of value + 'passthrough' name of original representation will be used. + + 'colorspace' denotes target colorspace to be transcoded into. Could be + empty if transcoding should be only into display and viewer colorspace. + (In that case both 'display' and 'view' must be filled.) """ label = "Transcode color spaces" @@ -78,7 +97,7 @@ class ExtractOIIOTranscode(publish.Extractor): self.log.warning("Config file doesn't exist, skipping") continue - for _, output_def in profile.get("outputs", {}).items(): + for output_name, output_def in profile.get("outputs", {}).items(): new_repre = copy.deepcopy(repre) original_staging_dir = new_repre["stagingDir"] @@ -92,10 +111,10 @@ class ExtractOIIOTranscode(publish.Extractor): output_extension = output_def["extension"] output_extension = output_extension.replace('.', '') - if output_extension: - self._rename_in_representation(new_repre, - files_to_convert, - output_extension) + self._rename_in_representation(new_repre, + files_to_convert, + output_name, + output_extension) target_colorspace = output_def["colorspace"] view = output_def["view"] or colorspace_data.get("view") @@ -154,10 +173,22 @@ class ExtractOIIOTranscode(publish.Extractor): self._mark_original_repre_for_deletion(repre, profile) def _rename_in_representation(self, new_repre, files_to_convert, - output_extension): - """Replace old extension with new one everywhere in representation.""" - if new_repre["name"] == new_repre["ext"]: - new_repre["name"] = output_extension + output_name, output_extension): + """Replace old extension with new one everywhere in representation. + + Args: + new_repre (dict) + files_to_convert (list): of filenames from repre["files"], + standardized to always list + output_name (str): key of output definition from Settings, + if "" token used, keep original repre name + output_extension (str): extension from output definition + """ + if output_name != "passthrough": + new_repre["name"] = output_name + if not output_extension: + return + new_repre["ext"] = output_extension renamed_files = [] From a20646e82f5c39108c1ac5b0b9988226c49c1a56 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 1 Feb 2023 16:42:48 +0100 Subject: [PATCH 127/912] OP-4643 - updated docstring for convert_colorspace --- openpype/lib/transcoding.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 6d91f514ec..18273dd432 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1054,8 +1054,11 @@ def convert_colorspace( Args: input_path (str): Path that should be converted. It is expected that contains single file or image sequence of same type - (sequence in format 'file.FRAMESTART-FRAMEEND#.exr', see oiio docs) + (sequence in format 'file.FRAMESTART-FRAMEEND#.ext', see oiio docs, + eg `big.1-3#.tif`) output_path (str): Path to output filename. + (must follow format of 'input_path', eg. single file or + sequence in 'file.FRAMESTART-FRAMEEND#.ext', `output.1-3#.tif`) config_path (str): path to OCIO config file source_colorspace (str): ocio valid color space of source files target_colorspace (str): ocio valid target color space From cfd718d943dc4b0cf22eb5bff5a10b12dfe4cf3b Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 2 Feb 2023 00:07:27 +0300 Subject: [PATCH 128/912] rollback the get_fusion, properly return comp name --- openpype/hosts/fusion/api/lib.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/fusion/api/lib.py b/openpype/hosts/fusion/api/lib.py index 851e9ec94a..ac30e1ff99 100644 --- a/openpype/hosts/fusion/api/lib.py +++ b/openpype/hosts/fusion/api/lib.py @@ -305,16 +305,13 @@ def get_frame_path(path): def get_comp_name(comp=None): """Get basename of the comp's filename""" if comp: - comp_name = os.path.basename(comp.GetAttrs()["COMPS_FileName"]) - return comp_name + return comp.GetAttrs()["COMPS_Name"] def get_fusion(): """Get Fusion instance""" - app = getattr(sys.modules["BlackmagicFusion"], "scriptapp", None) - if app: - fusion = app("Fusion", "localhost") - return fusion + fusion = getattr(sys.modules["__main__"], "fusion", None) + return fusion def get_current_comp(): From 90ef934f495dd82606f7a7b702f6b3187622cfd7 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 2 Feb 2023 11:45:08 +0800 Subject: [PATCH 129/912] update the guess colorspace code reference from arnold --- openpype/hosts/maya/api/lib.py | 38 +++++++++++++++++++ .../maya/plugins/publish/extract_look.py | 18 +++++++-- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index 25842a4776..51da7a4b98 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -15,6 +15,7 @@ from six import string_types from maya import cmds, mel import maya.api.OpenMaya as om +from arnold import * from openpype.client import ( get_project, @@ -3379,3 +3380,40 @@ def iter_visible_nodes_in_range(nodes, start, end): def get_attribute_input(attr): connections = cmds.listConnections(attr, plugs=True, destination=False) return connections[0] if connections else None + + +# Reference from Arnold +# Get Image Information for colorspace +def imageInfo(filepath): + """Take reference from makeTx.py + ImageInfo(filename): Get Image Information + AiTextureGetFormat(filename): Get Texture Format + AiTextureGetBitDepth(filename): Get Texture Bit Depth + """ + # Get Texture Information + img_info = {} + img_info['filename'] = filepath + if os.path.isfile(filepath): + img_info['bit_depth'] = AiTextureGetBitDepth(filepath) + img_info['format'] = AiTextureGetFormat(filepath) + else: + img_info['bit_depth'] = 8 + img_info['format'] = "unknown" + return img_info + +def guess_colorspace(img_info): + ''' Take reference from makeTx.py + Guess the colorspace of the input image filename. + @return: a string suitable for the --colorconvert option of maketx (linear, sRGB, Rec709) + ''' + try: + if img_info['bit_depth'] <= 16 and img_info['format'] in (AI_TYPE_BYTE, AI_TYPE_INT, AI_TYPE_UINT): + return 'sRGB' + else: + return 'linear' + + # now discard the image file as AiTextureGetFormat has loaded it + AiTextureInvalidate(img_info['filename']) + except: + print('[maketx] Error: Could not guess colorspace for "%s"' % img_info['filename']) + return 'linear' diff --git a/openpype/hosts/maya/plugins/publish/extract_look.py b/openpype/hosts/maya/plugins/publish/extract_look.py index 54b093f7c3..5ac5d9c728 100644 --- a/openpype/hosts/maya/plugins/publish/extract_look.py +++ b/openpype/hosts/maya/plugins/publish/extract_look.py @@ -16,6 +16,7 @@ import pyblish.api from openpype.lib import source_hash, run_subprocess from openpype.pipeline import legacy_io, publish from openpype.hosts.maya.api import lib +from openpype.hosts.maya.api.lib import imageInfo, guess_colorspace # Modes for transfer COPY = 1 @@ -541,16 +542,25 @@ class ExtractLook(publish.Extractor): color_space = cmds.getAttr(color_space_attr) except ValueError: # node doesn't have color space attribute - color_space = "Raw" + img_info = imageInfo(filepath) + color_space = guess_colorspace(img_info) self.log.info("tx: converting {0} -> {1}".format(color_space, render_colorspace)) # noqa additional_args.extend(["--colorconvert", color_space, render_colorspace]) else: - self.log.info("tx: converting sRGB -> linear") - additional_args.extend(["--colorconvert", "sRGB", "Raw"]) + img_info = imageInfo(filepath) + color_space = guess_colorspace(img_info) + if color_space == "sRGB": + self.log.info("tx: converting sRGB -> linear") + additional_args.extend(["--colorconvert", "sRGB", "Raw"]) + else: + self.log.info("tx: texture's colorspace is already linear") - config_path = get_ocio_config_path("nuke-default") + + config_path = cmds.colorManagementPrefs(query=True, configFilePath=True) + if not os.path.exists(config_path): + raise RuntimeError("No OCIO config path found!") additional_args.extend(["--colorconfig", config_path]) # Ensure folder exists if not os.path.exists(os.path.dirname(converted)): From 1df0eb1fd82460298db2e279a83a299fe5504ee1 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 2 Feb 2023 12:00:49 +0800 Subject: [PATCH 130/912] update the guess colorspace code reference from arnold --- openpype/hosts/maya/api/lib.py | 26 +++++++++++-------- .../maya/plugins/publish/extract_look.py | 11 +++++--- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index 51da7a4b98..e20ae15228 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -15,7 +15,7 @@ from six import string_types from maya import cmds, mel import maya.api.OpenMaya as om -from arnold import * +from arnold import * # noqa from openpype.client import ( get_project, @@ -3390,12 +3390,13 @@ def imageInfo(filepath): AiTextureGetFormat(filename): Get Texture Format AiTextureGetBitDepth(filename): Get Texture Bit Depth """ + # Get Texture Information img_info = {} img_info['filename'] = filepath if os.path.isfile(filepath): - img_info['bit_depth'] = AiTextureGetBitDepth(filepath) - img_info['format'] = AiTextureGetFormat(filepath) + img_info['bit_depth'] = AiTextureGetBitDepth(filepath) # noqa + img_info['format'] = AiTextureGetFormat(filepath) # noqa else: img_info['bit_depth'] = 8 img_info['format'] = "unknown" @@ -3404,16 +3405,19 @@ def imageInfo(filepath): def guess_colorspace(img_info): ''' Take reference from makeTx.py Guess the colorspace of the input image filename. - @return: a string suitable for the --colorconvert option of maketx (linear, sRGB, Rec709) + @return: a string suitable for the --colorconvert + option of maketx (linear, sRGB, Rec709) ''' try: - if img_info['bit_depth'] <= 16 and img_info['format'] in (AI_TYPE_BYTE, AI_TYPE_INT, AI_TYPE_UINT): - return 'sRGB' - else: - return 'linear' + if img_info['bit_depth'] <= 16: + if img_info['format'] in (AI_TYPE_BYTE, AI_TYPE_INT, AI_TYPE_UINT): # noqa + return 'sRGB' + else: + return 'linear' # now discard the image file as AiTextureGetFormat has loaded it - AiTextureInvalidate(img_info['filename']) - except: - print('[maketx] Error: Could not guess colorspace for "%s"' % img_info['filename']) + AiTextureInvalidate(img_info['filename']) # noqa + except ValueError: + print('[maketx] Error: Could not guess' + 'colorspace for "%s"' % img_info['filename']) return 'linear' diff --git a/openpype/hosts/maya/plugins/publish/extract_look.py b/openpype/hosts/maya/plugins/publish/extract_look.py index 5ac5d9c728..46f7b0e03d 100644 --- a/openpype/hosts/maya/plugins/publish/extract_look.py +++ b/openpype/hosts/maya/plugins/publish/extract_look.py @@ -553,12 +553,15 @@ class ExtractLook(publish.Extractor): color_space = guess_colorspace(img_info) if color_space == "sRGB": self.log.info("tx: converting sRGB -> linear") - additional_args.extend(["--colorconvert", "sRGB", "Raw"]) + additional_args.extend(["--colorconvert", + "sRGB", + "Raw"]) else: - self.log.info("tx: texture's colorspace is already linear") + self.log.info("tx: texture's colorspace " + "is already linear") - - config_path = cmds.colorManagementPrefs(query=True, configFilePath=True) + config_path = cmds.colorManagementPrefs(query=True, + configFilePath=True) if not os.path.exists(config_path): raise RuntimeError("No OCIO config path found!") additional_args.extend(["--colorconfig", config_path]) From c1012bd03105d26c440a31797a0363180bfb0187 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 2 Feb 2023 12:01:54 +0800 Subject: [PATCH 131/912] hound fix --- openpype/hosts/maya/api/lib.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index e20ae15228..d6a3988922 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -3402,6 +3402,7 @@ def imageInfo(filepath): img_info['format'] = "unknown" return img_info + def guess_colorspace(img_info): ''' Take reference from makeTx.py Guess the colorspace of the input image filename. From b8084babfd436cef14755de3161dd7fc64d154de Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 2 Feb 2023 18:00:03 +0800 Subject: [PATCH 132/912] update docstring --- openpype/hosts/maya/api/lib.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index d6a3988922..f33b0c8d8e 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -3382,11 +3382,9 @@ def get_attribute_input(attr): return connections[0] if connections else None -# Reference from Arnold -# Get Image Information for colorspace def imageInfo(filepath): - """Take reference from makeTx.py - ImageInfo(filename): Get Image Information + """Take reference from makeTx.py in Arnold + ImageInfo(filename): Get Image Information for colorspace AiTextureGetFormat(filename): Get Texture Format AiTextureGetBitDepth(filename): Get Texture Bit Depth """ From 280d977868d89edb3ecd15801f9bc7cf2c706d18 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 2 Feb 2023 18:39:41 +0000 Subject: [PATCH 133/912] Only parse focussed panel if its a modelPanel. --- openpype/hosts/maya/plugins/publish/extract_playblast.py | 4 ++-- openpype/hosts/maya/plugins/publish/extract_thumbnail.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/extract_playblast.py b/openpype/hosts/maya/plugins/publish/extract_playblast.py index 1f9f9db99a..e4e44e4770 100644 --- a/openpype/hosts/maya/plugins/publish/extract_playblast.py +++ b/openpype/hosts/maya/plugins/publish/extract_playblast.py @@ -131,8 +131,8 @@ class ExtractPlayblast(publish.Extractor): # Update preset with current panel setting # if override_viewport_options is turned off - if not override_viewport_options: - panel = cmds.getPanel(withFocus=True) + panel = cmds.getPanel(withFocus=True) or "" + if not override_viewport_options and "modelPanel" in panel: panel_preset = capture.parse_active_view() preset.update(panel_preset) cmds.setFocus(panel) diff --git a/openpype/hosts/maya/plugins/publish/extract_thumbnail.py b/openpype/hosts/maya/plugins/publish/extract_thumbnail.py index 1edafeb926..1d94bd58c5 100644 --- a/openpype/hosts/maya/plugins/publish/extract_thumbnail.py +++ b/openpype/hosts/maya/plugins/publish/extract_thumbnail.py @@ -134,8 +134,8 @@ class ExtractThumbnail(publish.Extractor): # Update preset with current panel setting # if override_viewport_options is turned off - if not override_viewport_options: - panel = cmds.getPanel(withFocus=True) + panel = cmds.getPanel(withFocus=True) or "" + if not override_viewport_options and "modelPanel" in panel: panel_preset = capture.parse_active_view() preset.update(panel_preset) cmds.setFocus(panel) From 324eaa26b91cbcef39d416bc6cd5bbf9e848cb65 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 3 Feb 2023 02:21:14 +0300 Subject: [PATCH 134/912] use temp folder to store the prefs, check if FUSION16_PROFILE_DIR exists --- .../hosts/fusion/hooks/pre_fusion_setup.py | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index f6cec86e3b..01b2a37b74 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -19,8 +19,14 @@ class FusionPrelaunch(PreLaunchHook): """ app_groups = ["fusion"] + OPENPYPE_FUSION_PROFILE_DIR = "~/.openpype/hosts/fusion/prefs" def get_profile_source(self): + fusion_var_prefs_dir = os.getenv("FUSION16_PROFILE_DIR") + if fusion_var_prefs_dir and Path(fusion_var_prefs_dir).is_dir(): + self.log.info(f"local Fusion prefs environment is set to {fusion_var_prefs_dir}") + return os.path.join(fusion_var_prefs_dir, "Fusion.prefs") + fusion_prefs_path = "Blackmagic Design/Fusion/Profiles/Default/Fusion.prefs" if platform.system() == "Windows": prefs_source = Path(os.getenv("AppData")) / fusion_prefs_path @@ -32,16 +38,19 @@ class FusionPrelaunch(PreLaunchHook): return str(prefs_source) def copy_existing_prefs(self, profile_directory: str): - dest_folder = os.path.join(profile_directory, "Default") - os.makedirs(dest_folder, exist_ok=True) + dest_folder = Path(profile_directory) / "Default" + dest_folder.mkdir(exist_ok=True, parents=True) prefs_source = self.get_profile_source() - if os.path.exists(prefs_source): - shutil.copy(prefs_source, dest_folder) - self.log.info(f"successfully copied preferences:\n {prefs_source} to {dest_folder}") + if not Path(prefs_source).exists(): + self.log.warning(f"Fusion preferences file not found in {prefs_source}") + return + shutil.copy(prefs_source, dest_folder) + self.log.info(f"successfully copied preferences:\n {prefs_source} to {dest_folder}") def execute(self): # making sure python 3 is installed at provided path # Py 3.3-3.10 for Fusion 18+ or Py 3.6 for Fu 16-17 + py3_var = "FUSION_PYTHON3_HOME" fusion_python3_home = self.launch_context.env.get(py3_var, "") @@ -79,10 +88,11 @@ class FusionPrelaunch(PreLaunchHook): profile_dir_var = "FUSION16_PROFILE_DIR" # used by Fusion 16, 17 and 18 pref_var = "FUSION16_MasterPrefs" # used by Fusion 16, 17 and 18 - profile_dir = os.path.join(FUSION_HOST_DIR, "deploy", "Prefs") + profile_dir = os.path.expanduser(self.OPENPYPE_FUSION_PROFILE_DIR) prefs = os.path.join(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") # now copy the default Fusion profile to a working directory + # only if the openpype profile folder does not exist if not os.path.exists(profile_dir): self.copy_existing_prefs(profile_dir) self.log.info(f"Setting {profile_dir_var}: {profile_dir}") From 3b0f5601338b3299de1493b00754633a55053bf5 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 3 Feb 2023 02:22:02 +0300 Subject: [PATCH 135/912] remove custom pathmap --- openpype/hosts/fusion/deploy/fusion_shared.prefs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/deploy/fusion_shared.prefs b/openpype/hosts/fusion/deploy/fusion_shared.prefs index d9451ea295..0225b2209b 100644 --- a/openpype/hosts/fusion/deploy/fusion_shared.prefs +++ b/openpype/hosts/fusion/deploy/fusion_shared.prefs @@ -6,7 +6,7 @@ Global = { ["OpenPype:"] = "$(OPENPYPE_FUSION)/deploy", ["Config:"] = "UserPaths:Config;OpenPype:Config", ["Scripts:"] = "UserPaths:Scripts;Reactor:System/Scripts;OpenPype:Scripts", - ["UserPaths:"] = "UserData:;GIT:;AllData:;Fusion:;Reactor:Deploy" + ["UserPaths:"] = "UserData:;AllData:;Fusion:;Reactor:Deploy" }, }, Script = { @@ -14,4 +14,4 @@ Global = { Python3Forced = true }, }, -} \ No newline at end of file +} From 13a364377d93fe33317a6b17b861b89f187fe54b Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 3 Feb 2023 02:23:30 +0300 Subject: [PATCH 136/912] use get comp filename from lib --- openpype/hosts/fusion/api/lib.py | 20 +++++++++++--------- openpype/hosts/fusion/api/workio.py | 10 +++------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/openpype/hosts/fusion/api/lib.py b/openpype/hosts/fusion/api/lib.py index ac30e1ff99..ec96d6cf18 100644 --- a/openpype/hosts/fusion/api/lib.py +++ b/openpype/hosts/fusion/api/lib.py @@ -302,14 +302,8 @@ def get_frame_path(path): return filename, padding, ext -def get_comp_name(comp=None): - """Get basename of the comp's filename""" - if comp: - return comp.GetAttrs()["COMPS_Name"] - - def get_fusion(): - """Get Fusion instance""" + """Get current Fusion instance""" fusion = getattr(sys.modules["__main__"], "fusion", None) return fusion @@ -317,8 +311,16 @@ def get_fusion(): def get_current_comp(): """Get current comp in this session""" fusion = get_fusion() - comp = fusion.CurrentComp - return comp + if fusion: + comp = fusion.CurrentComp + return comp + + +def get_comp_filename(): + """Get comp's Filename""" + comp = get_current_comp() + if comp: + return comp.GetAttrs()["COMPS_FileName"] @contextlib.contextmanager diff --git a/openpype/hosts/fusion/api/workio.py b/openpype/hosts/fusion/api/workio.py index da36a83988..048e6e090a 100644 --- a/openpype/hosts/fusion/api/workio.py +++ b/openpype/hosts/fusion/api/workio.py @@ -2,7 +2,7 @@ import sys import os -from .lib import get_fusion, get_current_comp +from .lib import get_fusion, get_current_comp, get_comp_filename def file_extensions(): @@ -25,12 +25,8 @@ def open_file(filepath): def current_file(): - comp = get_current_comp() - current_filepath = comp.GetAttrs()["COMPS_FileName"] - if not current_filepath: - return None - - return current_filepath + current_filepath = get_comp_filename() + return current_filepath or None def work_root(session): From 62319248a10f91488b1417fe52cd78a3fac8e24c Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 3 Feb 2023 02:26:34 +0300 Subject: [PATCH 137/912] do not override Userpaths --- openpype/hosts/fusion/deploy/fusion_shared.prefs | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/fusion/deploy/fusion_shared.prefs b/openpype/hosts/fusion/deploy/fusion_shared.prefs index 0225b2209b..8d0e45eae5 100644 --- a/openpype/hosts/fusion/deploy/fusion_shared.prefs +++ b/openpype/hosts/fusion/deploy/fusion_shared.prefs @@ -6,7 +6,6 @@ Global = { ["OpenPype:"] = "$(OPENPYPE_FUSION)/deploy", ["Config:"] = "UserPaths:Config;OpenPype:Config", ["Scripts:"] = "UserPaths:Scripts;Reactor:System/Scripts;OpenPype:Scripts", - ["UserPaths:"] = "UserData:;AllData:;Fusion:;Reactor:Deploy" }, }, Script = { From be90410047508cd4826b933dd57361f3fa576c2c Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 3 Feb 2023 13:12:35 +0300 Subject: [PATCH 138/912] use pathlib over os.path, check if FUSION_PROFILE is set --- .../hosts/fusion/hooks/pre_fusion_setup.py | 65 +++++++++++-------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index 01b2a37b74..eadcb481e3 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -20,32 +20,41 @@ class FusionPrelaunch(PreLaunchHook): """ app_groups = ["fusion"] OPENPYPE_FUSION_PROFILE_DIR = "~/.openpype/hosts/fusion/prefs" + PROFILE_NUMBER = 16 - def get_profile_source(self): - fusion_var_prefs_dir = os.getenv("FUSION16_PROFILE_DIR") + def get_fusion_profile(self) -> str: + return os.getenv(f"FUSION{self.PROFILE_NUMBER}_PROFILE", "Default") + + def get_profile_source(self) -> Path: + fusion_var_prefs_dir = os.getenv(f"FUSION{self.PROFILE_NUMBER}_PROFILE_DIR") + + # if FUSION16_PROFILE_DIR variable exists, return the profile filepath if fusion_var_prefs_dir and Path(fusion_var_prefs_dir).is_dir(): - self.log.info(f"local Fusion prefs environment is set to {fusion_var_prefs_dir}") - return os.path.join(fusion_var_prefs_dir, "Fusion.prefs") - - fusion_prefs_path = "Blackmagic Design/Fusion/Profiles/Default/Fusion.prefs" + fusion_profile = self.get_fusion_profile() + fusion_prefs_dir = Path(fusion_var_prefs_dir, fusion_profile) + self.log.info(f"Local Fusion prefs environment is set to {fusion_prefs_dir}") + fusion_prefs_filepath = fusion_prefs_dir / "Fusion.prefs" + return fusion_prefs_filepath + + # otherwise get the profile from default prefs location + fusion_prefs_path = f"Blackmagic Design/Fusion/Profiles/{fusion_var_prefs_dir}/Fusion.prefs" if platform.system() == "Windows": prefs_source = Path(os.getenv("AppData")) / fusion_prefs_path elif platform.system() == "Darwin": - prefs_source = Path(os.path.expanduser("~/Library/Application Support/")) / fusion_prefs_path + prefs_source = Path("~/Library/Application Support/", fusion_prefs_path).expanduser() elif platform.system() == "Linux": - prefs_source = Path(os.path.expanduser("~/.fusion")) / fusion_prefs_path + prefs_source = Path("~/.fusion", fusion_prefs_path).expanduser() + + return prefs_source - return str(prefs_source) - - def copy_existing_prefs(self, profile_directory: str): - dest_folder = Path(profile_directory) / "Default" + def copy_existing_prefs(self, copy_from: Path, copy_to: Path) -> None: + dest_folder = copy_to / self.get_fusion_profile() dest_folder.mkdir(exist_ok=True, parents=True) - prefs_source = self.get_profile_source() - if not Path(prefs_source).exists(): - self.log.warning(f"Fusion preferences file not found in {prefs_source}") + if not copy_from.exists(): + self.log.warning(f"Fusion preferences file not found in {copy_from}") return - shutil.copy(prefs_source, dest_folder) - self.log.info(f"successfully copied preferences:\n {prefs_source} to {dest_folder}") + shutil.copy(str(copy_from), str(dest_folder)) # compatible with Python >= 3.6 + self.log.info(f"successfully copied preferences:\n {copy_from} to {dest_folder}") def execute(self): # making sure python 3 is installed at provided path @@ -54,12 +63,12 @@ class FusionPrelaunch(PreLaunchHook): py3_var = "FUSION_PYTHON3_HOME" fusion_python3_home = self.launch_context.env.get(py3_var, "") - self.log.info(f"Looking for Python 3 in: {fusion_python3_home}") for path in fusion_python3_home.split(os.pathsep): - # Allow defining multiple paths to allow "fallback" to other + # Allow defining multiple paths, separated by os.pathsep, to allow "fallback" to other # path. But make to set only a single path as final variable. py3_dir = os.path.normpath(path) if os.path.isdir(py3_dir): + self.log.info(f"Looking for Python 3 in: {py3_dir}") break else: raise ApplicationLaunchFailed( @@ -88,14 +97,16 @@ class FusionPrelaunch(PreLaunchHook): profile_dir_var = "FUSION16_PROFILE_DIR" # used by Fusion 16, 17 and 18 pref_var = "FUSION16_MasterPrefs" # used by Fusion 16, 17 and 18 - profile_dir = os.path.expanduser(self.OPENPYPE_FUSION_PROFILE_DIR) - prefs = os.path.join(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") + op_profile_dir = Path(self.OPENPYPE_FUSION_PROFILE_DIR).expanduser() + op_master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") + prefs_source = self.get_profile_source() + self.log.info(f"Got Fusion prefs file: {prefs_source}") # now copy the default Fusion profile to a working directory # only if the openpype profile folder does not exist - if not os.path.exists(profile_dir): - self.copy_existing_prefs(profile_dir) - self.log.info(f"Setting {profile_dir_var}: {profile_dir}") - self.launch_context.env[profile_dir_var] = profile_dir - self.log.info(f"Setting {pref_var}: {prefs}") - self.launch_context.env[pref_var] = prefs + if not op_profile_dir.exists(): + self.copy_existing_prefs(prefs_source, op_profile_dir) + self.log.info(f"Setting {profile_dir_var}: {op_profile_dir}") + self.launch_context.env[profile_dir_var] = str(op_profile_dir) + self.log.info(f"Setting {pref_var}: {op_master_prefs}") + self.launch_context.env[pref_var] = str(op_master_prefs) From 95280aef00d3886170f593e47129bb6560502c2b Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 3 Feb 2023 13:44:30 +0300 Subject: [PATCH 139/912] fix get fusion profile --- openpype/hosts/fusion/hooks/pre_fusion_setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index eadcb481e3..4f000a12b2 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -26,18 +26,18 @@ class FusionPrelaunch(PreLaunchHook): return os.getenv(f"FUSION{self.PROFILE_NUMBER}_PROFILE", "Default") def get_profile_source(self) -> Path: + fusion_profile = self.get_fusion_profile() fusion_var_prefs_dir = os.getenv(f"FUSION{self.PROFILE_NUMBER}_PROFILE_DIR") # if FUSION16_PROFILE_DIR variable exists, return the profile filepath if fusion_var_prefs_dir and Path(fusion_var_prefs_dir).is_dir(): - fusion_profile = self.get_fusion_profile() fusion_prefs_dir = Path(fusion_var_prefs_dir, fusion_profile) self.log.info(f"Local Fusion prefs environment is set to {fusion_prefs_dir}") fusion_prefs_filepath = fusion_prefs_dir / "Fusion.prefs" return fusion_prefs_filepath # otherwise get the profile from default prefs location - fusion_prefs_path = f"Blackmagic Design/Fusion/Profiles/{fusion_var_prefs_dir}/Fusion.prefs" + fusion_prefs_path = f"Blackmagic Design/Fusion/Profiles/{fusion_profile}/Fusion.prefs" if platform.system() == "Windows": prefs_source = Path(os.getenv("AppData")) / fusion_prefs_path elif platform.system() == "Darwin": From 9bba80ff6196cff4c4579bcb78db9f8ef1623081 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 3 Feb 2023 20:32:38 +0300 Subject: [PATCH 140/912] add copy fusion prefs global settings --- .../system_settings/applications.json | 8 +++++- .../host_settings/schema_fusion.json | 25 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json index 936407a49b..5d75b3b606 100644 --- a/openpype/settings/defaults/system_settings/applications.json +++ b/openpype/settings/defaults/system_settings/applications.json @@ -835,6 +835,10 @@ "linux": "/opt/Python/3.6/bin" } }, + "copy_fusion_settings": { + "copy_prefs": false, + "prefs_path": "~/.openpype/hosts/fusion/prefs" + }, "variants": { "18": { "executables": { @@ -1302,7 +1306,9 @@ "variant_label": "Current", "use_python_2": false, "executables": { - "windows": ["C:/Program Files/CelAction/CelAction2D Studio/CelAction2D.exe"], + "windows": [ + "C:/Program Files/CelAction/CelAction2D Studio/CelAction2D.exe" + ], "darwin": [], "linux": [] }, diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json index 5960da7774..360813bcb5 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json @@ -19,6 +19,31 @@ "label": "Environment", "type": "raw-json" }, + { + "type": "splitter" + }, + { + "type": "dict", + "key": "copy_fusion_settings", + "collapsible": true, + "checkbox_key": "copy_prefs", + "label": "Copy Fusion preferences", + "children": [ + { + "type": "boolean", + "key": "copy_prefs", + "label": "Enabled" + }, + { + "key": "prefs_path", + "type": "path", + "label": "Local prefs directory" + } + ] + }, + { + "type": "splitter" + }, { "type": "dict-modifiable", "key": "variants", From e24665cf536aa4d48538f229718de57a731e75f1 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 7 Feb 2023 18:22:10 +0100 Subject: [PATCH 141/912] OP-4643 - remove review from old representation If new representation gets created and adds 'review' tag it becomes new reviewable representation. --- .../publish/extract_color_transcode.py | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index e39ea3add9..d10b887a0b 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -89,6 +89,7 @@ class ExtractOIIOTranscode(publish.Extractor): continue added_representations = False + added_review = False colorspace_data = repre["colorspaceData"] source_colorspace = colorspace_data["colorspace"] @@ -166,11 +167,15 @@ class ExtractOIIOTranscode(publish.Extractor): if tag not in new_repre["tags"]: new_repre["tags"].append(tag) + if tag == "review": + added_review = True + instance.data["representations"].append(new_repre) added_representations = True if added_representations: - self._mark_original_repre_for_deletion(repre, profile) + self._mark_original_repre_for_deletion(repre, profile, + added_review) def _rename_in_representation(self, new_repre, files_to_convert, output_name, output_extension): @@ -300,15 +305,16 @@ class ExtractOIIOTranscode(publish.Extractor): return True - def _mark_original_repre_for_deletion(self, repre, profile): + def _mark_original_repre_for_deletion(self, repre, profile, added_review): """If new transcoded representation created, delete old.""" + if not repre.get("tags"): + repre["tags"] = [] + delete_original = profile["delete_original"] if delete_original: - if not repre.get("tags"): - repre["tags"] = [] - - if "review" in repre["tags"]: - repre["tags"].remove("review") if "delete" not in repre["tags"]: repre["tags"].append("delete") + + if added_review and "review" in repre["tags"]: + repre["tags"].remove("review") From 3aa74b231c2e7116ea792901ac53cfcd848513fc Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 7 Feb 2023 18:23:42 +0100 Subject: [PATCH 142/912] OP-4643 - remove representation that should be deleted Or old revieable representation would be reviewed too. --- openpype/plugins/publish/extract_color_transcode.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index d10b887a0b..93ee1ec44d 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -177,6 +177,11 @@ class ExtractOIIOTranscode(publish.Extractor): self._mark_original_repre_for_deletion(repre, profile, added_review) + for repre in tuple(instance.data["representations"]): + tags = repre.get("tags") or [] + if "delete" in tags and "thumbnail" not in tags: + instance.data["representations"].remove(repre) + def _rename_in_representation(self, new_repre, files_to_convert, output_name, output_extension): """Replace old extension with new one everywhere in representation. From 5e0c4a3ab1432e120b8f0c324f899070f1a5f831 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 8 Feb 2023 12:07:00 +0100 Subject: [PATCH 143/912] Fix - added missed scopes for Slack bot --- openpype/modules/slack/manifest.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openpype/modules/slack/manifest.yml b/openpype/modules/slack/manifest.yml index 7a65cc5915..233c39fbaf 100644 --- a/openpype/modules/slack/manifest.yml +++ b/openpype/modules/slack/manifest.yml @@ -19,6 +19,8 @@ oauth_config: - chat:write.public - files:write - channels:read + - users:read + - usergroups:read settings: org_deploy_enabled: false socket_mode_enabled: false From 95aff1808fdb27d77b647f5b373c80e27eee56a1 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 8 Feb 2023 22:03:05 +0800 Subject: [PATCH 144/912] setting up deadline for 3dsmax --- openpype/hosts/max/api/lib.py | 33 +++++ openpype/hosts/max/api/lib_renderproducts.py | 102 +++++++++++++ openpype/hosts/max/api/lib_rendersettings.py | 125 ++++++++++++++++ .../hosts/max/plugins/create/create_render.py | 33 +++++ .../max/plugins/publish/collect_render.py | 72 +++++++++ .../maya/plugins/publish/collect_render.py | 2 - .../plugins/publish/submit_3dmax_deadline.py | 137 ++++++++++++++++++ .../defaults/project_settings/max.json | 7 + .../schemas/projects_schema/schema_main.json | 4 + .../projects_schema/schema_project_max.json | 52 +++++++ 10 files changed, 565 insertions(+), 2 deletions(-) create mode 100644 openpype/hosts/max/api/lib_renderproducts.py create mode 100644 openpype/hosts/max/api/lib_rendersettings.py create mode 100644 openpype/hosts/max/plugins/create/create_render.py create mode 100644 openpype/hosts/max/plugins/publish/collect_render.py create mode 100644 openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py create mode 100644 openpype/settings/defaults/project_settings/max.json create mode 100644 openpype/settings/entities/schemas/projects_schema/schema_project_max.json diff --git a/openpype/hosts/max/api/lib.py b/openpype/hosts/max/api/lib.py index 9256ca9ac1..8c421b2f9b 100644 --- a/openpype/hosts/max/api/lib.py +++ b/openpype/hosts/max/api/lib.py @@ -120,3 +120,36 @@ def get_all_children(parent, node_type=None): return ([x for x in child_list if rt.superClassOf(x) == node_type] if node_type else child_list) + + +def get_current_renderer(): + """get current renderer""" + return rt.renderers.production + + +def get_default_render_folder(project_setting=None): + return (project_setting["max"] + ["RenderSettings"] + ["default_render_image_folder"] + ) + + +def set_framerange(startFrame, endFrame): + """Get/set the type of time range to be rendered. + + Possible values are: + + 1 -Single frame. + + 2 -Active time segment ( animationRange ). + + 3 -User specified Range. + + 4 -User specified Frame pickup string (for example "1,3,5-12"). + """ + # hard-code, there should be a custom setting for this + rt.rendTimeType = 4 + if startFrame is not None and endFrame is not None: + frameRange = "{0}-{1}".format(startFrame, endFrame) + rt.rendPickupFrames = frameRange + diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py new file mode 100644 index 0000000000..f3bb8bdad1 --- /dev/null +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -0,0 +1,102 @@ +# Render Element Example : For scanline render, VRay +# https://help.autodesk.com/view/MAXDEV/2022/ENU/?guid=GUID-E8F75D47-B998-4800-A3A5-610E22913CFC +# arnold +# https://help.autodesk.com/view/ARNOL/ENU/?guid=arnold_for_3ds_max_ax_maxscript_commands_ax_renderview_commands_html +import os +from pymxs import runtime as rt +from openpype.hosts.max.api.lib import ( + get_current_renderer, + get_default_render_folder +) +from openpype.pipeline.context_tools import get_current_project_asset +from openpype.settings import get_project_settings +from openpype.pipeline import legacy_io + + +class RenderProducts(object): + + @classmethod + def __init__(self, project_settings=None): + self._project_settings = project_settings + if not self._project_settings: + self._project_settings = get_project_settings( + legacy_io.Session["AVALON_PROJECT"] + ) + + def render_product(self, container): + folder = rt.maxFilePath + folder = folder.replace("\\", "/") + setting = self._project_settings + render_folder = get_default_render_folder(setting) + + output_file = os.path.join(folder, render_folder, container) + context = get_current_project_asset() + startFrame = context["data"].get("frameStart") + endFrame = context["data"].get("frameEnd") + 1 + + img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"] + full_render_list = self.beauty_render_product(output_file, + startFrame, + endFrame, + img_fmt) + renderer_class = get_current_renderer() + renderer = str(renderer_class).split(":")[0] + + if renderer == "VUE_File_Renderer": + return full_render_list + + if ( + renderer == "ART_Renderer" or + renderer == "Redshift Renderer" or + renderer == "V_Ray_6_Hotfix_3" or + renderer == "V_Ray_GPU_6_Hotfix_3" or + renderer == "Default_Scanline_Renderer" or + renderer == "Quicksilver_Hardware_Renderer" + ): + render_elem_list = self.render_elements_product(output_file, + startFrame, + endFrame, + img_fmt) + for render_elem in render_elem_list: + full_render_list.append(render_elem) + return full_render_list + + if renderer == "Arnold": + return full_render_list + + + def beauty_render_product(self, folder, startFrame, endFrame, fmt): + # get the beauty + beauty_frame_range = list() + + for f in range(startFrame, endFrame): + beauty = "{0}.{1}.{2}".format(folder, str(f), fmt) + beauty = beauty.replace("\\", "/") + beauty_frame_range.append(beauty) + + return beauty_frame_range + + # TODO: Get the arnold render product + def render_elements_product(self, folder, startFrame, endFrame, fmt): + """Get all the render element output files. """ + render_dirname = list() + + render_elem = rt.maxOps.GetCurRenderElementMgr() + render_elem_num = render_elem.NumRenderElements() + # get render elements from the renders + for i in range(render_elem_num): + renderlayer_name = render_elem.GetRenderElement(i) + target, renderpass = str(renderlayer_name).split(":") + + render_dir = os.path.join(folder, renderpass) + if renderlayer_name.enabled: + for f in range(startFrame, endFrame): + render_element = "{0}.{1}.{2}".format(render_dir, str(f), fmt) + render_element = render_element.replace("\\", "/") + render_dirname.append(render_element) + + return render_dirname + + def image_format(self): + img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"] + return img_fmt diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py new file mode 100644 index 0000000000..8c8a82ae66 --- /dev/null +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -0,0 +1,125 @@ +import os +from pymxs import runtime as rt +from openpype.lib import Logger +from openpype.settings import get_project_settings +from openpype.pipeline import legacy_io +from openpype.pipeline.context_tools import get_current_project_asset + +from openpype.hosts.max.api.lib import ( + set_framerange, + get_current_renderer, + get_default_render_folder +) + + +class RenderSettings(object): + + log = Logger.get_logger("RenderSettings") + + _aov_chars = { + "dot": ".", + "dash": "-", + "underscore": "_" + } + + @classmethod + def __init__(self, project_settings=None): + self._project_settings = project_settings + if not self._project_settings: + self._project_settings = get_project_settings( + legacy_io.Session["AVALON_PROJECT"] + ) + + def set_render_camera(self, selection): + for sel in selection: + # to avoid Attribute Error from pymxs wrapper + found = False + if rt.classOf(sel) in rt.Camera.classes: + found = True + rt.viewport.setCamera(sel) + break + if not found: + raise RuntimeError("Camera not found") + + + def set_renderoutput(self, container): + folder = rt.maxFilePath + # hard-coded, should be customized in the setting + folder = folder.replace("\\", "/") + # hard-coded, set the renderoutput path + setting = self._project_settings + render_folder = get_default_render_folder(setting) + output_dir = os.path.join(folder, render_folder) + if not os.path.exists(output_dir): + os.makedirs(output_dir) + # hard-coded, should be customized in the setting + context = get_current_project_asset() + + # get project reoslution + width = context["data"].get("resolutionWidth") + height = context["data"].get("resolutionHeight") + # Set Frame Range + startFrame = context["data"].get("frameStart") + endFrame = context["data"].get("frameEnd") + set_framerange(startFrame, endFrame) + # get the production render + renderer_class = get_current_renderer() + renderer = str(renderer_class).split(":")[0] + + img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"] + output = os.path.join(output_dir, container) + try: + aov_separator = self._aov_chars[( + self._project_settings["maya"] + ["RenderSettings"] + ["aov_separator"] + )] + except KeyError: + aov_separator = "." + outputFilename = "{0}.{1}".format(output, img_fmt) + outputFilename = outputFilename.replace("{aov_separator}", aov_separator) + rt.rendOutputFilename = outputFilename + if renderer == "VUE_File_Renderer": + return + # TODO: Finish the arnold render setup + if renderer == "Arnold": + return + + if ( + renderer == "ART_Renderer" or + renderer == "Redshift Renderer" or + renderer == "V_Ray_6_Hotfix_3" or + renderer == "V_Ray_GPU_6_Hotfix_3" or + renderer == "Default_Scanline_Renderer" or + renderer == "Quicksilver_Hardware_Renderer" + ): + self.render_element_layer(output, width, height, img_fmt) + + rt.rendSaveFile= True + + + def render_element_layer(self, dir, width, height, ext): + """For Renderers with render elements""" + rt.renderWidth = width + rt.renderHeight = height + render_elem = rt.maxOps.GetCurRenderElementMgr() + render_elem_num = render_elem.NumRenderElements() + if render_elem_num < 0: + return + + for i in range(render_elem_num): + renderlayer_name = render_elem.GetRenderElement(i) + target, renderpass = str(renderlayer_name).split(":") + render_element = os.path.join(dir, renderpass) + aov_name = "{0}.{1}".format(render_element, ext) + try: + aov_separator = self._aov_chars[( + self._project_settings["maya"] + ["RenderSettings"] + ["aov_separator"] + )] + except KeyError: + aov_separator = "." + + aov_name = aov_name.replace("{aov_separator}", aov_separator) + render_elem.SetRenderElementFileName(i, aov_name) diff --git a/openpype/hosts/max/plugins/create/create_render.py b/openpype/hosts/max/plugins/create/create_render.py new file mode 100644 index 0000000000..76c10ca4a9 --- /dev/null +++ b/openpype/hosts/max/plugins/create/create_render.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +"""Creator plugin for creating camera.""" +from openpype.hosts.max.api import plugin +from openpype.pipeline import CreatedInstance +from openpype.hosts.max.api.lib_rendersettings import RenderSettings + + +class CreateRender(plugin.MaxCreator): + identifier = "io.openpype.creators.max.render" + label = "Render" + family = "maxrender" + icon = "gear" + + def create(self, subset_name, instance_data, pre_create_data): + from pymxs import runtime as rt + sel_obj = list(rt.selection) + instance = super(CreateRender, self).create( + subset_name, + instance_data, + pre_create_data) # type: CreatedInstance + container_name = instance.data.get("instance_node") + container = rt.getNodeByName(container_name) + # TODO: Disable "Add to Containers?" Panel + # parent the selected cameras into the container + for obj in sel_obj: + obj.parent = container + # for additional work on the node: + # instance_node = rt.getNodeByName(instance.get("instance_node")) + + # set viewport camera for rendering(mandatory for deadline) + RenderSettings().set_render_camera(sel_obj) + # set output paths for rendering(mandatory for deadline) + RenderSettings().set_renderoutput(container_name) diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py new file mode 100644 index 0000000000..fc44c01206 --- /dev/null +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -0,0 +1,72 @@ +# -*- coding: utf-8 -*- +"""Collect Render""" +import os +import pyblish.api + +from pymxs import runtime as rt +from openpype.pipeline import legacy_io +from openpype.hosts.max.api.lib import get_current_renderer +from openpype.hosts.max.api.lib_renderproducts import RenderProducts + + +class CollectRender(pyblish.api.InstancePlugin): + """Collect Render for Deadline""" + + order = pyblish.api.CollectorOrder + 0.01 + label = "Collect 3dmax Render Layers" + hosts = ['max'] + families = ["maxrender"] + + def process(self, instance): + context = instance.context + folder = rt.maxFilePath + file = rt.maxFileName + current_file = os.path.join(folder, file) + filepath = current_file.replace("\\", "/") + + context.data['currentFile'] = current_file + asset = legacy_io.Session["AVALON_ASSET"] + + render_layer_files = RenderProducts().render_product(instance.name) + folder = folder.replace("\\", "/") + + imgFormat = RenderProducts().image_format() + renderer_class = get_current_renderer() + renderer_name = str(renderer_class).split(":")[0] + # setup the plugin as 3dsmax for the internal renderer + if ( + renderer_name == "ART_Renderer" or + renderer_name == "Default_Scanline_Renderer" or + renderer_name == "Quicksilver_Hardware_Renderer" + ): + plugin = "3dsmax" + + if ( + renderer_name == "V_Ray_6_Hotfix_3" or + renderer_name == "V_Ray_GPU_6_Hotfix_3" + ): + plugin = "Vray" + + if renderer_name == "Redshift Renderer": + plugin = "redshift" + + if renderer_name == "Arnold": + plugin = "arnold" + + # https://forums.autodesk.com/t5/3ds-max-programming/pymxs-quickrender-animation-range/td-p/11216183 + + data = { + "subset": instance.name, + "asset": asset, + "publish": True, + "imageFormat": imgFormat, + "family": 'maxrender', + "families": ['maxrender'], + "source": filepath, + "files": render_layer_files, + "plugin": plugin, + "frameStart": context.data['frameStart'], + "frameEnd": context.data['frameEnd'] + } + self.log.info("data: {0}".format(data)) + instance.data.update(data) diff --git a/openpype/hosts/maya/plugins/publish/collect_render.py b/openpype/hosts/maya/plugins/publish/collect_render.py index b1ad3ca58e..c5fce219fa 100644 --- a/openpype/hosts/maya/plugins/publish/collect_render.py +++ b/openpype/hosts/maya/plugins/publish/collect_render.py @@ -184,7 +184,6 @@ class CollectMayaRender(pyblish.api.ContextPlugin): self.log.info("multipart: {}".format( multipart)) assert exp_files, "no file names were generated, this is bug" - self.log.info(exp_files) # if we want to attach render to subset, check if we have AOV's # in expectedFiles. If so, raise error as we cannot attach AOV @@ -320,7 +319,6 @@ class CollectMayaRender(pyblish.api.ContextPlugin): "renderSetupIncludeLights" ) } - # Collect Deadline url if Deadline module is enabled deadline_settings = ( context.data["system_settings"]["modules"]["deadline"] diff --git a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py new file mode 100644 index 0000000000..7e7173e4ce --- /dev/null +++ b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py @@ -0,0 +1,137 @@ +import os +import json +import getpass + +import requests +import pyblish.api + + +from openpype.pipeline import legacy_io + + +class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): + """ + 3DMax File Submit Render Deadline + + """ + + label = "Submit 3DsMax Render to Deadline" + order = pyblish.api.IntegratorOrder + hosts = ["max"] + families = ["maxrender"] + targets = ["local"] + + def process(self, instance): + context = instance.context + filepath = context.data["currentFile"] + filename = os.path.basename(filepath) + comment = context.data.get("comment", "") + deadline_user = context.data.get("deadlineUser", getpass.getuser()) + jobname ="{0} - {1}".format(filename, instance.name) + + # StartFrame to EndFrame + frames = "{start}-{end}".format( + start=int(instance.data["frameStart"]), + end=int(instance.data["frameEnd"]) + ) + + payload = { + "JobInfo": { + # Top-level group name + "BatchName": filename, + + # Job name, as seen in Monitor + "Name": jobname, + + # Arbitrary username, for visualisation in Monitor + "UserName": deadline_user, + + "Plugin": instance.data["plugin"], + "Pool": instance.data.get("primaryPool"), + "secondaryPool": instance.data.get("secondaryPool"), + "Frames": frames, + "ChunkSize" : instance.data.get("chunkSize", 10), + "Comment": comment + }, + "PluginInfo": { + # Input + "SceneFile": instance.data["source"], + "Version": "2023", + "SaveFile" : True, + # Mandatory for Deadline + # Houdini version without patch number + + "IgnoreInputs": True + }, + + # Mandatory for Deadline, may be empty + "AuxFiles": [] + } + # Include critical environment variables with submission + api.Session + keys = [ + # Submit along the current Avalon tool setup that we launched + # this application with so the Render Slave can build its own + # similar environment using it, e.g. "maya2018;vray4.x;yeti3.1.9" + "AVALON_TOOLS", + "OPENPYPE_VERSION" + ] + # Add mongo url if it's enabled + if context.data.get("deadlinePassMongoUrl"): + keys.append("OPENPYPE_MONGO") + + environment = dict({key: os.environ[key] for key in keys + if key in os.environ}, **legacy_io.Session) + + payload["JobInfo"].update({ + "EnvironmentKeyValue%d" % index: "{key}={value}".format( + key=key, + value=environment[key] + ) for index, key in enumerate(environment) + }) + + # Include OutputFilename entries + # The first entry also enables double-click to preview rendered + # frames from Deadline Monitor + output_data = {} + # need to be fixed + for i, filepath in enumerate(instance.data["files"]): + dirname = os.path.dirname(filepath) + fname = os.path.basename(filepath) + output_data["OutputDirectory%d" % i] = dirname.replace("\\", "/") + output_data["OutputFilename%d" % i] = fname + + if not os.path.exists(dirname): + self.log.info("Ensuring output directory exists: %s" % + dirname) + os.makedirs(dirname) + + payload["JobInfo"].update(output_data) + + self.submit(instance, payload) + + def submit(self, instance, payload): + + context = instance.context + deadline_url = context.data.get("defaultDeadline") + deadline_url = instance.data.get( + "deadlineUrl", deadline_url) + + assert deadline_url, "Requires Deadline Webservice URL" + + plugin = payload["JobInfo"]["Plugin"] + self.log.info("Using Render Plugin : {}".format(plugin)) + + self.log.info("Submitting..") + self.log.debug(json.dumps(payload, indent=4, sort_keys=True)) + + # E.g. http://192.168.0.1:8082/api/jobs + url = "{}/api/jobs".format(deadline_url) + response = requests.post(url, json=payload, verify=False) + if not response.ok: + raise Exception(response.text) + # Store output dir for unified publisher (filesequence) + expected_files = instance.data["files"] + self.log.info("exp:{}".format(expected_files)) + output_dir = os.path.dirname(expected_files[0]) + instance.data["outputDir"] = output_dir + instance.data["deadlineSubmissionJob"] = response.json() diff --git a/openpype/settings/defaults/project_settings/max.json b/openpype/settings/defaults/project_settings/max.json new file mode 100644 index 0000000000..651a074a08 --- /dev/null +++ b/openpype/settings/defaults/project_settings/max.json @@ -0,0 +1,7 @@ +{ + "RenderSettings": { + "default_render_image_folder": "renders/max", + "aov_separator": "underscore", + "image_format": "exr" + } +} \ No newline at end of file diff --git a/openpype/settings/entities/schemas/projects_schema/schema_main.json b/openpype/settings/entities/schemas/projects_schema/schema_main.json index 0b9fbf7470..ebe59c7942 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_main.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_main.json @@ -82,6 +82,10 @@ "type": "schema", "name": "schema_project_slack" }, + { + "type": "schema", + "name": "schema_project_max" + }, { "type": "schema", "name": "schema_project_maya" diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_max.json b/openpype/settings/entities/schemas/projects_schema/schema_project_max.json new file mode 100644 index 0000000000..3d4cd5c54a --- /dev/null +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_max.json @@ -0,0 +1,52 @@ +{ + "type": "dict", + "collapsible": true, + "key": "max", + "label": "Max", + "is_file": true, + "children": [ + { + "type": "dict", + "collapsible": true, + "key": "RenderSettings", + "label": "Render Settings", + "children": [ + { + "type": "text", + "key": "default_render_image_folder", + "label": "Default render image folder" + }, + { + "key": "aov_separator", + "label": "AOV Separator character", + "type": "enum", + "multiselection": false, + "default": "underscore", + "enum_items": [ + {"dash": "- (dash)"}, + {"underscore": "_ (underscore)"}, + {"dot": ". (dot)"} + ] + }, + { + "key": "image_format", + "label": "Output Image Format", + "type": "enum", + "multiselection": false, + "defaults": "exr", + "enum_items": [ + {"avi": "avi"}, + {"bmp": "bmp"}, + {"exr": "exr"}, + {"tif": "tif"}, + {"tiff": "tiff"}, + {"jpg": "jpg"}, + {"png": "png"}, + {"tga": "tga"}, + {"dds": "dds"} + ] + } + ] + } + ] +} \ No newline at end of file From 1e5ec12070c36da7dc16c0eb2fbf0646424eb4ed Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 8 Feb 2023 22:23:47 +0800 Subject: [PATCH 145/912] hound fix --- openpype/hosts/max/api/lib.py | 6 ++---- openpype/hosts/max/api/lib_renderproducts.py | 15 +++++++++------ openpype/hosts/max/api/lib_rendersettings.py | 18 +++++++++--------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/openpype/hosts/max/api/lib.py b/openpype/hosts/max/api/lib.py index 8c421b2f9b..0477b43182 100644 --- a/openpype/hosts/max/api/lib.py +++ b/openpype/hosts/max/api/lib.py @@ -130,8 +130,7 @@ def get_current_renderer(): def get_default_render_folder(project_setting=None): return (project_setting["max"] ["RenderSettings"] - ["default_render_image_folder"] - ) + ["default_render_image_folder"]) def set_framerange(startFrame, endFrame): @@ -147,9 +146,8 @@ def set_framerange(startFrame, endFrame): 4 -User specified Frame pickup string (for example "1,3,5-12"). """ - # hard-code, there should be a custom setting for this + # hard-code, there should be a custom setting for this rt.rendTimeType = 4 if startFrame is not None and endFrame is not None: frameRange = "{0}-{1}".format(startFrame, endFrame) rt.rendPickupFrames = frameRange - diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index f3bb8bdad1..3b7767478d 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -34,7 +34,7 @@ class RenderProducts(object): startFrame = context["data"].get("frameStart") endFrame = context["data"].get("frameEnd") + 1 - img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"] + img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"] # noqa full_render_list = self.beauty_render_product(output_file, startFrame, endFrame, @@ -52,7 +52,7 @@ class RenderProducts(object): renderer == "V_Ray_GPU_6_Hotfix_3" or renderer == "Default_Scanline_Renderer" or renderer == "Quicksilver_Hardware_Renderer" - ): + ): render_elem_list = self.render_elements_product(output_file, startFrame, endFrame, @@ -64,13 +64,14 @@ class RenderProducts(object): if renderer == "Arnold": return full_render_list - def beauty_render_product(self, folder, startFrame, endFrame, fmt): # get the beauty beauty_frame_range = list() for f in range(startFrame, endFrame): - beauty = "{0}.{1}.{2}".format(folder, str(f), fmt) + beauty = "{0}.{1}.{2}".format(folder, + str(f), + fmt) beauty = beauty.replace("\\", "/") beauty_frame_range.append(beauty) @@ -83,7 +84,7 @@ class RenderProducts(object): render_elem = rt.maxOps.GetCurRenderElementMgr() render_elem_num = render_elem.NumRenderElements() - # get render elements from the renders + # get render elements from the renders for i in range(render_elem_num): renderlayer_name = render_elem.GetRenderElement(i) target, renderpass = str(renderlayer_name).split(":") @@ -91,7 +92,9 @@ class RenderProducts(object): render_dir = os.path.join(folder, renderpass) if renderlayer_name.enabled: for f in range(startFrame, endFrame): - render_element = "{0}.{1}.{2}".format(render_dir, str(f), fmt) + render_element = "{0}.{1}.{2}".format(render_dir, + str(f), + fmt) render_element = render_element.replace("\\", "/") render_dirname.append(render_element) diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index 8c8a82ae66..11dd005ad7 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -41,7 +41,6 @@ class RenderSettings(object): if not found: raise RuntimeError("Camera not found") - def set_renderoutput(self, container): folder = rt.maxFilePath # hard-coded, should be customized in the setting @@ -66,7 +65,7 @@ class RenderSettings(object): renderer_class = get_current_renderer() renderer = str(renderer_class).split(":")[0] - img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"] + img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"] # noqa output = os.path.join(output_dir, container) try: aov_separator = self._aov_chars[( @@ -77,7 +76,8 @@ class RenderSettings(object): except KeyError: aov_separator = "." outputFilename = "{0}.{1}".format(output, img_fmt) - outputFilename = outputFilename.replace("{aov_separator}", aov_separator) + outputFilename = outputFilename.replace("{aov_separator}", + aov_separator) rt.rendOutputFilename = outputFilename if renderer == "VUE_File_Renderer": return @@ -92,11 +92,10 @@ class RenderSettings(object): renderer == "V_Ray_GPU_6_Hotfix_3" or renderer == "Default_Scanline_Renderer" or renderer == "Quicksilver_Hardware_Renderer" - ): + ): self.render_element_layer(output, width, height, img_fmt) - rt.rendSaveFile= True - + rt.rendSaveFile = True def render_element_layer(self, dir, width, height, ext): """For Renderers with render elements""" @@ -115,11 +114,12 @@ class RenderSettings(object): try: aov_separator = self._aov_chars[( self._project_settings["maya"] - ["RenderSettings"] - ["aov_separator"] + ["RenderSettings"] + ["aov_separator"] )] except KeyError: aov_separator = "." - aov_name = aov_name.replace("{aov_separator}", aov_separator) + aov_name = aov_name.replace("{aov_separator}", + aov_separator) render_elem.SetRenderElementFileName(i, aov_name) From 0ea62e664f5f0c54c5593147f69ae6740e07380b Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 8 Feb 2023 22:29:28 +0800 Subject: [PATCH 146/912] hound fix --- openpype/hosts/max/api/lib_rendersettings.py | 6 +++--- openpype/hosts/max/plugins/publish/collect_render.py | 3 ++- .../deadline/plugins/publish/submit_3dmax_deadline.py | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index 11dd005ad7..90398e841c 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -35,9 +35,9 @@ class RenderSettings(object): # to avoid Attribute Error from pymxs wrapper found = False if rt.classOf(sel) in rt.Camera.classes: - found = True - rt.viewport.setCamera(sel) - break + found = True + rt.viewport.setCamera(sel) + break if not found: raise RuntimeError("Camera not found") diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py index fc44c01206..cda774bf11 100644 --- a/openpype/hosts/max/plugins/publish/collect_render.py +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -53,7 +53,8 @@ class CollectRender(pyblish.api.InstancePlugin): if renderer_name == "Arnold": plugin = "arnold" - # https://forums.autodesk.com/t5/3ds-max-programming/pymxs-quickrender-animation-range/td-p/11216183 + # https://forums.autodesk.com/t5/3ds-max-programming/ + # pymxs-quickrender-animation-range/td-p/11216183 data = { "subset": instance.name, diff --git a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py index 7e7173e4ce..faeb071524 100644 --- a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py @@ -27,7 +27,7 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): filename = os.path.basename(filepath) comment = context.data.get("comment", "") deadline_user = context.data.get("deadlineUser", getpass.getuser()) - jobname ="{0} - {1}".format(filename, instance.name) + jobname = "{0} - {1}".format(filename, instance.name) # StartFrame to EndFrame frames = "{start}-{end}".format( @@ -50,14 +50,14 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): "Pool": instance.data.get("primaryPool"), "secondaryPool": instance.data.get("secondaryPool"), "Frames": frames, - "ChunkSize" : instance.data.get("chunkSize", 10), + "ChunkSize": instance.data.get("chunkSize", 10), "Comment": comment }, "PluginInfo": { # Input "SceneFile": instance.data["source"], "Version": "2023", - "SaveFile" : True, + "SaveFile": True, # Mandatory for Deadline # Houdini version without patch number @@ -67,7 +67,7 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): # Mandatory for Deadline, may be empty "AuxFiles": [] } - # Include critical environment variables with submission + api.Session + # Include critical environment variables with submission + api.Session keys = [ # Submit along the current Avalon tool setup that we launched # this application with so the Render Slave can build its own From 6a55e2a9a3472214c077a66954ce50d1665b0bfa Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 8 Feb 2023 22:33:10 +0800 Subject: [PATCH 147/912] hound fix --- openpype/hosts/max/api/lib_renderproducts.py | 2 +- openpype/hosts/max/plugins/publish/collect_render.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index 3b7767478d..a7361a5a25 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -101,5 +101,5 @@ class RenderProducts(object): return render_dirname def image_format(self): - img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"] + img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"] # noqa return img_fmt diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py index cda774bf11..dd85afd586 100644 --- a/openpype/hosts/max/plugins/publish/collect_render.py +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -53,9 +53,6 @@ class CollectRender(pyblish.api.InstancePlugin): if renderer_name == "Arnold": plugin = "arnold" - # https://forums.autodesk.com/t5/3ds-max-programming/ - # pymxs-quickrender-animation-range/td-p/11216183 - data = { "subset": instance.name, "asset": asset, From abc4ecf59d938201478019fe1e9619a5600c9f70 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 16:22:22 +0800 Subject: [PATCH 148/912] hound fix --- openpype/hosts/max/api/lib_renderproducts.py | 3 +-- openpype/hosts/max/api/lib_rendersettings.py | 3 +-- openpype/hosts/max/plugins/publish/collect_render.py | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index a7361a5a25..ddc5d8111f 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -51,8 +51,7 @@ class RenderProducts(object): renderer == "V_Ray_6_Hotfix_3" or renderer == "V_Ray_GPU_6_Hotfix_3" or renderer == "Default_Scanline_Renderer" or - renderer == "Quicksilver_Hardware_Renderer" - ): + renderer == "Quicksilver_Hardware_Renderer"): render_elem_list = self.render_elements_product(output_file, startFrame, endFrame, diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index 90398e841c..aa523348dc 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -91,8 +91,7 @@ class RenderSettings(object): renderer == "V_Ray_6_Hotfix_3" or renderer == "V_Ray_GPU_6_Hotfix_3" or renderer == "Default_Scanline_Renderer" or - renderer == "Quicksilver_Hardware_Renderer" - ): + renderer == "Quicksilver_Hardware_Renderer"): self.render_element_layer(output, width, height, img_fmt) rt.rendSaveFile = True diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py index dd85afd586..549c784e56 100644 --- a/openpype/hosts/max/plugins/publish/collect_render.py +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -37,14 +37,12 @@ class CollectRender(pyblish.api.InstancePlugin): if ( renderer_name == "ART_Renderer" or renderer_name == "Default_Scanline_Renderer" or - renderer_name == "Quicksilver_Hardware_Renderer" - ): + renderer_name == "Quicksilver_Hardware_Renderer"): plugin = "3dsmax" if ( renderer_name == "V_Ray_6_Hotfix_3" or - renderer_name == "V_Ray_GPU_6_Hotfix_3" - ): + renderer_name == "V_Ray_GPU_6_Hotfix_3"): plugin = "Vray" if renderer_name == "Redshift Renderer": From 81b894ed13e5dc5d0743313f814ec9639f4d516a Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 16:24:20 +0800 Subject: [PATCH 149/912] hound fix --- openpype/hosts/max/api/lib_renderproducts.py | 3 +-- openpype/hosts/max/api/lib_rendersettings.py | 3 +-- openpype/hosts/max/plugins/publish/collect_render.py | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index ddc5d8111f..9becd2b5e5 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -45,8 +45,7 @@ class RenderProducts(object): if renderer == "VUE_File_Renderer": return full_render_list - if ( - renderer == "ART_Renderer" or + if (renderer == "ART_Renderer" or renderer == "Redshift Renderer" or renderer == "V_Ray_6_Hotfix_3" or renderer == "V_Ray_GPU_6_Hotfix_3" or diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index aa523348dc..176c797405 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -85,8 +85,7 @@ class RenderSettings(object): if renderer == "Arnold": return - if ( - renderer == "ART_Renderer" or + if (renderer == "ART_Renderer" or renderer == "Redshift Renderer" or renderer == "V_Ray_6_Hotfix_3" or renderer == "V_Ray_GPU_6_Hotfix_3" or diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py index 549c784e56..cd991b36eb 100644 --- a/openpype/hosts/max/plugins/publish/collect_render.py +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -34,14 +34,12 @@ class CollectRender(pyblish.api.InstancePlugin): renderer_class = get_current_renderer() renderer_name = str(renderer_class).split(":")[0] # setup the plugin as 3dsmax for the internal renderer - if ( - renderer_name == "ART_Renderer" or + if (renderer_name == "ART_Renderer" or renderer_name == "Default_Scanline_Renderer" or renderer_name == "Quicksilver_Hardware_Renderer"): plugin = "3dsmax" - if ( - renderer_name == "V_Ray_6_Hotfix_3" or + if (renderer_name == "V_Ray_6_Hotfix_3" or renderer_name == "V_Ray_GPU_6_Hotfix_3"): plugin = "Vray" From 8f016413d1075d027b863765e0a4595393b48ae8 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 16:26:30 +0800 Subject: [PATCH 150/912] hound fix --- openpype/hosts/max/plugins/publish/collect_render.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py index cd991b36eb..f5d99af63e 100644 --- a/openpype/hosts/max/plugins/publish/collect_render.py +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -34,9 +34,9 @@ class CollectRender(pyblish.api.InstancePlugin): renderer_class = get_current_renderer() renderer_name = str(renderer_class).split(":")[0] # setup the plugin as 3dsmax for the internal renderer - if (renderer_name == "ART_Renderer" or - renderer_name == "Default_Scanline_Renderer" or - renderer_name == "Quicksilver_Hardware_Renderer"): + if (renderer_name == "ART_Renderer" + or renderer_name == "Default_Scanline_Renderer" + or renderer_name == "Quicksilver_Hardware_Renderer"): plugin = "3dsmax" if (renderer_name == "V_Ray_6_Hotfix_3" or From 98d05db60b1ec4fbfa4e870bf471e5f3b4844063 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 16:29:26 +0800 Subject: [PATCH 151/912] hound fix --- openpype/hosts/max/api/lib_renderproducts.py | 12 ++++++------ openpype/hosts/max/api/lib_rendersettings.py | 12 ++++++------ openpype/hosts/max/plugins/publish/collect_render.py | 4 ++-- .../plugins/publish/submit_3dmax_deadline.py | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index 9becd2b5e5..fbd1f3d50e 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -45,12 +45,12 @@ class RenderProducts(object): if renderer == "VUE_File_Renderer": return full_render_list - if (renderer == "ART_Renderer" or - renderer == "Redshift Renderer" or - renderer == "V_Ray_6_Hotfix_3" or - renderer == "V_Ray_GPU_6_Hotfix_3" or - renderer == "Default_Scanline_Renderer" or - renderer == "Quicksilver_Hardware_Renderer"): + if (renderer == "ART_Renderer" + or renderer == "Redshift Renderer" + or renderer == "V_Ray_6_Hotfix_3" + or renderer == "V_Ray_GPU_6_Hotfix_3" + or renderer == "Default_Scanline_Renderer" + or renderer == "Quicksilver_Hardware_Renderer"): render_elem_list = self.render_elements_product(output_file, startFrame, endFrame, diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index 176c797405..c1e376746a 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -85,12 +85,12 @@ class RenderSettings(object): if renderer == "Arnold": return - if (renderer == "ART_Renderer" or - renderer == "Redshift Renderer" or - renderer == "V_Ray_6_Hotfix_3" or - renderer == "V_Ray_GPU_6_Hotfix_3" or - renderer == "Default_Scanline_Renderer" or - renderer == "Quicksilver_Hardware_Renderer"): + if (renderer == "ART_Renderer" + or renderer == "Redshift Renderer" + or renderer == "V_Ray_6_Hotfix_3" + or renderer == "V_Ray_GPU_6_Hotfix_3" + or renderer == "Default_Scanline_Renderer" + or renderer == "Quicksilver_Hardware_Renderer"): self.render_element_layer(output, width, height, img_fmt) rt.rendSaveFile = True diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py index f5d99af63e..c4b8ac4985 100644 --- a/openpype/hosts/max/plugins/publish/collect_render.py +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -39,8 +39,8 @@ class CollectRender(pyblish.api.InstancePlugin): or renderer_name == "Quicksilver_Hardware_Renderer"): plugin = "3dsmax" - if (renderer_name == "V_Ray_6_Hotfix_3" or - renderer_name == "V_Ray_GPU_6_Hotfix_3"): + if (renderer_name == "V_Ray_6_Hotfix_3" + or renderer_name == "V_Ray_GPU_6_Hotfix_3"): plugin = "Vray" if renderer_name == "Redshift Renderer": diff --git a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py index faeb071524..88834e4a91 100644 --- a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py @@ -126,7 +126,7 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): # E.g. http://192.168.0.1:8082/api/jobs url = "{}/api/jobs".format(deadline_url) - response = requests.post(url, json=payload, verify=False) + response = requests.post(url, json=payload) if not response.ok: raise Exception(response.text) # Store output dir for unified publisher (filesequence) From fe7b6fbd315fcc7b13803ee7944ce37f46c9051c Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 16:43:53 +0800 Subject: [PATCH 152/912] hound fix --- openpype/hosts/max/api/lib_renderproducts.py | 14 ++++++++------ openpype/hosts/max/api/lib_rendersettings.py | 14 ++++++++------ .../hosts/max/plugins/publish/collect_render.py | 14 +++++++++----- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index fbd1f3d50e..4ba92f06bd 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -45,12 +45,14 @@ class RenderProducts(object): if renderer == "VUE_File_Renderer": return full_render_list - if (renderer == "ART_Renderer" - or renderer == "Redshift Renderer" - or renderer == "V_Ray_6_Hotfix_3" - or renderer == "V_Ray_GPU_6_Hotfix_3" - or renderer == "Default_Scanline_Renderer" - or renderer == "Quicksilver_Hardware_Renderer"): + if ( + renderer == "ART_Renderer" or + renderer == "Redshift Renderer" or + renderer == "V_Ray_6_Hotfix_3" or + renderer == "V_Ray_GPU_6_Hotfix_3" or + renderer == "Default_Scanline_Renderer" or + renderer == "Quicksilver_Hardware_Renderer"\ + ): render_elem_list = self.render_elements_product(output_file, startFrame, endFrame, diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index c1e376746a..ef8ad6bdc5 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -85,12 +85,14 @@ class RenderSettings(object): if renderer == "Arnold": return - if (renderer == "ART_Renderer" - or renderer == "Redshift Renderer" - or renderer == "V_Ray_6_Hotfix_3" - or renderer == "V_Ray_GPU_6_Hotfix_3" - or renderer == "Default_Scanline_Renderer" - or renderer == "Quicksilver_Hardware_Renderer"): + if ( + renderer == "ART_Renderer" or + renderer == "Redshift Renderer" or + renderer == "V_Ray_6_Hotfix_3" or + renderer == "V_Ray_GPU_6_Hotfix_3" or + renderer == "Default_Scanline_Renderer" or + renderer == "Quicksilver_Hardware_Renderer" + ): self.render_element_layer(output, width, height, img_fmt) rt.rendSaveFile = True diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py index c4b8ac4985..59a1450691 100644 --- a/openpype/hosts/max/plugins/publish/collect_render.py +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -34,13 +34,17 @@ class CollectRender(pyblish.api.InstancePlugin): renderer_class = get_current_renderer() renderer_name = str(renderer_class).split(":")[0] # setup the plugin as 3dsmax for the internal renderer - if (renderer_name == "ART_Renderer" - or renderer_name == "Default_Scanline_Renderer" - or renderer_name == "Quicksilver_Hardware_Renderer"): + if ( + renderer_name == "ART_Renderer" or + renderer_name == "Default_Scanline_Renderer" or + renderer_name == "Quicksilver_Hardware_Renderer" + ): plugin = "3dsmax" - if (renderer_name == "V_Ray_6_Hotfix_3" - or renderer_name == "V_Ray_GPU_6_Hotfix_3"): + if ( + renderer_name == "V_Ray_6_Hotfix_3" or + renderer_name == "V_Ray_GPU_6_Hotfix_3" + ): plugin = "Vray" if renderer_name == "Redshift Renderer": From 07e14442b172a23a7c019be10a135333526d9ee2 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 16:44:41 +0800 Subject: [PATCH 153/912] hound fix --- openpype/hosts/max/api/lib_renderproducts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index 4ba92f06bd..44efed2c36 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -51,7 +51,7 @@ class RenderProducts(object): renderer == "V_Ray_6_Hotfix_3" or renderer == "V_Ray_GPU_6_Hotfix_3" or renderer == "Default_Scanline_Renderer" or - renderer == "Quicksilver_Hardware_Renderer"\ + renderer == "Quicksilver_Hardware_Renderer" ): render_elem_list = self.render_elements_product(output_file, startFrame, From c54ead7ad2b2110d7a4786e986002dd8de270cf5 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 18:37:37 +0800 Subject: [PATCH 154/912] add arnold camera and add 3dmax as renderer --- openpype/hosts/max/api/lib_rendersettings.py | 14 ++++++++++++- .../max/plugins/publish/collect_render.py | 21 +------------------ .../projects_schema/schema_project_max.json | 1 - 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index ef8ad6bdc5..db4e53720e 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -83,7 +83,7 @@ class RenderSettings(object): return # TODO: Finish the arnold render setup if renderer == "Arnold": - return + self.arnold_setup() if ( renderer == "ART_Renderer" or @@ -97,6 +97,18 @@ class RenderSettings(object): rt.rendSaveFile = True + def arnold_setup(self): + # get Arnold RenderView run in the background + # for setting up renderable camera + arv = rt.MAXToAOps.ArnoldRenderView() + render_camera = rt.viewport.GetCamera() + arv.setOption("Camera", str(render_camera)) + + aovmgr = rt.renderers.current.AOVManager + aovmgr.drivers = "#()" + + arv.close() + def render_element_layer(self, dir, width, height, ext): """For Renderers with render elements""" rt.renderWidth = width diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py index 59a1450691..ce8d62e089 100644 --- a/openpype/hosts/max/plugins/publish/collect_render.py +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -34,25 +34,6 @@ class CollectRender(pyblish.api.InstancePlugin): renderer_class = get_current_renderer() renderer_name = str(renderer_class).split(":")[0] # setup the plugin as 3dsmax for the internal renderer - if ( - renderer_name == "ART_Renderer" or - renderer_name == "Default_Scanline_Renderer" or - renderer_name == "Quicksilver_Hardware_Renderer" - ): - plugin = "3dsmax" - - if ( - renderer_name == "V_Ray_6_Hotfix_3" or - renderer_name == "V_Ray_GPU_6_Hotfix_3" - ): - plugin = "Vray" - - if renderer_name == "Redshift Renderer": - plugin = "redshift" - - if renderer_name == "Arnold": - plugin = "arnold" - data = { "subset": instance.name, "asset": asset, @@ -62,7 +43,7 @@ class CollectRender(pyblish.api.InstancePlugin): "families": ['maxrender'], "source": filepath, "files": render_layer_files, - "plugin": plugin, + "plugin": "3dsmax", "frameStart": context.data['frameStart'], "frameEnd": context.data['frameEnd'] } diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_max.json b/openpype/settings/entities/schemas/projects_schema/schema_project_max.json index 3d4cd5c54a..fbd9358c74 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_max.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_max.json @@ -35,7 +35,6 @@ "multiselection": false, "defaults": "exr", "enum_items": [ - {"avi": "avi"}, {"bmp": "bmp"}, {"exr": "exr"}, {"tif": "tif"}, From 819148cfc059fb852b28c96d721dffbbf25dc995 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 18:38:42 +0800 Subject: [PATCH 155/912] remove unused variable --- openpype/hosts/max/plugins/publish/collect_render.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py index ce8d62e089..d8b0312d43 100644 --- a/openpype/hosts/max/plugins/publish/collect_render.py +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -31,8 +31,6 @@ class CollectRender(pyblish.api.InstancePlugin): folder = folder.replace("\\", "/") imgFormat = RenderProducts().image_format() - renderer_class = get_current_renderer() - renderer_name = str(renderer_class).split(":")[0] # setup the plugin as 3dsmax for the internal renderer data = { "subset": instance.name, From 1b1f92ba5a74c5c2dac1c941df33ae61903ec3f5 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 18:39:42 +0800 Subject: [PATCH 156/912] remove unused variable --- openpype/hosts/max/plugins/publish/collect_render.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py index d8b0312d43..857ac88ea6 100644 --- a/openpype/hosts/max/plugins/publish/collect_render.py +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -5,7 +5,6 @@ import pyblish.api from pymxs import runtime as rt from openpype.pipeline import legacy_io -from openpype.hosts.max.api.lib import get_current_renderer from openpype.hosts.max.api.lib_renderproducts import RenderProducts From e1aff812525d8d2bd4aa0308e68db68994ade388 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 18:56:37 +0800 Subject: [PATCH 157/912] correct separator issue in naming convention --- openpype/hosts/max/api/lib_rendersettings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index db4e53720e..8f7e91822c 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -75,7 +75,7 @@ class RenderSettings(object): )] except KeyError: aov_separator = "." - outputFilename = "{0}.{1}".format(output, img_fmt) + outputFilename = "{0}..{1}".format(output, img_fmt) outputFilename = outputFilename.replace("{aov_separator}", aov_separator) rt.rendOutputFilename = outputFilename @@ -122,7 +122,7 @@ class RenderSettings(object): renderlayer_name = render_elem.GetRenderElement(i) target, renderpass = str(renderlayer_name).split(":") render_element = os.path.join(dir, renderpass) - aov_name = "{0}.{1}".format(render_element, ext) + aov_name = "{0}..{1}".format(render_element, ext) try: aov_separator = self._aov_chars[( self._project_settings["maya"] From 31424672aa22d08629e87f49dfadcdd2a8ba3e19 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 18:59:35 +0800 Subject: [PATCH 158/912] correct separator issue in naming convention --- openpype/hosts/max/api/lib_renderproducts.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index 44efed2c36..fd0eb947af 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -92,9 +92,10 @@ class RenderProducts(object): render_dir = os.path.join(folder, renderpass) if renderlayer_name.enabled: for f in range(startFrame, endFrame): - render_element = "{0}.{1}.{2}".format(render_dir, - str(f), - fmt) + render_element = "{0}_{1}..{2}.{2}".format(folder, + renderpass, + str(f), + fmt) render_element = render_element.replace("\\", "/") render_dirname.append(render_element) From 536cbd2913d89b64acc8b41b58bd77efeefb51c4 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 18:59:58 +0800 Subject: [PATCH 159/912] correct separator issue in naming convention --- openpype/hosts/max/api/lib_renderproducts.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index fd0eb947af..83b5a0bc35 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -89,7 +89,6 @@ class RenderProducts(object): renderlayer_name = render_elem.GetRenderElement(i) target, renderpass = str(renderlayer_name).split(":") - render_dir = os.path.join(folder, renderpass) if renderlayer_name.enabled: for f in range(startFrame, endFrame): render_element = "{0}_{1}..{2}.{2}".format(folder, From 4bd05046236759e6209a256af639ee943e091406 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 19:00:23 +0800 Subject: [PATCH 160/912] correct separator issue in naming convention --- openpype/hosts/max/api/lib_renderproducts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index 83b5a0bc35..a924505d7e 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -91,7 +91,7 @@ class RenderProducts(object): if renderlayer_name.enabled: for f in range(startFrame, endFrame): - render_element = "{0}_{1}..{2}.{2}".format(folder, + render_element = "{0}_{1}..{2}.{3}".format(folder, renderpass, str(f), fmt) From 0a7d7e45638987a53ac35c2dd9c69d38cfe9855e Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 19:04:28 +0800 Subject: [PATCH 161/912] correct separator issue in naming convention --- openpype/hosts/max/api/lib_renderproducts.py | 2 +- openpype/hosts/max/api/lib_rendersettings.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index a924505d7e..4c9c9b8088 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -91,7 +91,7 @@ class RenderProducts(object): if renderlayer_name.enabled: for f in range(startFrame, endFrame): - render_element = "{0}_{1}..{2}.{3}".format(folder, + render_element = "{0}_{1}.{2}.{3}".format(folder, renderpass, str(f), fmt) diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index 8f7e91822c..30a252e07a 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -121,8 +121,7 @@ class RenderSettings(object): for i in range(render_elem_num): renderlayer_name = render_elem.GetRenderElement(i) target, renderpass = str(renderlayer_name).split(":") - render_element = os.path.join(dir, renderpass) - aov_name = "{0}..{1}".format(render_element, ext) + aov_name = "{0}_{1}..{2}".format(dir, renderpass, ext) try: aov_separator = self._aov_chars[( self._project_settings["maya"] From a3bc0e6debfe0e0e1dabff1bba543b30af738e65 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 19:54:14 +0800 Subject: [PATCH 162/912] update aov naming convention --- openpype/hosts/max/api/lib_renderproducts.py | 9 ++++----- openpype/hosts/max/api/lib_rendersettings.py | 15 +++------------ 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index 4c9c9b8088..84cb0c1744 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -88,13 +88,12 @@ class RenderProducts(object): for i in range(render_elem_num): renderlayer_name = render_elem.GetRenderElement(i) target, renderpass = str(renderlayer_name).split(":") - + render_element = os.path.join(dir, renderpass) if renderlayer_name.enabled: for f in range(startFrame, endFrame): - render_element = "{0}_{1}.{2}.{3}".format(folder, - renderpass, - str(f), - fmt) + render_element = "{0}.{1}.{2}".format(render_element, + str(f), + fmt) render_element = render_element.replace("\\", "/") render_dirname.append(render_element) diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index 30a252e07a..1188d77e29 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -121,16 +121,7 @@ class RenderSettings(object): for i in range(render_elem_num): renderlayer_name = render_elem.GetRenderElement(i) target, renderpass = str(renderlayer_name).split(":") - aov_name = "{0}_{1}..{2}".format(dir, renderpass, ext) - try: - aov_separator = self._aov_chars[( - self._project_settings["maya"] - ["RenderSettings"] - ["aov_separator"] - )] - except KeyError: - aov_separator = "." - - aov_name = aov_name.replace("{aov_separator}", - aov_separator) + render_element = os.path.join(dir, renderpass) + dir = dir.replace(".", " ") + aov_name = "{0}..{1}".format(render_element, ext) render_elem.SetRenderElementFileName(i, aov_name) From 189a842660436b23f67de81a1548683ca3b066f5 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 19:55:22 +0800 Subject: [PATCH 163/912] update aov naming convention --- openpype/hosts/max/api/lib_renderproducts.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index 84cb0c1744..912c0c89d7 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -88,12 +88,12 @@ class RenderProducts(object): for i in range(render_elem_num): renderlayer_name = render_elem.GetRenderElement(i) target, renderpass = str(renderlayer_name).split(":") - render_element = os.path.join(dir, renderpass) + render_name = os.path.join(dir, renderpass) if renderlayer_name.enabled: for f in range(startFrame, endFrame): - render_element = "{0}.{1}.{2}".format(render_element, - str(f), - fmt) + render_element = "{0}.{1}.{2}".format(render_name, + str(f), + fmt) render_element = render_element.replace("\\", "/") render_dirname.append(render_element) From 0d2b6da3ef7e012d00b938a9b47609e66bb928e5 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 20:02:28 +0800 Subject: [PATCH 164/912] update aov naming convention --- openpype/hosts/max/api/lib_renderproducts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index 912c0c89d7..5f96b13273 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -88,7 +88,7 @@ class RenderProducts(object): for i in range(render_elem_num): renderlayer_name = render_elem.GetRenderElement(i) target, renderpass = str(renderlayer_name).split(":") - render_name = os.path.join(dir, renderpass) + render_name = os.path.join(folder, renderpass) if renderlayer_name.enabled: for f in range(startFrame, endFrame): render_element = "{0}.{1}.{2}".format(render_name, From be573252486287a04dc37a5d0daa6edb13fb8ce5 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 20:22:19 +0800 Subject: [PATCH 165/912] update aov naming convention --- openpype/hosts/max/api/lib_renderproducts.py | 8 ++++---- openpype/hosts/max/api/lib_rendersettings.py | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index 5f96b13273..e3cccff982 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -88,12 +88,12 @@ class RenderProducts(object): for i in range(render_elem_num): renderlayer_name = render_elem.GetRenderElement(i) target, renderpass = str(renderlayer_name).split(":") - render_name = os.path.join(folder, renderpass) if renderlayer_name.enabled: for f in range(startFrame, endFrame): - render_element = "{0}.{1}.{2}".format(render_name, - str(f), - fmt) + render_element = "{0}_{1}.{2}.{3}".format(folder, + renderpass, + str(f), + fmt) render_element = render_element.replace("\\", "/") render_dirname.append(render_element) diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index 1188d77e29..6d2aa678b7 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -122,6 +122,5 @@ class RenderSettings(object): renderlayer_name = render_elem.GetRenderElement(i) target, renderpass = str(renderlayer_name).split(":") render_element = os.path.join(dir, renderpass) - dir = dir.replace(".", " ") aov_name = "{0}..{1}".format(render_element, ext) render_elem.SetRenderElementFileName(i, aov_name) From 9ba3d144f381d62127c90542d280ad80c0306b18 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 9 Feb 2023 20:24:03 +0800 Subject: [PATCH 166/912] update aov naming convention --- openpype/hosts/max/api/lib_rendersettings.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index 6d2aa678b7..2324d743eb 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -121,6 +121,5 @@ class RenderSettings(object): for i in range(render_elem_num): renderlayer_name = render_elem.GetRenderElement(i) target, renderpass = str(renderlayer_name).split(":") - render_element = os.path.join(dir, renderpass) - aov_name = "{0}..{1}".format(render_element, ext) + aov_name = "{0}_{1}..{2}".format(dir, renderpass, ext) render_elem.SetRenderElementFileName(i, aov_name) From 684c759f516d987e3e59a84584bd295869d02fcc Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 9 Feb 2023 18:32:52 +0000 Subject: [PATCH 167/912] Fix capturing from wrong camera. --- .../maya/plugins/publish/extract_playblast.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/extract_playblast.py b/openpype/hosts/maya/plugins/publish/extract_playblast.py index e4e44e4770..0140850dc9 100644 --- a/openpype/hosts/maya/plugins/publish/extract_playblast.py +++ b/openpype/hosts/maya/plugins/publish/extract_playblast.py @@ -1,4 +1,5 @@ import os +import json import clique import capture @@ -44,10 +45,6 @@ class ExtractPlayblast(publish.Extractor): # get cameras camera = instance.data['review_camera'] - override_viewport_options = ( - self.capture_preset['Viewport Options'] - ['override_viewport_options'] - ) preset = lib.load_capture_preset(data=self.capture_preset) # Grab capture presets from the project settings capture_presets = self.capture_preset @@ -119,6 +116,9 @@ class ExtractPlayblast(publish.Extractor): pan_zoom = cmds.getAttr("{}.panZoomEnabled".format(preset["camera"])) cmds.setAttr("{}.panZoomEnabled".format(preset["camera"]), False) + override_viewport_options = ( + capture_presets['Viewport Options']['override_viewport_options'] + ) with lib.maintained_time(): filename = preset.get("filename", "%TEMP%") @@ -127,16 +127,21 @@ class ExtractPlayblast(publish.Extractor): # playblast and viewer preset['viewer'] = False - self.log.info('using viewport preset: {}'.format(preset)) - # Update preset with current panel setting # if override_viewport_options is turned off panel = cmds.getPanel(withFocus=True) or "" if not override_viewport_options and "modelPanel" in panel: panel_preset = capture.parse_active_view() + panel_preset.pop("camera") preset.update(panel_preset) cmds.setFocus(panel) + self.log.info( + "Using preset:\n{}".format( + json.dumps(preset, sort_keys=True, indent=4) + ) + ) + path = capture.capture(log=self.log, **preset) cmds.setAttr("{}.panZoomEnabled".format(preset["camera"]), pan_zoom) From 88bda4e1f6bfbe628d80edc76789393dcc9a68a4 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 10 Feb 2023 14:24:28 +0100 Subject: [PATCH 168/912] TVPaint host inherit from IPublishHost --- openpype/hosts/tvpaint/api/pipeline.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/tvpaint/api/pipeline.py b/openpype/hosts/tvpaint/api/pipeline.py index 249326791b..bd6b929f6b 100644 --- a/openpype/hosts/tvpaint/api/pipeline.py +++ b/openpype/hosts/tvpaint/api/pipeline.py @@ -8,7 +8,7 @@ import requests import pyblish.api from openpype.client import get_project, get_asset_by_name -from openpype.host import HostBase, IWorkfileHost, ILoadHost +from openpype.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost from openpype.hosts.tvpaint import TVPAINT_ROOT_DIR from openpype.settings import get_current_project_settings from openpype.lib import register_event_callback @@ -58,7 +58,7 @@ instances=2 """ -class TVPaintHost(HostBase, IWorkfileHost, ILoadHost): +class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): name = "tvpaint" def install(self): From 2c0f057a913b9a891f40ffed06959749b90eaae5 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 10 Feb 2023 14:25:59 +0100 Subject: [PATCH 169/912] implemented methods for context data --- openpype/hosts/tvpaint/api/pipeline.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/openpype/hosts/tvpaint/api/pipeline.py b/openpype/hosts/tvpaint/api/pipeline.py index bd6b929f6b..7ab660137a 100644 --- a/openpype/hosts/tvpaint/api/pipeline.py +++ b/openpype/hosts/tvpaint/api/pipeline.py @@ -29,6 +29,7 @@ log = logging.getLogger(__name__) METADATA_SECTION = "avalon" SECTION_NAME_CONTEXT = "context" +SECTION_NAME_CREATE_CONTEXT = "create_context" SECTION_NAME_INSTANCES = "instances" SECTION_NAME_CONTAINERS = "containers" # Maximum length of metadata chunk string @@ -93,6 +94,14 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): register_event_callback("application.launched", self.initial_launch) register_event_callback("application.exit", self.application_exit) + + # --- Create --- + def get_context_data(self): + return get_workfile_metadata(SECTION_NAME_CREATE_CONTEXT, {}) + + def update_context_data(self, data, changes): + return write_workfile_metadata(SECTION_NAME_CREATE_CONTEXT, data) + def open_workfile(self, filepath): george_script = "tv_LoadProject '\"'\"{}\"'\"'".format( filepath.replace("\\", "/") From 85afe4f53ba31678e0d35bbd675c114d7e133b96 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 10 Feb 2023 14:27:22 +0100 Subject: [PATCH 170/912] cleanup of methods --- openpype/hosts/tvpaint/api/pipeline.py | 60 ++++++++++++++------------ 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/openpype/hosts/tvpaint/api/pipeline.py b/openpype/hosts/tvpaint/api/pipeline.py index 7ab660137a..38d3922f3b 100644 --- a/openpype/hosts/tvpaint/api/pipeline.py +++ b/openpype/hosts/tvpaint/api/pipeline.py @@ -102,6 +102,35 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): def update_context_data(self, data, changes): return write_workfile_metadata(SECTION_NAME_CREATE_CONTEXT, data) + def list_instances(self): + """List all created instances from current workfile.""" + return list_instances() + + def write_instances(self, data): + return write_instances(data) + + # --- Legacy Create --- + def remove_instance(self, instance): + """Remove instance from current workfile metadata. + + Implementation for Subset manager tool. + """ + + current_instances = get_workfile_metadata(SECTION_NAME_INSTANCES) + instance_id = instance.get("uuid") + found_idx = None + if instance_id: + for idx, _inst in enumerate(current_instances): + if _inst["uuid"] == instance_id: + found_idx = idx + break + + if found_idx is None: + return + current_instances.pop(found_idx) + write_instances(current_instances) + + # --- Workfile --- def open_workfile(self, filepath): george_script = "tv_LoadProject '\"'\"{}\"'\"'".format( filepath.replace("\\", "/") @@ -134,6 +163,7 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): def get_workfile_extensions(self): return [".tvpp"] + # --- Load --- def get_containers(self): return get_containers() @@ -148,26 +178,6 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): log.info("Setting up project...") set_context_settings() - def remove_instance(self, instance): - """Remove instance from current workfile metadata. - - Implementation for Subset manager tool. - """ - - current_instances = get_workfile_metadata(SECTION_NAME_INSTANCES) - instance_id = instance.get("uuid") - found_idx = None - if instance_id: - for idx, _inst in enumerate(current_instances): - if _inst["uuid"] == instance_id: - found_idx = idx - break - - if found_idx is None: - return - current_instances.pop(found_idx) - write_instances(current_instances) - def application_exit(self): """Logic related to TimerManager. @@ -186,6 +196,7 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): rest_api_url = "{}/timers_manager/stop_timer".format(webserver_url) requests.post(rest_api_url) + # --- Legacy Publish --- def on_instance_toggle(self, instance, old_value, new_value): """Update instance data in workfile on publish toggle.""" # Review may not have real instance in wokrfile metadata @@ -196,7 +207,7 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): found_idx = None current_instances = list_instances() for idx, workfile_instance in enumerate(current_instances): - if workfile_instance["uuid"] == instance_id: + if workfile_instance.get("uuid") == instance_id: found_idx = idx break @@ -207,13 +218,6 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): current_instances[found_idx]["active"] = new_value self.write_instances(current_instances) - def list_instances(self): - """List all created instances from current workfile.""" - return list_instances() - - def write_instances(self, data): - return write_instances(data) - def containerise( name, namespace, members, context, loader, current_containers=None From a17f46486405efe859b626e1633bc4666ac2b709 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 10 Feb 2023 14:28:13 +0100 Subject: [PATCH 171/912] implement custom context methods --- openpype/hosts/tvpaint/api/pipeline.py | 35 ++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/openpype/hosts/tvpaint/api/pipeline.py b/openpype/hosts/tvpaint/api/pipeline.py index 38d3922f3b..85ade41b9b 100644 --- a/openpype/hosts/tvpaint/api/pipeline.py +++ b/openpype/hosts/tvpaint/api/pipeline.py @@ -18,6 +18,7 @@ from openpype.pipeline import ( register_creator_plugin_path, AVALON_CONTAINER_ID, ) +from openpype.pipeline.context_tools import get_global_context from .lib import ( execute_george, @@ -94,6 +95,40 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): register_event_callback("application.launched", self.initial_launch) register_event_callback("application.exit", self.application_exit) + def get_current_project_name(self): + """ + Returns: + Union[str, None]: Current project name. + """ + + return self.get_current_context().get("project_name") + + def get_current_asset_name(self): + """ + Returns: + Union[str, None]: Current asset name. + """ + + return self.get_current_context().get("asset_name") + + def get_current_task_name(self): + """ + Returns: + Union[str, None]: Current task name. + """ + + return self.get_current_context().get("task_name") + + def get_current_context(self): + context = get_current_workfile_context() + if not context: + return get_global_context() + + return { + "project_name": context["project"], + "asset_name": context.get("asset"), + "task_name": context.get("task") + } # --- Create --- def get_context_data(self): From 65e7717b6c9bc64f5a832125340bcba0aed50981 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 10 Feb 2023 14:28:25 +0100 Subject: [PATCH 172/912] use 'get_global_context' on workfile save --- openpype/hosts/tvpaint/api/pipeline.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/openpype/hosts/tvpaint/api/pipeline.py b/openpype/hosts/tvpaint/api/pipeline.py index 85ade41b9b..6a729e39c3 100644 --- a/openpype/hosts/tvpaint/api/pipeline.py +++ b/openpype/hosts/tvpaint/api/pipeline.py @@ -175,11 +175,7 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): def save_workfile(self, filepath=None): if not filepath: filepath = self.get_current_workfile() - context = { - "project": legacy_io.Session["AVALON_PROJECT"], - "asset": legacy_io.Session["AVALON_ASSET"], - "task": legacy_io.Session["AVALON_TASK"] - } + context = get_global_context() save_current_workfile_context(context) # Execute george script to save workfile. From b9f22cf2bec8f93d673a3aba9a1cbfd264da69f0 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 10 Feb 2023 14:28:45 +0100 Subject: [PATCH 173/912] removed unused method --- openpype/hosts/tvpaint/api/plugin.py | 31 ---------------------------- 1 file changed, 31 deletions(-) diff --git a/openpype/hosts/tvpaint/api/plugin.py b/openpype/hosts/tvpaint/api/plugin.py index da456e7067..c7feccd125 100644 --- a/openpype/hosts/tvpaint/api/plugin.py +++ b/openpype/hosts/tvpaint/api/plugin.py @@ -32,37 +32,6 @@ class Creator(LegacyCreator): dynamic_data["task"] = task_name return dynamic_data - @staticmethod - def are_instances_same(instance_1, instance_2): - """Compare instances but skip keys with unique values. - - During compare are skipped keys that will be 100% sure - different on new instance, like "id". - - Returns: - bool: True if instances are same. - """ - if ( - not isinstance(instance_1, dict) - or not isinstance(instance_2, dict) - ): - return instance_1 == instance_2 - - checked_keys = set() - checked_keys.add("id") - for key, value in instance_1.items(): - if key not in checked_keys: - if key not in instance_2: - return False - if value != instance_2[key]: - return False - checked_keys.add(key) - - for key in instance_2.keys(): - if key not in checked_keys: - return False - return True - def write_instances(self, data): self.log.debug( "Storing instance data to workfile. {}".format(str(data)) From 1cb7c37b9ef51066d2a2c3cc3b243d058303397f Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 10 Feb 2023 14:29:02 +0100 Subject: [PATCH 174/912] implemented base creators for tvpaint --- openpype/hosts/tvpaint/api/plugin.py | 125 +++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/openpype/hosts/tvpaint/api/plugin.py b/openpype/hosts/tvpaint/api/plugin.py index c7feccd125..e6fc087665 100644 --- a/openpype/hosts/tvpaint/api/plugin.py +++ b/openpype/hosts/tvpaint/api/plugin.py @@ -6,11 +6,136 @@ from openpype.pipeline import ( LoaderPlugin, registered_host, ) +from openpype.pipeline.create import ( + CreatedInstance, + get_subset_name, + AutoCreator, + Creator as NewCreator, +) +from openpype.pipeline.create.creator_plugins import cache_and_get_instances from .lib import get_layers_data from .pipeline import get_current_workfile_context +SHARED_DATA_KEY = "openpype.tvpaint.instances" + + +def _collect_instances(creator): + instances_by_identifier = cache_and_get_instances( + creator, SHARED_DATA_KEY, creator.host.list_instances + ) + for instance_data in instances_by_identifier[creator.identifier]: + instance = CreatedInstance.from_existing(instance_data, creator) + creator._add_instance_to_context(instance) + + +def _update_instances(creator, update_list): + if not update_list: + return + + cur_instances = creator.host.list_instances() + cur_instances_by_id = {} + for instance_data in cur_instances: + instance_id = instance_data.get("instance_id") + if instance_id: + cur_instances_by_id[instance_id] = instance_data + + for instance, changes in update_list: + instance_data = instance.data_to_store() + cur_instance_data = cur_instances_by_id.get(instance.id) + if cur_instance_data is None: + cur_instances.append(instance_data) + continue + for key in set(cur_instance_data) - set(instance_data): + instance_data.pop(key) + instance_data.update(cur_instance_data) + creator.host.write_instances(cur_instances) + + +class TVPaintCreator(NewCreator): + @property + def subset_template_family(self): + return self.family + + def collect_instances(self): + _collect_instances(self) + + def update_instances(self, update_list): + _update_instances(self, update_list) + + def remove_instances(self, instances): + ids_to_remove = { + instance.id + for instance in instances + } + cur_instances = self.host.list_instances() + changed = False + new_instances = [] + for instance_data in cur_instances: + if instance_data.get("instance_id") in ids_to_remove: + changed = True + else: + new_instances.append(instance_data) + + if changed: + self.host.write_instances(new_instances) + + for instance in instances: + self._remove_instance_from_context(instance) + + def get_dynamic_data(self, *args, **kwargs): + # Change asset and name by current workfile context + # TODO use context from 'create_context' + workfile_context = self.host.get_current_context() + asset_name = workfile_context.get("asset") + task_name = workfile_context.get("task") + output = {} + if asset_name: + output["asset"] = asset_name + if task_name: + output["task"] = task_name + return output + + def get_subset_name( + self, + variant, + task_name, + asset_doc, + project_name, + host_name=None, + instance=None + ): + dynamic_data = self.get_dynamic_data( + variant, task_name, asset_doc, project_name, host_name, instance + ) + + return get_subset_name( + self.subset_template_family, + variant, + task_name, + asset_doc, + project_name, + host_name, + dynamic_data=dynamic_data, + project_settings=self.project_settings + ) + + def _store_new_instance(self, new_instance): + instances_data = self.host.list_instances() + instances_data.append(new_instance.data_to_store()) + self.host.write_instances(instances_data) + self._add_instance_to_context(new_instance) + + +class TVPaintAutoCreator(AutoCreator): + def collect_instances(self): + _collect_instances(self) + + def update_instances(self, update_list): + _update_instances(self, update_list) + + class Creator(LegacyCreator): def __init__(self, *args, **kwargs): super(Creator, self).__init__(*args, **kwargs) From f984dd8fc5381dd901d69bca6fef5c234ffae1c5 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 10 Feb 2023 14:29:15 +0100 Subject: [PATCH 175/912] implemented workfile autocreator --- .../tvpaint/plugins/create/create_workfile.py | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 openpype/hosts/tvpaint/plugins/create/create_workfile.py diff --git a/openpype/hosts/tvpaint/plugins/create/create_workfile.py b/openpype/hosts/tvpaint/plugins/create/create_workfile.py new file mode 100644 index 0000000000..3e5cd86852 --- /dev/null +++ b/openpype/hosts/tvpaint/plugins/create/create_workfile.py @@ -0,0 +1,63 @@ +from openpype.client import get_asset_by_name +from openpype.pipeline import CreatedInstance +from openpype.hosts.tvpaint.api.plugin import TVPaintAutoCreator + + +class TVPaintWorkfileCreator(TVPaintAutoCreator): + family = "workfile" + identifier = "workfile" + + default_variant = "Main" + + def create(self): + existing_instance = None + for instance in self.create_context.instances: + if instance.creator_identifier == self.identifier: + existing_instance = instance + break + + context = self.host.get_current_context() + host_name = self.host.name + project_name = context["project_name"] + asset_name = context["asset_name"] + task_name = context["task_name"] + + if existing_instance is None: + asset_doc = get_asset_by_name(project_name, asset_name) + subset_name = self.get_subset_name( + self.default_variant, + task_name, + asset_doc, + project_name, + host_name + ) + data = { + "asset": asset_name, + "task": task_name, + "variant": self.default_variant + } + + new_instance = CreatedInstance( + self.family, subset_name, data, self + ) + instances_data = self.host.list_instances() + instances_data.append(new_instance.data_to_store()) + self.host.write_instances(instances_data) + self._add_instance_to_context(new_instance) + + elif ( + existing_instance["asset"] != asset_name + or existing_instance["task"] != task_name + ): + asset_doc = get_asset_by_name(project_name, asset_name) + subset_name = self.get_subset_name( + existing_instance["variant"], + task_name, + asset_doc, + project_name, + host_name, + existing_instance + ) + existing_instance["asset"] = asset_name + existing_instance["task"] = task_name + existing_instance["subset"] = subset_name From 2a137622fbe17d588e770e796ad3fdc48401918e Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 10 Feb 2023 14:29:37 +0100 Subject: [PATCH 176/912] base of render layer/pass creators --- .../tvpaint/plugins/create/create_render.py | 309 ++++++++++++++++++ 1 file changed, 309 insertions(+) create mode 100644 openpype/hosts/tvpaint/plugins/create/create_render.py diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py new file mode 100644 index 0000000000..67337b77a3 --- /dev/null +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -0,0 +1,309 @@ +from openpype.lib import ( + prepare_template_data, + EnumDef, + TextDef, +) +from openpype.pipeline.create import ( + CreatedInstance, + CreatorError, +) +from openpype.hosts.tvpaint.api.plugin import TVPaintCreator +from openpype.hosts.tvpaint.api.lib import ( + get_layers_data, + get_groups_data, + execute_george_through_file, +) + + +class CreateRenderlayer(TVPaintCreator): + """Mark layer group as one instance.""" + label = "Render Layer" + family = "render" + subset_template_family = "renderLayer" + identifier = "render.layer" + icon = "fa.cube" + + # George script to change color group + rename_script_template = ( + "tv_layercolor \"setcolor\"" + " {clip_id} {group_id} {r} {g} {b} \"{name}\"" + ) + order = 90 + + # Settings + render_pass = "beauty" + + def get_dynamic_data( + self, variant, task_name, asset_doc, project_name, host_name, instance + ): + dynamic_data = super().get_dynamic_data( + variant, task_name, asset_doc, project_name, host_name, instance + ) + dynamic_data["renderpass"] = self.render_pass + dynamic_data["renderlayer"] = variant + return dynamic_data + + def _get_selected_group_ids(self): + return { + layer["group_id"] + for layer in get_layers_data() + if layer["selected"] + } + + def create(self, subset_name, instance_data, pre_create_data): + self.log.debug("Query data from workfile.") + + group_id = pre_create_data.get("group_id") + # This creator should run only on one group + if group_id is None or group_id == -1: + selected_groups = self._get_selected_group_ids() + selected_groups.discard(0) + if len(selected_groups) > 1: + raise CreatorError("You have selected more than one group") + + if len(selected_groups) == 0: + raise CreatorError("You don't have selected any group") + group_id = tuple(selected_groups)[0] + + self.log.debug("Querying groups data from workfile.") + groups_data = get_groups_data() + group_item = None + for group_data in groups_data: + if group_data["group_id"] == group_id: + group_item = group_data + + for instance in self.create_context.instances: + if ( + instance.creator_identifier == self.identifier + and instance["creator_attributes"]["group_id"] == group_id + ): + raise CreatorError(( + f"Group \"{group_item.get('name')}\" is already used" + f" by another render layer \"{instance['subset']}\"" + )) + + self.log.debug(f"Selected group id is \"{group_id}\".") + if "creator_attributes" not in instance_data: + instance_data["creator_attributes"] = {} + instance_data["creator_attributes"]["group_id"] = group_id + + self.log.info(f"Subset name is {subset_name}") + new_instance = CreatedInstance( + self.family, + subset_name, + instance_data, + self + ) + self._store_new_instance(new_instance) + + new_group_name = pre_create_data.get("group_name") + if not new_group_name or not group_id: + return + + self.log.debug("Changing name of the group.") + + new_group_name = pre_create_data.get("group_name") + if not new_group_name or group_item["name"] == new_group_name: + return + # Rename TVPaint group (keep color same) + # - groups can't contain spaces + rename_script = self.rename_script_template.format( + clip_id=group_item["clip_id"], + group_id=group_item["group_id"], + r=group_item["red"], + g=group_item["green"], + b=group_item["blue"], + name=new_group_name + ) + execute_george_through_file(rename_script) + + self.log.info(( + f"Name of group with index {group_id}" + f" was changed to \"{new_group_name}\"." + )) + + def get_pre_create_attr_defs(self): + groups_enum = [ + { + "label": group["name"], + "value": group["group_id"] + } + for group in get_groups_data() + if group["name"] + ] + groups_enum.insert(0, {"label": "", "value": -1}) + + return [ + EnumDef( + "group_id", + label="Group", + items=groups_enum + ), + TextDef( + "group_name", + label="New group name", + placeholder="< Keep unchanged >" + ) + ] + + def get_instance_attr_defs(self): + groups_enum = [ + { + "label": group["name"], + "value": group["group_id"] + } + for group in get_groups_data() + if group["name"] + ] + return [ + EnumDef( + "group_id", + label="Group", + items=groups_enum + ) + ] + + +class CreateRenderPass(TVPaintCreator): + icon = "fa.cube" + family = "render" + subset_template_family = "renderPass" + identifier = "render.pass" + label = "Render Pass" + + order = CreateRenderlayer.order + 10 + + def get_dynamic_data( + self, variant, task_name, asset_doc, project_name, host_name, instance + ): + dynamic_data = super().get_dynamic_data( + variant, task_name, asset_doc, project_name, host_name, instance + ) + dynamic_data["renderpass"] = variant + dynamic_data["renderlayer"] = "{renderlayer}" + return dynamic_data + + def create(self, subset_name, instance_data, pre_create_data): + render_layer_instance_id = pre_create_data.get( + "render_layer_instance_id" + ) + if not render_layer_instance_id: + raise CreatorError("Missing RenderLayer instance") + + render_layer_instance = self.create_context.instances_by_id.get( + render_layer_instance_id + ) + if render_layer_instance is None: + raise CreatorError(( + "RenderLayer instance was not found" + f" by id \"{render_layer_instance_id}\"" + )) + + group_id = render_layer_instance["creator_attributes"]["group_id"] + self.log.debug("Query data from workfile.") + layers_data = get_layers_data() + + self.log.debug("Checking selection.") + # Get all selected layers and their group ids + selected_layers = [ + layer + for layer in layers_data + if layer["selected"] + ] + + # Raise if nothing is selected + if not selected_layers: + raise CreatorError("Nothing is selected. Please select layers.") + + selected_layer_names = {layer["name"] for layer in selected_layers} + instances_to_remove = [] + for instance in self.create_context.instances: + if instance.creator_identifier != self.identifier: + continue + layer_names = set(instance["layer_names"]) + if not layer_names.intersection(selected_layer_names): + continue + new_layer_names = layer_names - selected_layer_names + if new_layer_names: + instance["layer_names"] = list(new_layer_names) + else: + instances_to_remove.append(instance) + + render_layer = render_layer_instance["variant"] + subset_name_fill_data = {"renderlayer": render_layer} + + # Format dynamic keys in subset name + new_subset_name = subset_name.format( + **prepare_template_data(subset_name_fill_data) + ) + self.log.info(f"New subset name is \"{new_subset_name}\".") + instance_data["layer_names"] = list(selected_layer_names) + new_instance = CreatedInstance( + self.family, + subset_name, + instance_data, + self + ) + instances_data = self._remove_and_filter_instances( + instances_to_remove + ) + instances_data.append(new_instance.data_to_store()) + + self.host.write_instances(instances_data) + self._add_instance_to_context(new_instance) + self._change_layers_group(selected_layers, group_id) + + def _change_layers_group(self, layers, group_id): + filtered_layers = [ + layer + for layer in layers + if layer["group_id"] != group_id + ] + if filtered_layers: + self.log.info(( + "Changing group of " + f"{','.join([l['name'] for l in filtered_layers])}" + f" to {group_id}" + )) + george_lines = [ + f"tv_layercolor \"set\" {layer['layer_id']} {group_id}" + for layer in filtered_layers + ] + execute_george_through_file("\n".join(george_lines)) + + def _remove_and_filter_instances(self, instances_to_remove): + instances_data = self.host.list_instances() + if not instances_to_remove: + return instances_data + + removed_ids = set() + for instance in instances_to_remove: + removed_ids.add(instance.id) + self._remove_instance_from_context(instance) + + return [ + instance_data + for instance_data in instances_data + if instance_data.get("instance_id") not in removed_ids + ] + + def get_pre_create_attr_defs(self): + render_layers = [] + for instance in self.create_context.instances: + if instance.creator_identifier == "render.layer": + render_layers.append({ + "value": instance.id, + "label": instance.label + }) + + if not render_layers: + render_layers.append({"value": None, "label": "N/A"}) + + return [ + EnumDef( + "render_layer_instance_id", + label="Render Layer", + items=render_layers + ) + ] + From bd538e7e70373caafd3067e0acd26acdf8297d28 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 10 Feb 2023 14:30:08 +0100 Subject: [PATCH 177/912] use publisher instead of pyblish pype --- openpype/hosts/tvpaint/api/communication_server.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/openpype/hosts/tvpaint/api/communication_server.py b/openpype/hosts/tvpaint/api/communication_server.py index 6ac3e6324c..6fd2d69373 100644 --- a/openpype/hosts/tvpaint/api/communication_server.py +++ b/openpype/hosts/tvpaint/api/communication_server.py @@ -344,7 +344,7 @@ class QtTVPaintRpc(BaseTVPaintRpc): async def publish_tool(self): log.info("Triggering Publish tool") - item = MainThreadItem(self.tools_helper.show_publish) + item = MainThreadItem(self.tools_helper.show_publisher_tool) self._execute_in_main_thread(item) return @@ -875,10 +875,6 @@ class QtCommunicator(BaseCommunicator): "callback": "library_loader_tool", "label": "Library", "help": "Open library loader tool" - }, { - "callback": "subset_manager_tool", - "label": "Subset Manager", - "help": "Open subset manager tool" }, { "callback": "experimental_tools", "label": "Experimental tools", From 25e4a4b5a3b23fde16f5908b07d81103be99fd03 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 10 Feb 2023 16:15:55 +0100 Subject: [PATCH 178/912] Added support for multiple install dirs in Deadline SearchDirectoryList returns FIRST existing so if you would have multiple OP install dirs, it won't search for appropriate version in later ones. --- .../custom/plugins/GlobalJobPreLoad.py | 28 ++++++++++--------- .../custom/plugins/OpenPype/OpenPype.py | 23 +++++++-------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py b/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py index 984590ddba..65a3782dfe 100644 --- a/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py +++ b/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py @@ -196,19 +196,21 @@ def get_openpype_versions(dir_list): print(">>> Getting OpenPype executable ...") openpype_versions = [] - install_dir = DirectoryUtils.SearchDirectoryList(dir_list) - if install_dir: - print("--- Looking for OpenPype at: {}".format(install_dir)) - sub_dirs = [ - f.path for f in os.scandir(install_dir) - if f.is_dir() - ] - for subdir in sub_dirs: - version = get_openpype_version_from_path(subdir) - if not version: - continue - print(" - found: {} - {}".format(version, subdir)) - openpype_versions.append((version, subdir)) + # special case of multiple install dirs + for dir_list in dir_list.split(","): + install_dir = DirectoryUtils.SearchDirectoryList(dir_list) + if install_dir: + print("--- Looking for OpenPype at: {}".format(install_dir)) + sub_dirs = [ + f.path for f in os.scandir(install_dir) + if f.is_dir() + ] + for subdir in sub_dirs: + version = get_openpype_version_from_path(subdir) + if not version: + continue + print(" - found: {} - {}".format(version, subdir)) + openpype_versions.append((version, subdir)) return openpype_versions diff --git a/openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.py b/openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.py index 6b0f69d98f..ae31f2e35f 100644 --- a/openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.py +++ b/openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.py @@ -107,17 +107,18 @@ class OpenPypeDeadlinePlugin(DeadlinePlugin): "Scanning for compatible requested " f"version {requested_version}")) dir_list = self.GetConfigEntry("OpenPypeInstallationDirs") - install_dir = DirectoryUtils.SearchDirectoryList(dir_list) - if dir: - sub_dirs = [ - f.path for f in os.scandir(install_dir) - if f.is_dir() - ] - for subdir in sub_dirs: - version = self.get_openpype_version_from_path(subdir) - if not version: - continue - openpype_versions.append((version, subdir)) + for dir_list in dir_list.split(","): + install_dir = DirectoryUtils.SearchDirectoryList(dir_list) + if install_dir: + sub_dirs = [ + f.path for f in os.scandir(install_dir) + if f.is_dir() + ] + for subdir in sub_dirs: + version = self.get_openpype_version_from_path(subdir) + if not version: + continue + openpype_versions.append((version, subdir)) exe_list = self.GetConfigEntry("OpenPypeExecutable") exe = FileUtils.SearchFileList(exe_list) From e2565dc2d205e45e939d2ecef05933928520632a Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 10 Feb 2023 17:12:19 +0100 Subject: [PATCH 179/912] Nuke: adding solution for originalBasename frame temlate formating https://github.com/ynput/OpenPype/pull/4452#issuecomment-1426020567 --- openpype/hosts/nuke/plugins/load/load_clip.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/nuke/plugins/load/load_clip.py b/openpype/hosts/nuke/plugins/load/load_clip.py index 565d777811..f9364172ea 100644 --- a/openpype/hosts/nuke/plugins/load/load_clip.py +++ b/openpype/hosts/nuke/plugins/load/load_clip.py @@ -220,8 +220,21 @@ class LoadClip(plugin.NukeLoader): dict: altered representation data """ representation = deepcopy(representation) - frame = representation["context"]["frame"] - representation["context"]["frame"] = "#" * len(str(frame)) + context = representation["context"] + template = representation["data"]["template"] + frame = context["frame"] + hashed_frame = "#" * len(str(frame)) + + if ( + "{originalBasename}" in template + and "frame" in context + ): + origin_basename = context["originalBasename"] + context["originalBasename"] = origin_basename.replace( + frame, hashed_frame + ) + + representation["context"]["frame"] = hashed_frame return representation def update(self, container, representation): From e7072008af1a316f47ed52ec34823d5a046710e0 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 10 Feb 2023 17:33:35 +0100 Subject: [PATCH 180/912] added 'family_filter' argument to 'get_subset_name' --- openpype/pipeline/create/subset_name.py | 39 ++++++++++++++++--------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/openpype/pipeline/create/subset_name.py b/openpype/pipeline/create/subset_name.py index ed05dd6083..3f0692b46a 100644 --- a/openpype/pipeline/create/subset_name.py +++ b/openpype/pipeline/create/subset_name.py @@ -70,7 +70,8 @@ def get_subset_name( host_name=None, default_template=None, dynamic_data=None, - project_settings=None + project_settings=None, + family_filter=None, ): """Calculate subset name based on passed context and OpenPype settings. @@ -82,23 +83,35 @@ def get_subset_name( That's main reason why so many arguments are required to calculate subset name. + Option to pass family filter was added for special cases when creator or + automated publishing require special subset name template which would be + hard to maintain using its family value. + Why not just pass the right family? -> Family is also used as fill + value and for filtering of publish plugins. + + Todos: + Find better filtering options to avoid requirement of + argument 'family_filter'. + Args: family (str): Instance family. variant (str): In most of the cases it is user input during creation. task_name (str): Task name on which context is instance created. asset_doc (dict): Queried asset document with its tasks in data. Used to get task type. - project_name (str): Name of project on which is instance created. - Important for project settings that are loaded. - host_name (str): One of filtering criteria for template profile - filters. - default_template (str): Default template if any profile does not match - passed context. Constant 'DEFAULT_SUBSET_TEMPLATE' is used if - is not passed. - dynamic_data (dict): Dynamic data specific for a creator which creates - instance. - project_settings (Union[Dict[str, Any], None]): Prepared settings for - project. Settings are queried if not passed. + project_name (Optional[str]): Name of project on which is instance + created. Important for project settings that are loaded. + host_name (Optional[str]): One of filtering criteria for template + profile filters. + default_template (Optional[str]): Default template if any profile does + not match passed context. Constant 'DEFAULT_SUBSET_TEMPLATE' + is used if is not passed. + dynamic_data (Optional[Dict[str, Any]]): Dynamic data specific for + a creator which creates instance. + project_settings (Optional[Union[Dict[str, Any]]]): Prepared settings + for project. Settings are queried if not passed. + family_filter (Optional[str]): Use different family for subset template + filtering. Value of 'family' is used when not passed. """ if not family: @@ -119,7 +132,7 @@ def get_subset_name( template = get_subset_name_template( project_name, - family, + family_filter or family, task_name, task_type, host_name, From 0ab0f323f81aa403789fb4e3b0114c8791d3b8db Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 10 Feb 2023 17:34:03 +0100 Subject: [PATCH 181/912] use new option of family filter in TVPaint creators --- openpype/hosts/tvpaint/api/plugin.py | 7 ++++--- openpype/hosts/tvpaint/plugins/create/create_render.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/tvpaint/api/plugin.py b/openpype/hosts/tvpaint/api/plugin.py index e6fc087665..c57baf7212 100644 --- a/openpype/hosts/tvpaint/api/plugin.py +++ b/openpype/hosts/tvpaint/api/plugin.py @@ -55,7 +55,7 @@ def _update_instances(creator, update_list): class TVPaintCreator(NewCreator): @property - def subset_template_family(self): + def subset_template_family_filter(self): return self.family def collect_instances(self): @@ -111,14 +111,15 @@ class TVPaintCreator(NewCreator): ) return get_subset_name( - self.subset_template_family, + self.family, variant, task_name, asset_doc, project_name, host_name, dynamic_data=dynamic_data, - project_settings=self.project_settings + project_settings=self.project_settings, + family_filter=self.subset_template_family_filter ) def _store_new_instance(self, new_instance): diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 67337b77a3..4050bddd52 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -19,7 +19,7 @@ class CreateRenderlayer(TVPaintCreator): """Mark layer group as one instance.""" label = "Render Layer" family = "render" - subset_template_family = "renderLayer" + subset_template_family_filter = "renderLayer" identifier = "render.layer" icon = "fa.cube" @@ -167,7 +167,7 @@ class CreateRenderlayer(TVPaintCreator): class CreateRenderPass(TVPaintCreator): icon = "fa.cube" family = "render" - subset_template_family = "renderPass" + subset_template_family_filter = "renderPass" identifier = "render.pass" label = "Render Pass" From 8233b1ad8229ebc8388d453f08c3cdeec3196a9f Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 10 Feb 2023 17:51:29 +0100 Subject: [PATCH 182/912] publishing files with fixed versionData to fit originalBasename tempate --- .../publish/collect_otio_subset_resources.py | 43 ++++++++++++++++--- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/openpype/plugins/publish/collect_otio_subset_resources.py b/openpype/plugins/publish/collect_otio_subset_resources.py index e72c12d9a9..537aef683c 100644 --- a/openpype/plugins/publish/collect_otio_subset_resources.py +++ b/openpype/plugins/publish/collect_otio_subset_resources.py @@ -14,16 +14,41 @@ from openpype.pipeline.editorial import ( range_from_frames, make_sequence_collection ) - +from openpype.pipeline.publish import ( + get_publish_template_name +) class CollectOtioSubsetResources(pyblish.api.InstancePlugin): """Get Resources for a subset version""" label = "Collect OTIO Subset Resources" - order = pyblish.api.CollectorOrder - 0.077 + order = pyblish.api.CollectorOrder + 0.0021 families = ["clip"] hosts = ["resolve", "hiero", "flame"] + def get_template_name(self, instance): + """Return anatomy template name to use for integration""" + + # Anatomy data is pre-filled by Collectors + context = instance.context + project_name = context.data["projectName"] + + # Task can be optional in anatomy data + host_name = context.data["hostName"] + family = instance.data["family"] + anatomy_data = instance.context.data["anatomyData"] + task_info = anatomy_data.get("task") or {} + + return get_publish_template_name( + project_name, + host_name, + family, + task_name=task_info.get("name"), + task_type=task_info.get("type"), + project_settings=context.data["project_settings"], + logger=self.log + ) + def process(self, instance): if "audio" in instance.data["family"]: @@ -35,6 +60,13 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): if not instance.data.get("versionData"): instance.data["versionData"] = {} + template_name = self.get_template_name(instance) + anatomy = instance.context.data["anatomy"] + publish_template_category = anatomy.templates[template_name] + template = os.path.normpath(publish_template_category["path"]) + self.log.debug( + ">> template: {}".format(template)) + handle_start = instance.data["handleStart"] handle_end = instance.data["handleEnd"] @@ -84,6 +116,10 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): frame_start = instance.data["frameStart"] frame_end = frame_start + (media_out - media_in) + if "{originalDirname}" in template: + frame_start = media_in + frame_end = media_out + # add to version data start and end range data # for loader plugins to be correctly displayed and loaded instance.data["versionData"].update({ @@ -153,7 +189,6 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): repre = self._create_representation( frame_start, frame_end, collection=collection) - instance.data["originalBasename"] = collection.format("{head}") else: _trim = False dirname, filename = os.path.split(media_ref.target_url) @@ -168,8 +203,6 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): repre = self._create_representation( frame_start, frame_end, file=filename, trim=_trim) - instance.data["originalBasename"] = os.path.splitext(filename)[0] - instance.data["originalDirname"] = self.staging_dir if repre: From a1ab32b32961a7785e97fdd74024fd7fb7f261a6 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 10 Feb 2023 17:53:36 +0100 Subject: [PATCH 183/912] polishing fixes --- .../publish/collect_otio_subset_resources.py | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/openpype/plugins/publish/collect_otio_subset_resources.py b/openpype/plugins/publish/collect_otio_subset_resources.py index 537aef683c..5daa1b40fe 100644 --- a/openpype/plugins/publish/collect_otio_subset_resources.py +++ b/openpype/plugins/publish/collect_otio_subset_resources.py @@ -26,28 +26,6 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): families = ["clip"] hosts = ["resolve", "hiero", "flame"] - def get_template_name(self, instance): - """Return anatomy template name to use for integration""" - - # Anatomy data is pre-filled by Collectors - context = instance.context - project_name = context.data["projectName"] - - # Task can be optional in anatomy data - host_name = context.data["hostName"] - family = instance.data["family"] - anatomy_data = instance.context.data["anatomyData"] - task_info = anatomy_data.get("task") or {} - - return get_publish_template_name( - project_name, - host_name, - family, - task_name=task_info.get("name"), - task_type=task_info.get("type"), - project_settings=context.data["project_settings"], - logger=self.log - ) def process(self, instance): @@ -116,6 +94,7 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): frame_start = instance.data["frameStart"] frame_end = frame_start + (media_out - media_in) + # Fit start /end frame to media in /out if "{originalDirname}" in template: frame_start = media_in frame_end = media_out @@ -258,3 +237,26 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): if kwargs.get("trim") is True: representation_data["tags"] = ["trim"] return representation_data + + def get_template_name(self, instance): + """Return anatomy template name to use for integration""" + + # Anatomy data is pre-filled by Collectors + context = instance.context + project_name = context.data["projectName"] + + # Task can be optional in anatomy data + host_name = context.data["hostName"] + family = instance.data["family"] + anatomy_data = instance.context.data["anatomyData"] + task_info = anatomy_data.get("task") or {} + + return get_publish_template_name( + project_name, + host_name, + family, + task_name=task_info.get("name"), + task_type=task_info.get("type"), + project_settings=context.data["project_settings"], + logger=self.log + ) \ No newline at end of file From 6fbf7be560cc68704a2ed2933955cac10a80176e Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 10 Feb 2023 17:54:54 +0100 Subject: [PATCH 184/912] wrong template key name --- openpype/plugins/publish/collect_otio_subset_resources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/collect_otio_subset_resources.py b/openpype/plugins/publish/collect_otio_subset_resources.py index 5daa1b40fe..dab52986da 100644 --- a/openpype/plugins/publish/collect_otio_subset_resources.py +++ b/openpype/plugins/publish/collect_otio_subset_resources.py @@ -95,7 +95,7 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): frame_end = frame_start + (media_out - media_in) # Fit start /end frame to media in /out - if "{originalDirname}" in template: + if "{originalBasename}" in template: frame_start = media_in frame_end = media_out From 3fb87723a0194ad2644b8233dbc8daa7d81c8f01 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 10 Feb 2023 18:29:54 +0100 Subject: [PATCH 185/912] added basic docstring for render creators --- .../tvpaint/plugins/create/create_render.py | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 4050bddd52..92439f329f 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -1,3 +1,34 @@ +"""Render Layer and Passes creators. + +Render layer is main part which is represented by group in TVPaint. All TVPaint +layers marked with that group color are part of the render layer. To be more +specific about some parts of layer it is possible to create sub-sets of layer +which are named passes. Render pass consist of layers in same color group as +render layer but define more specific part. + +For example render layer could be 'Bob' which consist of 5 TVPaint layers. +- Bob has 'head' which consist of 2 TVPaint layers -> Render pass 'head' +- Bob has 'body' which consist of 1 TVPaint layer -> Render pass 'body' +- Bob has 'arm' which consist of 1 TVPaint layer -> Render pass 'arm' +- Last layer does not belong to render pass at all + +Bob will be rendered as 'beauty' of bob (all visible layers in group). +His head will be rendered too but without any other parts. The same for body +and arm. + +What is this good for? Compositing has more power how the renders are used. +Can do transforms on each render pass without need to modify a re-render them +using TVPaint. + +The workflow may hit issues when there are used other blending modes than +default 'color' blend more. In that case it is not recommended to use this +workflow at all as other blend modes may affect all layers in clip which can't +be done. + +Todos: + Add option to extract marked layers and passes as json output format for + AfterEffects. +""" from openpype.lib import ( prepare_template_data, EnumDef, From e426c2c4f0216a3d280f75f9f865de3d3d5ab8d8 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 10 Feb 2023 18:32:34 +0100 Subject: [PATCH 186/912] added option to mark render instance for review --- .../tvpaint/plugins/create/create_render.py | 44 ++++++++++++++++++- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 92439f329f..3a89608c7c 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -33,6 +33,7 @@ from openpype.lib import ( prepare_template_data, EnumDef, TextDef, + BoolDef, ) from openpype.pipeline.create import ( CreatedInstance, @@ -48,6 +49,7 @@ from openpype.hosts.tvpaint.api.lib import ( class CreateRenderlayer(TVPaintCreator): """Mark layer group as one instance.""" + label = "Render Layer" family = "render" subset_template_family_filter = "renderLayer" @@ -63,6 +65,7 @@ class CreateRenderlayer(TVPaintCreator): # Settings render_pass = "beauty" + mark_for_review = True def get_dynamic_data( self, variant, task_name, asset_doc, project_name, host_name, instance @@ -116,7 +119,12 @@ class CreateRenderlayer(TVPaintCreator): self.log.debug(f"Selected group id is \"{group_id}\".") if "creator_attributes" not in instance_data: instance_data["creator_attributes"] = {} - instance_data["creator_attributes"]["group_id"] = group_id + creator_attributes = instance_data["creator_attributes"] + mark_for_review = pre_create_data.get("mark_for_review") + if mark_for_review is None: + mark_for_review = self.mark_for_review + creator_attributes["group_id"] = group_id + creator_attributes["mark_for_review"] = mark_for_review self.log.info(f"Subset name is {subset_name}") new_instance = CreatedInstance( @@ -174,6 +182,11 @@ class CreateRenderlayer(TVPaintCreator): "group_name", label="New group name", placeholder="< Keep unchanged >" + ), + BoolDef( + "mark_for_review", + label="Review", + default=self.mark_for_review ) ] @@ -191,6 +204,11 @@ class CreateRenderlayer(TVPaintCreator): "group_id", label="Group", items=groups_enum + ), + BoolDef( + "mark_for_review", + label="Review", + default=self.mark_for_review ) ] @@ -204,6 +222,9 @@ class CreateRenderPass(TVPaintCreator): order = CreateRenderlayer.order + 10 + # Settings + mark_for_review = True + def get_dynamic_data( self, variant, task_name, asset_doc, project_name, host_name, instance ): @@ -269,6 +290,18 @@ class CreateRenderPass(TVPaintCreator): ) self.log.info(f"New subset name is \"{new_subset_name}\".") instance_data["layer_names"] = list(selected_layer_names) + if "creator_attributes" not in instance_data: + instance_data["creator_attribtues"] = {} + + creator_attributes = instance_data["creator_attribtues"] + mark_for_review = pre_create_data.get("mark_for_review") + if mark_for_review is None: + mark_for_review = self.mark_for_review + creator_attributes["mark_for_review"] = mark_for_review + creator_attributes["render_layer_instance_id"] = ( + render_layer_instance_id + ) + new_instance = CreatedInstance( self.family, subset_name, @@ -321,7 +354,7 @@ class CreateRenderPass(TVPaintCreator): def get_pre_create_attr_defs(self): render_layers = [] for instance in self.create_context.instances: - if instance.creator_identifier == "render.layer": + if instance.creator_identifier == CreateRenderlayer.identifier: render_layers.append({ "value": instance.id, "label": instance.label @@ -335,6 +368,13 @@ class CreateRenderPass(TVPaintCreator): "render_layer_instance_id", label="Render Layer", items=render_layers + ), + BoolDef( + "mark_for_review", + label="Review", + default=self.mark_for_review ) ] + def get_instance_attr_defs(self): + return self.get_pre_create_attr_defs() From 4a53dce92ffe996900d2914c58ceaae0caedcb30 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 10 Feb 2023 18:32:59 +0100 Subject: [PATCH 187/912] render layer creator changes group ids of render pass layers on save --- .../tvpaint/plugins/create/create_render.py | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 3a89608c7c..e5d3fa1a59 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -29,6 +29,9 @@ Todos: Add option to extract marked layers and passes as json output format for AfterEffects. """ + +import collections + from openpype.lib import ( prepare_template_data, EnumDef, @@ -212,6 +215,51 @@ class CreateRenderlayer(TVPaintCreator): ) ] + def update_instances(self, update_list): + self._update_renderpass_groups() + + super().update_instances(update_list) + + def _update_renderpass_groups(self): + render_layer_instances = {} + render_pass_instances = collections.defaultdict(list) + + for instance in self.create_context.instances: + if instance.creator_identifier == CreateRenderPass.identifier: + render_layer_id = ( + instance["creator_attributes"]["render_layer_instance_id"] + ) + render_pass_instances[render_layer_id].append(instance) + elif instance.creator_identifier == self.identifier: + render_layer_instances[instance.id] = instance + + if not render_pass_instances or not render_layer_instances: + return + + layers_data = get_layers_data() + layers_by_name = collections.defaultdict(list) + for layer in layers_data: + layers_by_name[layer["name"]].append(layer) + + george_lines = [] + for render_layer_id, instances in render_pass_instances.items(): + render_layer_inst = render_layer_instances.get(render_layer_id) + if render_layer_inst is None: + continue + group_id = render_layer_inst["creator_attributes"]["group_id"] + layer_names = set() + for instance in instances: + layer_names |= set(instance["layer_names"]) + + for layer_name in layer_names: + george_lines.extend( + f"tv_layercolor \"set\" {layer['layer_id']} {group_id}" + for layer in layers_by_name[layer_name] + if layer["group_id"] != group_id + ) + if george_lines: + execute_george_through_file("\n".join(george_lines)) + class CreateRenderPass(TVPaintCreator): icon = "fa.cube" From 3ff8aa5c958e79000bd82967de82e436947c11fd Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Mon, 13 Feb 2023 00:39:55 +0300 Subject: [PATCH 188/912] use system settings to get data, add force sync option --- .../hosts/fusion/hooks/pre_fusion_setup.py | 71 ++++++++++++------- .../system_settings/applications.json | 3 +- .../host_settings/schema_fusion.json | 7 +- 3 files changed, 55 insertions(+), 26 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index 4f000a12b2..4dc11abce9 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -4,6 +4,7 @@ import platform from pathlib import Path from openpype.lib import PreLaunchHook, ApplicationLaunchFailed from openpype.hosts.fusion import FUSION_HOST_DIR +from openpype.settings import get_system_settings class FusionPrelaunch(PreLaunchHook): @@ -19,14 +20,18 @@ class FusionPrelaunch(PreLaunchHook): """ app_groups = ["fusion"] - OPENPYPE_FUSION_PROFILE_DIR = "~/.openpype/hosts/fusion/prefs" PROFILE_NUMBER = 16 - def get_fusion_profile(self) -> str: + def get_fusion_profile_name(self) -> str: + """usually set to 'Default', unless FUSION16_PROFILE is set""" return os.getenv(f"FUSION{self.PROFILE_NUMBER}_PROFILE", "Default") def get_profile_source(self) -> Path: - fusion_profile = self.get_fusion_profile() + """Get the Fusion preferences (profile) location. + Check https://www.steakunderwater.com/VFXPedia/96.0.243.189/indexad6a.html?title=Per-User_Preferences_and_Paths#Setting_the_profile_directory + for reference. + """ + fusion_profile = self.get_fusion_profile_name() fusion_var_prefs_dir = os.getenv(f"FUSION{self.PROFILE_NUMBER}_PROFILE_DIR") # if FUSION16_PROFILE_DIR variable exists, return the profile filepath @@ -44,11 +49,32 @@ class FusionPrelaunch(PreLaunchHook): prefs_source = Path("~/Library/Application Support/", fusion_prefs_path).expanduser() elif platform.system() == "Linux": prefs_source = Path("~/.fusion", fusion_prefs_path).expanduser() - + self.log.info(f"Got Fusion prefs file: {prefs_source}") return prefs_source - def copy_existing_prefs(self, copy_from: Path, copy_to: Path) -> None: - dest_folder = copy_to / self.get_fusion_profile() + def get_copy_fusion_prefs_settings(self): + """Git copy prefserences options from the global application settings""" + copy_status = copy_path = None + try: + copy_status, copy_path, force_sync = get_system_settings()["applications"]["fusion"][ + "copy_fusion_settings"].values() + except ValueError: + self.log.error('Copy prefs settings not found') + finally: + return copy_status, copy_path, force_sync + + def copy_existing_prefs(self, copy_from: Path, copy_to: Path, force_sync: bool) -> None: + """On the first Fusion launch copy the Fusion profile to the working directory. + If the Openpype profile folder exists, skip copying, unless Force sync is checked. + If the prefs were not copied on the first launch, clean Fusion profile + will be created in openpype_fusion_profile_dir. + """ + if copy_to.exists() and not force_sync: + self.log.info("Local Fusion preferences folder exists, skipping profile copy") + return + self.log.info(f"Starting copying Fusion preferences") + self.log.info(f"force_sync option is set to {force_sync}") + dest_folder = copy_to / self.get_fusion_profile_name() dest_folder.mkdir(exist_ok=True, parents=True) if not copy_from.exists(): self.log.warning(f"Fusion preferences file not found in {copy_from}") @@ -88,25 +114,22 @@ class FusionPrelaunch(PreLaunchHook): # Fusion 16 and 17 use FUSION16_PYTHON36_HOME instead of # FUSION_PYTHON3_HOME and will only work with a Python 3.6 version # TODO: Detect Fusion version to only set for specific Fusion build - self.launch_context.env["FUSION16_PYTHON36_HOME"] = py3_dir + self.launch_context.env[f"FUSION{self.PROFILE_NUMBER}_PYTHON36_HOME"] = py3_dir - # Add custom Fusion Master Prefs and the temporary profile directory variables to customize - # Fusion to define where it can read custom scripts and tools from + # Add custom Fusion Master Prefs and the temporary profile directory variables + # to customize Fusion to define where it can read custom scripts and tools from self.log.info(f"Setting OPENPYPE_FUSION: {FUSION_HOST_DIR}") self.launch_context.env["OPENPYPE_FUSION"] = FUSION_HOST_DIR - profile_dir_var = "FUSION16_PROFILE_DIR" # used by Fusion 16, 17 and 18 - pref_var = "FUSION16_MasterPrefs" # used by Fusion 16, 17 and 18 - op_profile_dir = Path(self.OPENPYPE_FUSION_PROFILE_DIR).expanduser() - op_master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") - prefs_source = self.get_profile_source() - self.log.info(f"Got Fusion prefs file: {prefs_source}") - - # now copy the default Fusion profile to a working directory - # only if the openpype profile folder does not exist - if not op_profile_dir.exists(): - self.copy_existing_prefs(prefs_source, op_profile_dir) - self.log.info(f"Setting {profile_dir_var}: {op_profile_dir}") - self.launch_context.env[profile_dir_var] = str(op_profile_dir) - self.log.info(f"Setting {pref_var}: {op_master_prefs}") - self.launch_context.env[pref_var] = str(op_master_prefs) + copy_status, openpype_fusion_profile_dir, force_sync = self.get_copy_fusion_prefs_settings() + if copy_status: + prefs_source = self.get_profile_source() + openpype_fusion_profile_dir = Path(openpype_fusion_profile_dir).expanduser() + self.copy_existing_prefs(prefs_source, openpype_fusion_profile_dir, force_sync) + fusion_profile_dir_variable = f"FUSION{self.PROFILE_NUMBER}_PROFILE_DIR" + pref_var = f"FUSION{self.PROFILE_NUMBER}_MasterPrefs" + openpype_master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") + self.log.info(f"Setting {fusion_profile_dir_variable}: {openpype_fusion_profile_dir}") + self.launch_context.env[fusion_profile_dir_variable] = str(openpype_fusion_profile_dir) + self.log.info(f"Setting {pref_var}: {openpype_master_prefs}") + self.launch_context.env[pref_var] = str(openpype_master_prefs) diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json index 5d75b3b606..9fb730568e 100644 --- a/openpype/settings/defaults/system_settings/applications.json +++ b/openpype/settings/defaults/system_settings/applications.json @@ -837,7 +837,8 @@ }, "copy_fusion_settings": { "copy_prefs": false, - "prefs_path": "~/.openpype/hosts/fusion/prefs" + "prefs_path": "~/.openpype/hosts/fusion/prefs", + "force_sync": false }, "variants": { "18": { diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json index 360813bcb5..48355932ae 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json @@ -27,7 +27,7 @@ "key": "copy_fusion_settings", "collapsible": true, "checkbox_key": "copy_prefs", - "label": "Copy Fusion preferences", + "label": "Copy Fusion settings when launched from OpenPype", "children": [ { "type": "boolean", @@ -38,6 +38,11 @@ "key": "prefs_path", "type": "path", "label": "Local prefs directory" + }, + { + "key":"force_sync", + "type": "boolean", + "label": "Always sync preferences on launch" } ] }, From 76bdcb49ea019fe7028bce87916b14dcf4a829f1 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Mon, 13 Feb 2023 00:40:51 +0300 Subject: [PATCH 189/912] get the prefs path correctly --- openpype/hosts/fusion/hooks/pre_fusion_setup.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index 4dc11abce9..267ee71315 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -61,7 +61,7 @@ class FusionPrelaunch(PreLaunchHook): except ValueError: self.log.error('Copy prefs settings not found') finally: - return copy_status, copy_path, force_sync + return copy_status, Path(copy_path).expanduser(), force_sync def copy_existing_prefs(self, copy_from: Path, copy_to: Path, force_sync: bool) -> None: """On the first Fusion launch copy the Fusion profile to the working directory. @@ -124,12 +124,11 @@ class FusionPrelaunch(PreLaunchHook): copy_status, openpype_fusion_profile_dir, force_sync = self.get_copy_fusion_prefs_settings() if copy_status: prefs_source = self.get_profile_source() - openpype_fusion_profile_dir = Path(openpype_fusion_profile_dir).expanduser() self.copy_existing_prefs(prefs_source, openpype_fusion_profile_dir, force_sync) fusion_profile_dir_variable = f"FUSION{self.PROFILE_NUMBER}_PROFILE_DIR" - pref_var = f"FUSION{self.PROFILE_NUMBER}_MasterPrefs" + master_prefs_variable = f"FUSION{self.PROFILE_NUMBER}_MasterPrefs" openpype_master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") self.log.info(f"Setting {fusion_profile_dir_variable}: {openpype_fusion_profile_dir}") self.launch_context.env[fusion_profile_dir_variable] = str(openpype_fusion_profile_dir) - self.log.info(f"Setting {pref_var}: {openpype_master_prefs}") - self.launch_context.env[pref_var] = str(openpype_master_prefs) + self.log.info(f"Setting {master_prefs_variable}: {openpype_master_prefs}") + self.launch_context.env[master_prefs_variable] = str(openpype_master_prefs) From 632beeb1c7ae00146910a3cfa27a8ef855edbc84 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Mon, 13 Feb 2023 00:41:29 +0300 Subject: [PATCH 190/912] use english interface by default --- .../hosts/fusion/deploy/fusion_shared.prefs | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/openpype/hosts/fusion/deploy/fusion_shared.prefs b/openpype/hosts/fusion/deploy/fusion_shared.prefs index 8d0e45eae5..17ac3ad37a 100644 --- a/openpype/hosts/fusion/deploy/fusion_shared.prefs +++ b/openpype/hosts/fusion/deploy/fusion_shared.prefs @@ -1,16 +1,20 @@ { Locked = true, Global = { - Paths = { - Map = { - ["OpenPype:"] = "$(OPENPYPE_FUSION)/deploy", - ["Config:"] = "UserPaths:Config;OpenPype:Config", - ["Scripts:"] = "UserPaths:Scripts;Reactor:System/Scripts;OpenPype:Scripts", - }, - }, - Script = { - PythonVersion = 3, - Python3Forced = true - }, + Paths = { + Map = { + ["OpenPype:"] = "$(OPENPYPE_FUSION)/deploy", + ["Config:"] = "UserPaths:Config;OpenPype:Config", + ["Scripts:"] = "UserPaths:Scripts;Reactor:System/Scripts;OpenPype:Scripts", }, + }, + Script = { + PythonVersion = 3, + Python3Forced = true + }, + UserInterface = { + Skin = "Neutral", + Language = "en_US" + }, + }, } From 807fd736fc7ce26b6e2553cfa9c1c53d7e13360f Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Mon, 13 Feb 2023 01:50:05 +0300 Subject: [PATCH 191/912] fix typo --- openpype/hosts/fusion/hooks/pre_fusion_setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index 267ee71315..3bb345b72f 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -28,8 +28,7 @@ class FusionPrelaunch(PreLaunchHook): def get_profile_source(self) -> Path: """Get the Fusion preferences (profile) location. - Check https://www.steakunderwater.com/VFXPedia/96.0.243.189/indexad6a.html?title=Per-User_Preferences_and_Paths#Setting_the_profile_directory - for reference. + Check https://www.steakunderwater.com/VFXPedia/96.0.243.189/indexad6a.html?title=Per-User_Preferences_and_Paths for reference. """ fusion_profile = self.get_fusion_profile_name() fusion_var_prefs_dir = os.getenv(f"FUSION{self.PROFILE_NUMBER}_PROFILE_DIR") @@ -53,7 +52,7 @@ class FusionPrelaunch(PreLaunchHook): return prefs_source def get_copy_fusion_prefs_settings(self): - """Git copy prefserences options from the global application settings""" + """Get copy prefserences options from the global application settings""" copy_status = copy_path = None try: copy_status, copy_path, force_sync = get_system_settings()["applications"]["fusion"][ From c537999ffb6de7e9edfd14f226b44c521c809512 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Mon, 13 Feb 2023 14:43:08 +0800 Subject: [PATCH 192/912] correct the renderer name for redshift and update arnold render product --- openpype/hosts/max/api/lib_renderproducts.py | 36 +++++++++++++++++++- openpype/hosts/max/api/lib_rendersettings.py | 22 ++++++++++-- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index e3cccff982..c6432412bf 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -47,7 +47,7 @@ class RenderProducts(object): if ( renderer == "ART_Renderer" or - renderer == "Redshift Renderer" or + renderer == "Redshift_Renderer" or renderer == "V_Ray_6_Hotfix_3" or renderer == "V_Ray_GPU_6_Hotfix_3" or renderer == "Default_Scanline_Renderer" or @@ -59,11 +59,20 @@ class RenderProducts(object): img_fmt) for render_elem in render_elem_list: full_render_list.append(render_elem) + return full_render_list if renderer == "Arnold": + aov_list = self.arnold_render_product(output_file, + startFrame, + endFrame, + img_fmt) + if aov_list: + for aov in aov_list: + full_render_list.append(aov) return full_render_list + def beauty_render_product(self, folder, startFrame, endFrame, fmt): # get the beauty beauty_frame_range = list() @@ -78,6 +87,31 @@ class RenderProducts(object): return beauty_frame_range # TODO: Get the arnold render product + def arnold_render_product(self, folder, startFrame, endFrame, fmt): + """Get all the Arnold AOVs""" + aovs = list() + + amw = rt.MaxtoAOps.AOVsManagerWindow() + aov_mgr = rt.renderers.current.AOVManager + # Check if there is any aov group set in AOV manager + aov_group_num = len(aov_mgr.drivers) + if aov_group_num < 1: + return + for i in range(aov_group_num): + # get the specific AOV group + for aov in aov_mgr.drivers[i].aov_list: + for f in range(startFrame, endFrame): + render_element = "{0}_{1}.{2}.{3}".format(folder, + str(aov.name), + str(f), + fmt) + render_element = render_element.replace("\\", "/") + aovs.append(render_element) + # close the AOVs manager window + amw.close() + + return aovs + def render_elements_product(self, folder, startFrame, endFrame, fmt): """Get all the render element output files. """ render_dirname = list() diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index 2324d743eb..bc9b02bc77 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -87,7 +87,7 @@ class RenderSettings(object): if ( renderer == "ART_Renderer" or - renderer == "Redshift Renderer" or + renderer == "Redshift_Renderer" or renderer == "V_Ray_6_Hotfix_3" or renderer == "V_Ray_GPU_6_Hotfix_3" or renderer == "Default_Scanline_Renderer" or @@ -104,9 +104,25 @@ class RenderSettings(object): render_camera = rt.viewport.GetCamera() arv.setOption("Camera", str(render_camera)) - aovmgr = rt.renderers.current.AOVManager - aovmgr.drivers = "#()" + # TODO: add AOVs and extension + img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"] # noqa + setup_cmd = ( + f""" + amw = MaxtoAOps.AOVsManagerWindow() + amw.close() + aovmgr = renderers.current.AOVManager + aovmgr.drivers = #() + img_fmt = "{img_fmt}" + if img_fmt == "png" then driver = ArnoldPNGDriver() + if img_fmt == "jpg" then driver = ArnoldJPEGDriver() + if img_fmt == "exr" then driver = ArnoldEXRDriver() + if img_fmt == "tif" then driver = ArnoldTIFFDriver() + if img_fmt == "tiff" then driver = ArnoldTIFFDriver() + append aovmgr.drivers driver + aovmgr.drivers[1].aov_list = #() + """) + rt.execute(setup_cmd) arv.close() def render_element_layer(self, dir, width, height, ext): From af8278f67ca073386fbcc8dd8f03efd0226366db Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Mon, 13 Feb 2023 14:44:24 +0800 Subject: [PATCH 193/912] hound fix --- openpype/hosts/max/api/lib_renderproducts.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index c6432412bf..b54e2513e1 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -72,7 +72,6 @@ class RenderProducts(object): full_render_list.append(aov) return full_render_list - def beauty_render_product(self, folder, startFrame, endFrame, fmt): # get the beauty beauty_frame_range = list() From 61024a476a36ec0dac03dccfa0bbf3a76edabf8d Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Mon, 13 Feb 2023 15:02:51 +0800 Subject: [PATCH 194/912] chucksize in create_render --- openpype/hosts/max/plugins/create/create_render.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openpype/hosts/max/plugins/create/create_render.py b/openpype/hosts/max/plugins/create/create_render.py index 76c10ca4a9..699fc200d3 100644 --- a/openpype/hosts/max/plugins/create/create_render.py +++ b/openpype/hosts/max/plugins/create/create_render.py @@ -20,6 +20,8 @@ class CreateRender(plugin.MaxCreator): pre_create_data) # type: CreatedInstance container_name = instance.data.get("instance_node") container = rt.getNodeByName(container_name) + # chuckSize for submitting render + instance_data["chunkSize"] = 10 # TODO: Disable "Add to Containers?" Panel # parent the selected cameras into the container for obj in sel_obj: From b284ad43c04cf05bb604603d211194526f80971c Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Mon, 13 Feb 2023 17:44:17 +0800 Subject: [PATCH 195/912] not include py script from the unrelated host --- openpype/hosts/maya/plugins/publish/collect_render.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/publish/collect_render.py b/openpype/hosts/maya/plugins/publish/collect_render.py index c5fce219fa..0683848c49 100644 --- a/openpype/hosts/maya/plugins/publish/collect_render.py +++ b/openpype/hosts/maya/plugins/publish/collect_render.py @@ -184,7 +184,7 @@ class CollectMayaRender(pyblish.api.ContextPlugin): self.log.info("multipart: {}".format( multipart)) assert exp_files, "no file names were generated, this is bug" - + self.log.info(exp_files) # if we want to attach render to subset, check if we have AOV's # in expectedFiles. If so, raise error as we cannot attach AOV # (considered to be subset on its own) to another subset @@ -319,6 +319,7 @@ class CollectMayaRender(pyblish.api.ContextPlugin): "renderSetupIncludeLights" ) } + # Collect Deadline url if Deadline module is enabled deadline_settings = ( context.data["system_settings"]["modules"]["deadline"] From 6236922e81b40a7ca0a7ed4d325aa97a0de9361e Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Mon, 13 Feb 2023 17:45:10 +0800 Subject: [PATCH 196/912] not include py script from the unrelated host --- openpype/hosts/maya/plugins/publish/collect_render.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/maya/plugins/publish/collect_render.py b/openpype/hosts/maya/plugins/publish/collect_render.py index 0683848c49..b1ad3ca58e 100644 --- a/openpype/hosts/maya/plugins/publish/collect_render.py +++ b/openpype/hosts/maya/plugins/publish/collect_render.py @@ -185,6 +185,7 @@ class CollectMayaRender(pyblish.api.ContextPlugin): multipart)) assert exp_files, "no file names were generated, this is bug" self.log.info(exp_files) + # if we want to attach render to subset, check if we have AOV's # in expectedFiles. If so, raise error as we cannot attach AOV # (considered to be subset on its own) to another subset From 21b2cbe34830e27fb02d797443e1e5025fffea8c Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 13 Feb 2023 15:59:22 +0100 Subject: [PATCH 197/912] better methods propagation --- openpype/hosts/tvpaint/api/plugin.py | 68 +++++++++++++++------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/openpype/hosts/tvpaint/api/plugin.py b/openpype/hosts/tvpaint/api/plugin.py index c57baf7212..d267d87acd 100644 --- a/openpype/hosts/tvpaint/api/plugin.py +++ b/openpype/hosts/tvpaint/api/plugin.py @@ -21,48 +21,52 @@ from .pipeline import get_current_workfile_context SHARED_DATA_KEY = "openpype.tvpaint.instances" -def _collect_instances(creator): - instances_by_identifier = cache_and_get_instances( - creator, SHARED_DATA_KEY, creator.host.list_instances - ) - for instance_data in instances_by_identifier[creator.identifier]: - instance = CreatedInstance.from_existing(instance_data, creator) - creator._add_instance_to_context(instance) +class TVPaintCreatorCommon: + def _cache_and_get_instances(self): + return cache_and_get_instances( + self, SHARED_DATA_KEY, self.host.list_instances + ) + + def _collect_create_instances(self): + instances_by_identifier = self._cache_and_get_instances() + for instance_data in instances_by_identifier[self.identifier]: + instance = CreatedInstance.from_existing(instance_data, self) + self._add_instance_to_context(instance) -def _update_instances(creator, update_list): - if not update_list: - return + def _update_create_instances(self, update_list): + if not update_list: + return - cur_instances = creator.host.list_instances() - cur_instances_by_id = {} - for instance_data in cur_instances: - instance_id = instance_data.get("instance_id") - if instance_id: - cur_instances_by_id[instance_id] = instance_data + cur_instances = self.host.list_instances() + cur_instances_by_id = {} + for instance_data in cur_instances: + instance_id = instance_data.get("instance_id") + if instance_id: + cur_instances_by_id[instance_id] = instance_data - for instance, changes in update_list: - instance_data = instance.data_to_store() - cur_instance_data = cur_instances_by_id.get(instance.id) - if cur_instance_data is None: - cur_instances.append(instance_data) - continue - for key in set(cur_instance_data) - set(instance_data): - instance_data.pop(key) - instance_data.update(cur_instance_data) - creator.host.write_instances(cur_instances) + for instance, changes in update_list: + instance_data = changes.new_value + cur_instance_data = cur_instances_by_id.get(instance.id) + if cur_instance_data is None: + cur_instances.append(instance_data) + continue + for key in set(cur_instance_data) - set(instance_data): + cur_instance_data.pop(key) + cur_instance_data.update(instance_data) + self.host.write_instances(cur_instances) -class TVPaintCreator(NewCreator): +class TVPaintCreator(NewCreator, TVPaintCreatorCommon): @property def subset_template_family_filter(self): return self.family def collect_instances(self): - _collect_instances(self) + self._collect_create_instances() def update_instances(self, update_list): - _update_instances(self, update_list) + self._update_create_instances(update_list) def remove_instances(self, instances): ids_to_remove = { @@ -129,12 +133,12 @@ class TVPaintCreator(NewCreator): self._add_instance_to_context(new_instance) -class TVPaintAutoCreator(AutoCreator): +class TVPaintAutoCreator(AutoCreator, TVPaintCreatorCommon): def collect_instances(self): - _collect_instances(self) + self._collect_create_instances() def update_instances(self, update_list): - _update_instances(self, update_list) + self._update_create_instances(update_list) class Creator(LegacyCreator): From db7748995617721d7d564d0097f08ab3fecc141f Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 13 Feb 2023 17:24:56 +0100 Subject: [PATCH 198/912] added labels to render pass instances --- .../tvpaint/plugins/create/create_render.py | 70 ++++++++++++++++--- 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index e5d3fa1a59..8f7ba121c1 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -273,6 +273,35 @@ class CreateRenderPass(TVPaintCreator): # Settings mark_for_review = True + def collect_instances(self): + instances_by_identifier = self._cache_and_get_instances() + render_layers = { + instance_data["instance_id"]: { + "variant": instance_data["variant"], + "template_data": prepare_template_data({ + "renderlayer": instance_data["variant"] + }) + } + for instance_data in ( + instances_by_identifier[CreateRenderlayer.identifier] + ) + } + + for instance_data in instances_by_identifier[self.identifier]: + render_layer_instance_id = ( + instance_data + .get("creator_attributes", {}) + .get("render_layer_instance_id") + ) + render_layer_info = render_layers.get(render_layer_instance_id) + self.update_instance_labels( + instance_data, + render_layer_info["variant"], + render_layer_info["template_data"] + ) + instance = CreatedInstance.from_existing(instance_data, self) + self._add_instance_to_context(instance) + def get_dynamic_data( self, variant, task_name, asset_doc, project_name, host_name, instance ): @@ -283,6 +312,29 @@ class CreateRenderPass(TVPaintCreator): dynamic_data["renderlayer"] = "{renderlayer}" return dynamic_data + def update_instance_labels( + self, instance, render_layer_variant, render_layer_data=None + ): + old_label = instance.get("label") + old_group = instance.get("group") + new_label = None + new_group = None + if render_layer_variant is not None: + if render_layer_data is None: + render_layer_data = prepare_template_data({ + "renderlayer": render_layer_variant + }) + try: + new_label = instance["subset"].format(**render_layer_data) + except (KeyError, ValueError): + pass + + new_group = f"{self.get_group_label()} ({render_layer_variant})" + + instance["label"] = new_label + instance["group"] = new_group + return old_group != new_group or old_label != new_label + def create(self, subset_name, instance_data, pre_create_data): render_layer_instance_id = pre_create_data.get( "render_layer_instance_id" @@ -337,6 +389,8 @@ class CreateRenderPass(TVPaintCreator): **prepare_template_data(subset_name_fill_data) ) self.log.info(f"New subset name is \"{new_subset_name}\".") + instance_data["label"] = new_subset_name + instance_data["group"] = f"{self.get_group_label()} ({render_layer})" instance_data["layer_names"] = list(selected_layer_names) if "creator_attributes" not in instance_data: instance_data["creator_attribtues"] = {} @@ -400,14 +454,14 @@ class CreateRenderPass(TVPaintCreator): ] def get_pre_create_attr_defs(self): - render_layers = [] - for instance in self.create_context.instances: - if instance.creator_identifier == CreateRenderlayer.identifier: - render_layers.append({ - "value": instance.id, - "label": instance.label - }) - + render_layers = [ + { + "value": instance.id, + "label": instance.label + } + for instance in self.create_context.instances + if instance.creator_identifier == CreateRenderlayer.identifier + ] if not render_layers: render_layers.append({"value": None, "label": "N/A"}) From d39dd9ce1de40544cbdf612c6f9e5ff00b126129 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Mon, 13 Feb 2023 17:59:40 +0000 Subject: [PATCH 199/912] Correct colorspace when using "View Transform" --- openpype/hosts/maya/api/lib_renderproducts.py | 7 +- openpype/pipeline/colorspace.py | 99 +++++++++---------- openpype/scripts/ocio_wrapper.py | 20 +++- 3 files changed, 70 insertions(+), 56 deletions(-) diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py index 38415c2ae2..4930143fb1 100644 --- a/openpype/hosts/maya/api/lib_renderproducts.py +++ b/openpype/hosts/maya/api/lib_renderproducts.py @@ -46,6 +46,7 @@ import attr from . import lib from . import lib_rendersetup +from openpype.pipeline.colorspace import get_ocio_config_views from maya import cmds, mel @@ -646,7 +647,11 @@ class RenderProductsArnold(ARenderProducts): def _view_transform(): preferences = lib.get_color_management_preferences() - return preferences["view_transform"] + views_data = get_ocio_config_views(preferences["config"]) + view_data = views_data[ + "{}/{}".format(preferences["display"], preferences["view"]) + ] + return view_data["colorspace"] def _raw(): preferences = lib.get_color_management_preferences() diff --git a/openpype/pipeline/colorspace.py b/openpype/pipeline/colorspace.py index cb37b2c4ae..6f68bdc5bf 100644 --- a/openpype/pipeline/colorspace.py +++ b/openpype/pipeline/colorspace.py @@ -198,41 +198,19 @@ def validate_imageio_colorspace_in_config(config_path, colorspace_name): return True -def get_ocio_config_colorspaces(config_path): - """Get all colorspace data - - Wrapper function for aggregating all names and its families. - Families can be used for building menu and submenus in gui. - - Args: - config_path (str): path leading to config.ocio file - - Returns: - dict: colorspace and family in couple - """ - if sys.version_info[0] == 2: - return get_colorspace_data_subprocess(config_path) - - from ..scripts.ocio_wrapper import _get_colorspace_data - return _get_colorspace_data(config_path) - - -def get_colorspace_data_subprocess(config_path): - """Get colorspace data via subprocess +def get_data_subprocess(config_path, data_type): + """Get data via subprocess Wrapper for Python 2 hosts. Args: config_path (str): path leading to config.ocio file - - Returns: - dict: colorspace and family in couple """ with _make_temp_json_file() as tmp_json_path: # Prepare subprocess arguments args = [ "run", get_ocio_config_script_path(), - "config", "get_colorspace", + "config", data_type, "--in_path", config_path, "--out_path", tmp_json_path @@ -251,6 +229,47 @@ def get_colorspace_data_subprocess(config_path): return json.loads(return_json_data) +def compatible_python(): + """Only 3.9 or higher can directly use PyOpenColorIO in ocio_wrapper""" + compatible = False + if sys.version[0] == 3 and sys.version[1] >= 9: + compatible = True + return compatible + + +def get_ocio_config_colorspaces(config_path): + """Get all colorspace data + + Wrapper function for aggregating all names and its families. + Families can be used for building menu and submenus in gui. + + Args: + config_path (str): path leading to config.ocio file + + Returns: + dict: colorspace and family in couple + """ + if compatible_python(): + from ..scripts.ocio_wrapper import _get_colorspace_data + return _get_colorspace_data(config_path) + else: + return get_colorspace_data_subprocess(config_path) + + +def get_colorspace_data_subprocess(config_path): + """Get colorspace data via subprocess + + Wrapper for Python 2 hosts. + + Args: + config_path (str): path leading to config.ocio file + + Returns: + dict: colorspace and family in couple + """ + return get_data_subprocess(config_path, "get_colorspace") + + def get_ocio_config_views(config_path): """Get all viewer data @@ -263,12 +282,12 @@ def get_ocio_config_views(config_path): Returns: dict: `display/viewer` and viewer data """ - if sys.version_info[0] == 2: + if compatible_python(): + from ..scripts.ocio_wrapper import _get_views_data + return _get_views_data(config_path) + else: return get_views_data_subprocess(config_path) - from ..scripts.ocio_wrapper import _get_views_data - return _get_views_data(config_path) - def get_views_data_subprocess(config_path): """Get viewers data via subprocess @@ -281,27 +300,7 @@ def get_views_data_subprocess(config_path): Returns: dict: `display/viewer` and viewer data """ - with _make_temp_json_file() as tmp_json_path: - # Prepare subprocess arguments - args = [ - "run", get_ocio_config_script_path(), - "config", "get_views", - "--in_path", config_path, - "--out_path", tmp_json_path - - ] - log.info("Executing: {}".format(" ".join(args))) - - process_kwargs = { - "logger": log, - "env": {} - } - - run_openpype_process(*args, **process_kwargs) - - # return all colorspaces - return_json_data = open(tmp_json_path).read() - return json.loads(return_json_data) + return get_data_subprocess(config_path, "get_views") def get_imageio_config( diff --git a/openpype/scripts/ocio_wrapper.py b/openpype/scripts/ocio_wrapper.py index 0685b2e52a..aa9e11c841 100644 --- a/openpype/scripts/ocio_wrapper.py +++ b/openpype/scripts/ocio_wrapper.py @@ -157,11 +157,21 @@ def _get_views_data(config_path): config = ocio.Config().CreateFromFile(str(config_path)) - return { - f"{d}/{v}": {"display": d, "view": v} - for d in config.getDisplays() - for v in config.getViews(d) - } + data = {} + for display in config.getDisplays(): + for view in config.getViews(display): + colorspace = config.getDisplayViewColorSpaceName(display, view) + # Special token. See https://opencolorio.readthedocs.io/en/latest/guides/authoring/authoring.html#shared-views + if colorspace == "": + colorspace = display + + data[f"{display}/{view}"] = { + "display": display, + "view": view, + "colorspace": colorspace + } + + return data if __name__ == '__main__': From e21323c78841902bf66f8670b1890a7cde11773c Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Mon, 13 Feb 2023 18:01:38 +0000 Subject: [PATCH 200/912] Hound --- openpype/scripts/ocio_wrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/scripts/ocio_wrapper.py b/openpype/scripts/ocio_wrapper.py index aa9e11c841..16558642c6 100644 --- a/openpype/scripts/ocio_wrapper.py +++ b/openpype/scripts/ocio_wrapper.py @@ -161,7 +161,7 @@ def _get_views_data(config_path): for display in config.getDisplays(): for view in config.getViews(display): colorspace = config.getDisplayViewColorSpaceName(display, view) - # Special token. See https://opencolorio.readthedocs.io/en/latest/guides/authoring/authoring.html#shared-views + # Special token. See https://opencolorio.readthedocs.io/en/latest/guides/authoring/authoring.html#shared-views # noqa if colorspace == "": colorspace = display From 6225083ffe36e197187506e5fd8a59a895e57fb2 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 14 Feb 2023 07:06:56 +0000 Subject: [PATCH 201/912] Default Ftrack Family on RenderLayer With default settings, renderlayers in Maya were not being tagged with the Ftrack family leading to confusion when doing reviews. --- openpype/settings/defaults/project_settings/ftrack.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openpype/settings/defaults/project_settings/ftrack.json b/openpype/settings/defaults/project_settings/ftrack.json index cdf861df4a..ed646e29fa 100644 --- a/openpype/settings/defaults/project_settings/ftrack.json +++ b/openpype/settings/defaults/project_settings/ftrack.json @@ -324,7 +324,8 @@ "animation", "look", "rig", - "camera" + "camera", + "renderlayer" ], "task_types": [], "tasks": [], @@ -494,4 +495,4 @@ "farm_status_profiles": [] } } -} \ No newline at end of file +} From 83c75b8b41be6fc865056b105a75cb9fe5f4dcaa Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 14 Feb 2023 09:08:09 +0000 Subject: [PATCH 202/912] Revert "Default Ftrack Family on RenderLayer" This reverts commit 6225083ffe36e197187506e5fd8a59a895e57fb2. --- openpype/settings/defaults/project_settings/ftrack.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openpype/settings/defaults/project_settings/ftrack.json b/openpype/settings/defaults/project_settings/ftrack.json index ed646e29fa..cdf861df4a 100644 --- a/openpype/settings/defaults/project_settings/ftrack.json +++ b/openpype/settings/defaults/project_settings/ftrack.json @@ -324,8 +324,7 @@ "animation", "look", "rig", - "camera", - "renderlayer" + "camera" ], "task_types": [], "tasks": [], @@ -495,4 +494,4 @@ "farm_status_profiles": [] } } -} +} \ No newline at end of file From bcf020e4fa2d9bd1c653a96a084691a451c37b4f Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 14 Feb 2023 09:19:17 +0000 Subject: [PATCH 203/912] Modify defaults through UI --- openpype/settings/defaults/project_settings/ftrack.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_settings/ftrack.json b/openpype/settings/defaults/project_settings/ftrack.json index cdf861df4a..bd761ccd92 100644 --- a/openpype/settings/defaults/project_settings/ftrack.json +++ b/openpype/settings/defaults/project_settings/ftrack.json @@ -324,7 +324,8 @@ "animation", "look", "rig", - "camera" + "camera", + "renderlayer" ], "task_types": [], "tasks": [], From 6653df6369afbe53905af5eccacd29a2faed72d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Je=C5=BEek?= Date: Tue, 14 Feb 2023 12:18:00 +0100 Subject: [PATCH 204/912] Update openpype/hosts/nuke/plugins/load/load_clip.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- openpype/hosts/nuke/plugins/load/load_clip.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/nuke/plugins/load/load_clip.py b/openpype/hosts/nuke/plugins/load/load_clip.py index f9364172ea..8f9b463037 100644 --- a/openpype/hosts/nuke/plugins/load/load_clip.py +++ b/openpype/hosts/nuke/plugins/load/load_clip.py @@ -222,13 +222,12 @@ class LoadClip(plugin.NukeLoader): representation = deepcopy(representation) context = representation["context"] template = representation["data"]["template"] - frame = context["frame"] - hashed_frame = "#" * len(str(frame)) - if ( "{originalBasename}" in template and "frame" in context ): + frame = context["frame"] + hashed_frame = "#" * len(str(frame)) origin_basename = context["originalBasename"] context["originalBasename"] = origin_basename.replace( frame, hashed_frame From 1505478cbdd7def0ab2040d65d09be823b39d958 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Tue, 14 Feb 2023 21:05:54 +0800 Subject: [PATCH 205/912] add general 3dsmax settings and add max families into submit publish job --- .../hosts/max/plugins/create/create_render.py | 2 - .../max/plugins/publish/collect_render.py | 22 ++++++-- .../plugins/publish/submit_3dmax_deadline.py | 41 +++++++++++--- .../plugins/publish/submit_publish_job.py | 4 +- .../defaults/project_settings/deadline.json | 11 ++++ .../schema_project_deadline.json | 54 +++++++++++++++++++ 6 files changed, 120 insertions(+), 14 deletions(-) diff --git a/openpype/hosts/max/plugins/create/create_render.py b/openpype/hosts/max/plugins/create/create_render.py index 699fc200d3..76c10ca4a9 100644 --- a/openpype/hosts/max/plugins/create/create_render.py +++ b/openpype/hosts/max/plugins/create/create_render.py @@ -20,8 +20,6 @@ class CreateRender(plugin.MaxCreator): pre_create_data) # type: CreatedInstance container_name = instance.data.get("instance_node") container = rt.getNodeByName(container_name) - # chuckSize for submitting render - instance_data["chunkSize"] = 10 # TODO: Disable "Add to Containers?" Panel # parent the selected cameras into the container for obj in sel_obj: diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py index 857ac88ea6..5089f107d3 100644 --- a/openpype/hosts/max/plugins/publish/collect_render.py +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -6,7 +6,7 @@ import pyblish.api from pymxs import runtime as rt from openpype.pipeline import legacy_io from openpype.hosts.max.api.lib_renderproducts import RenderProducts - +from openpype.client import get_last_version_by_subset_name class CollectRender(pyblish.api.InstancePlugin): """Collect Render for Deadline""" @@ -30,6 +30,21 @@ class CollectRender(pyblish.api.InstancePlugin): folder = folder.replace("\\", "/") imgFormat = RenderProducts().image_format() + project_name = context.data["projectName"] + asset_doc = context.data["assetEntity"] + asset_id = asset_doc["_id"] + version_doc = get_last_version_by_subset_name(project_name, + instance.name, + asset_id) + + self.log.debug("version_doc: {0}".format(version_doc)) + version_int = 1 + if version_doc: + version_int += int(version_doc["name"]) + + self.log.debug(f"Setting {version_int} to context.") + context.data["version"] = version_int + # setup the plugin as 3dsmax for the internal renderer data = { "subset": instance.name, @@ -39,10 +54,11 @@ class CollectRender(pyblish.api.InstancePlugin): "family": 'maxrender', "families": ['maxrender'], "source": filepath, - "files": render_layer_files, + "expectedFiles": render_layer_files, "plugin": "3dsmax", "frameStart": context.data['frameStart'], - "frameEnd": context.data['frameEnd'] + "frameEnd": context.data['frameEnd'], + "version": version_int } self.log.info("data: {0}".format(data)) instance.data.update(data) diff --git a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py index 88834e4a91..056e74cf3f 100644 --- a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py @@ -20,6 +20,12 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): hosts = ["max"] families = ["maxrender"] targets = ["local"] + use_published = True + priority = 50 + chunk_size = 1 + group = None + deadline_pool = None + deadline_pool_secondary = None def process(self, instance): context = instance.context @@ -34,6 +40,24 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): start=int(instance.data["frameStart"]), end=int(instance.data["frameEnd"]) ) + if self.use_published: + for item in context: + if "workfile" in item.data["families"]: + msg = "Workfile (scene) must be published along" + assert item.data["publish"] is True, msg + + template_data = item.data.get("anatomyData") + rep = item.data.get("representations")[0].get("name") + template_data["representation"] = rep + template_data["ext"] = rep + template_data["comment"] = None + anatomy_filled = context.data["anatomy"].format(template_data) + template_filled = anatomy_filled["publish"]["path"] + filepath = os.path.normpath(template_filled) + + self.log.info( + "Using published scene for render {}".format(filepath) + ) payload = { "JobInfo": { @@ -47,15 +71,17 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): "UserName": deadline_user, "Plugin": instance.data["plugin"], - "Pool": instance.data.get("primaryPool"), - "secondaryPool": instance.data.get("secondaryPool"), + "Group": self.group, + "Pool": self.deadline_pool, + "secondaryPool": self.deadline_pool_secondary, "Frames": frames, - "ChunkSize": instance.data.get("chunkSize", 10), + "ChunkSize": self.chunk_size, + "Priority": instance.data.get("priority", self.priority), "Comment": comment }, "PluginInfo": { # Input - "SceneFile": instance.data["source"], + "SceneFile": filepath, "Version": "2023", "SaveFile": True, # Mandatory for Deadline @@ -94,7 +120,7 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): # frames from Deadline Monitor output_data = {} # need to be fixed - for i, filepath in enumerate(instance.data["files"]): + for i, filepath in enumerate(instance.data["expectedFiles"]): dirname = os.path.dirname(filepath) fname = os.path.basename(filepath) output_data["OutputDirectory%d" % i] = dirname.replace("\\", "/") @@ -129,9 +155,10 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): response = requests.post(url, json=payload) if not response.ok: raise Exception(response.text) - # Store output dir for unified publisher (filesequence) - expected_files = instance.data["files"] + # Store output dir for unified publisher (expectedFilesequence) + expected_files = instance.data["expectedFiles"] self.log.info("exp:{}".format(expected_files)) output_dir = os.path.dirname(expected_files[0]) + instance.data["toBeRenderedOn"] = "deadline" instance.data["outputDir"] = output_dir instance.data["deadlineSubmissionJob"] = response.json() diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 7e39a644a2..71934aef93 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -117,10 +117,10 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): deadline_plugin = "OpenPype" targets = ["local"] - hosts = ["fusion", "maya", "nuke", "celaction", "aftereffects", "harmony"] + hosts = ["fusion", "max", "maya", "nuke", "celaction", "aftereffects", "harmony"] families = ["render.farm", "prerender.farm", - "renderlayer", "imagesequence", "vrayscene"] + "renderlayer", "imagesequence", "maxrender", "vrayscene"] aov_filter = {"maya": [r".*([Bb]eauty).*"], "aftereffects": [r".*"], # for everything from AE diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json index ceb0b2e39a..0fab284c66 100644 --- a/openpype/settings/defaults/project_settings/deadline.json +++ b/openpype/settings/defaults/project_settings/deadline.json @@ -35,6 +35,17 @@ "pluginInfo": {}, "scene_patches": [] }, + "MaxSubmitRenderDeadline": { + "enabled": true, + "optional": false, + "active": true, + "use_published": true, + "priority": 50, + "chunk_size": 10, + "group": "none", + "deadline_pool": "", + "deadline_pool_secondary": "" + }, "NukeSubmitDeadline": { "enabled": true, "optional": false, diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json index 08a505bd47..afefd3266a 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json @@ -198,6 +198,60 @@ } ] }, + { + "type": "dict", + "collapsible": true, + "key": "MaxSubmitRenderDeadline", + "label": "3dsMax Submit to Deadline", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "optional", + "label": "Optional" + }, + { + "type": "boolean", + "key": "active", + "label": "Active" + }, + { + "type": "boolean", + "key": "use_published", + "label": "Use Published scene" + }, + { + "type": "number", + "key": "priority", + "label": "Priority" + }, + { + "type": "number", + "key": "chunk_size", + "label": "Chunk Size" + }, + { + "type": "text", + "key": "group", + "label": "Group Name" + }, + { + "type": "text", + "key": "deadline_pool", + "label": "Deadline pool" + }, + { + "type": "text", + "key": "deadline_pool_secondary", + "label": "Deadline pool (secondary)" + } + ] + }, { "type": "dict", "collapsible": true, From 0dbf111d05843996f64a789e1a938a84ebf585bd Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Tue, 14 Feb 2023 21:15:46 +0800 Subject: [PATCH 206/912] hound fix --- openpype/hosts/max/plugins/publish/collect_render.py | 1 + .../modules/deadline/plugins/publish/submit_3dmax_deadline.py | 3 ++- .../modules/deadline/plugins/publish/submit_publish_job.py | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py index 5089f107d3..55391d40e8 100644 --- a/openpype/hosts/max/plugins/publish/collect_render.py +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -8,6 +8,7 @@ from openpype.pipeline import legacy_io from openpype.hosts.max.api.lib_renderproducts import RenderProducts from openpype.client import get_last_version_by_subset_name + class CollectRender(pyblish.api.InstancePlugin): """Collect Render for Deadline""" diff --git a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py index 056e74cf3f..dec951da7a 100644 --- a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py @@ -51,7 +51,8 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): template_data["representation"] = rep template_data["ext"] = rep template_data["comment"] = None - anatomy_filled = context.data["anatomy"].format(template_data) + anatomy_data = context.data["anatomy"] + anatomy_filled = anatomy_data.format(template_data) template_filled = anatomy_filled["publish"]["path"] filepath = os.path.normpath(template_filled) diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 71934aef93..b70301ab7e 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -117,7 +117,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): deadline_plugin = "OpenPype" targets = ["local"] - hosts = ["fusion", "max", "maya", "nuke", "celaction", "aftereffects", "harmony"] + hosts = ["fusion", "max", "maya", "nuke", + "celaction", "aftereffects", "harmony"] families = ["render.farm", "prerender.farm", "renderlayer", "imagesequence", "maxrender", "vrayscene"] From 1abe920b5f18e32e51dbdaa8ac60b6dff175e22f Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 14 Feb 2023 14:27:42 +0100 Subject: [PATCH 207/912] anatomy data from instance rather then context --- .../plugins/publish/collect_otio_subset_resources.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openpype/plugins/publish/collect_otio_subset_resources.py b/openpype/plugins/publish/collect_otio_subset_resources.py index dab52986da..f659791d95 100644 --- a/openpype/plugins/publish/collect_otio_subset_resources.py +++ b/openpype/plugins/publish/collect_otio_subset_resources.py @@ -22,7 +22,7 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): """Get Resources for a subset version""" label = "Collect OTIO Subset Resources" - order = pyblish.api.CollectorOrder + 0.0021 + order = pyblish.api.CollectorOrder + 0.491 families = ["clip"] hosts = ["resolve", "hiero", "flame"] @@ -50,9 +50,9 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): # get basic variables otio_clip = instance.data["otioClip"] - otio_avalable_range = otio_clip.available_range() - media_fps = otio_avalable_range.start_time.rate - available_duration = otio_avalable_range.duration.value + otio_available_range = otio_clip.available_range() + media_fps = otio_available_range.start_time.rate + available_duration = otio_available_range.duration.value # get available range trimmed with processed retimes retimed_attributes = get_media_range_with_retimes( @@ -248,7 +248,7 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): # Task can be optional in anatomy data host_name = context.data["hostName"] family = instance.data["family"] - anatomy_data = instance.context.data["anatomyData"] + anatomy_data = instance.data["anatomyData"] task_info = anatomy_data.get("task") or {} return get_publish_template_name( @@ -259,4 +259,4 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): task_type=task_info.get("type"), project_settings=context.data["project_settings"], logger=self.log - ) \ No newline at end of file + ) From 714454d7300cf2e067785c888dadddb415f88baf Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 14 Feb 2023 14:54:25 +0100 Subject: [PATCH 208/912] OP-4643 - fix logging Wrong variable used --- openpype/plugins/publish/extract_review.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py index dcb43d7fa2..0f6dacba18 100644 --- a/openpype/plugins/publish/extract_review.py +++ b/openpype/plugins/publish/extract_review.py @@ -169,7 +169,7 @@ class ExtractReview(pyblish.api.InstancePlugin): "Skipped representation. All output definitions from" " selected profile does not match to representation's" " custom tags. \"{}\"" - ).format(str(tags))) + ).format(str(custom_tags))) continue outputs_per_representations.append((repre, outputs)) From 2b5e4bc14e7a4241ee97a3bbb0716b148ec13513 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 14 Feb 2023 15:14:14 +0100 Subject: [PATCH 209/912] OP-4643 - allow new repre to stay One might want to delete outputs with 'delete' tag, but repre must stay there at least until extract_review. More universal new tag might be created for this. --- openpype/plugins/publish/extract_color_transcode.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 93ee1ec44d..4a03e623fd 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -161,15 +161,17 @@ class ExtractOIIOTranscode(publish.Extractor): new_repre["custom_tags"].extend(custom_tags) # Add additional tags from output definition to representation + if not new_repre.get("tags"): + new_repre["tags"] = [] for tag in output_def["tags"]: - if not new_repre.get("tags"): - new_repre["tags"] = [] if tag not in new_repre["tags"]: new_repre["tags"].append(tag) if tag == "review": added_review = True + new_repre["tags"].append("newly_added") + instance.data["representations"].append(new_repre) added_representations = True @@ -179,6 +181,12 @@ class ExtractOIIOTranscode(publish.Extractor): for repre in tuple(instance.data["representations"]): tags = repre.get("tags") or [] + # TODO implement better way, for now do not delete new repre + # new repre might have 'delete' tag to removed, but it first must + # be there for review to be created + if "newly_added" in tags: + tags.remove("newly_added") + continue if "delete" in tags and "thumbnail" not in tags: instance.data["representations"].remove(repre) From 2621016015b0b2c3e36f36d4c3853851d5154256 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 14 Feb 2023 16:27:43 +0000 Subject: [PATCH 210/912] Template for config. --- .../modules/deadline/plugins/publish/submit_publish_job.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 02aa1043d1..89a4e5d377 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -552,7 +552,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): "colorspace": colorspace, "config": { "path": additional_data["colorspaceConfig"], - "template": "" + "template": additional_data["colorspaceTemplate"] }, "display": additional_data["display"], "view": additional_data["view"] @@ -920,7 +920,10 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): "renderProducts": instance.data["renderProducts"], "colorspaceConfig": instance.data["colorspaceConfig"], "display": instance.data["colorspaceDisplay"], - "view": instance.data["colorspaceView"] + "view": instance.data["colorspaceView"], + "colorspaceTemplate": instance.data["colorspaceConfig"].replace( + context.data["anatomy"].roots["work"], "{root[work]}" + ) } if isinstance(data.get("expectedFiles")[0], dict): From bd8f68c6e9574431886a2dd31b8c1620b38a941f Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 10:37:10 +0100 Subject: [PATCH 211/912] changed collect workfile to instance plugin --- .../plugins/publish/collect_workfile.py | 57 ++++--------------- 1 file changed, 10 insertions(+), 47 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/publish/collect_workfile.py b/openpype/hosts/tvpaint/plugins/publish/collect_workfile.py index 8c7c8c3899..a3449663f8 100644 --- a/openpype/hosts/tvpaint/plugins/publish/collect_workfile.py +++ b/openpype/hosts/tvpaint/plugins/publish/collect_workfile.py @@ -2,17 +2,15 @@ import os import json import pyblish.api -from openpype.client import get_asset_by_name -from openpype.pipeline import legacy_io -from openpype.pipeline.create import get_subset_name - -class CollectWorkfile(pyblish.api.ContextPlugin): +class CollectWorkfile(pyblish.api.InstancePlugin): label = "Collect Workfile" order = pyblish.api.CollectorOrder - 0.4 hosts = ["tvpaint"] + families = ["workfile"] - def process(self, context): + def process(self, instance): + context = instance.context current_file = context.data["currentFile"] self.log.info( @@ -21,49 +19,14 @@ class CollectWorkfile(pyblish.api.ContextPlugin): dirpath, filename = os.path.split(current_file) basename, ext = os.path.splitext(filename) - instance = context.create_instance(name=basename) - # Project name from workfile context - project_name = context.data["workfile_context"]["project"] - - # Get subset name of workfile instance - # Collect asset doc to get asset id - # - not sure if it's good idea to require asset id in - # get_subset_name? - family = "workfile" - asset_name = context.data["workfile_context"]["asset"] - asset_doc = get_asset_by_name(project_name, asset_name) - - # Host name from environment variable - host_name = os.environ["AVALON_APP"] - # Use empty variant value - variant = "" - task_name = legacy_io.Session["AVALON_TASK"] - subset_name = get_subset_name( - family, - variant, - task_name, - asset_doc, - project_name, - host_name, - project_settings=context.data["project_settings"] - ) - - # Create Workfile instance - instance.data.update({ - "subset": subset_name, - "asset": context.data["asset"], - "label": subset_name, - "publish": True, - "family": "workfile", - "families": ["workfile"], - "representations": [{ - "name": ext.lstrip("."), - "ext": ext.lstrip("."), - "files": filename, - "stagingDir": dirpath - }] + instance.data["representations"].append({ + "name": ext.lstrip("."), + "ext": ext.lstrip("."), + "files": filename, + "stagingDir": dirpath }) + self.log.info("Collected workfile instance: {}".format( json.dumps(instance.data, indent=4) )) From d26d9083ce3931ac521ee66a9dd526cf693f5adb Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 10:43:20 +0100 Subject: [PATCH 212/912] fix how context information is returned --- openpype/hosts/tvpaint/api/pipeline.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/tvpaint/api/pipeline.py b/openpype/hosts/tvpaint/api/pipeline.py index 6a729e39c3..3794bf2e24 100644 --- a/openpype/hosts/tvpaint/api/pipeline.py +++ b/openpype/hosts/tvpaint/api/pipeline.py @@ -124,8 +124,11 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): if not context: return get_global_context() + if "project_name" in context: + return context + # This is legacy way how context was stored return { - "project_name": context["project"], + "project_name": context.get("project"), "asset_name": context.get("asset"), "task_name": context.get("task") } From 319c9c60eaae1748cb6662dd9e1c9922d01f17bd Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 10:43:39 +0100 Subject: [PATCH 213/912] added autocreator for scene review --- .../tvpaint/plugins/create/create_review.py | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 openpype/hosts/tvpaint/plugins/create/create_review.py diff --git a/openpype/hosts/tvpaint/plugins/create/create_review.py b/openpype/hosts/tvpaint/plugins/create/create_review.py new file mode 100644 index 0000000000..84127eb9b7 --- /dev/null +++ b/openpype/hosts/tvpaint/plugins/create/create_review.py @@ -0,0 +1,64 @@ +from openpype.client import get_asset_by_name +from openpype.pipeline import CreatedInstance +from openpype.hosts.tvpaint.api.plugin import TVPaintAutoCreator + + +class TVPaintReviewCreator(TVPaintAutoCreator): + family = "review" + identifier = "scene.review" + label = "Review" + + default_variant = "Main" + + def create(self): + existing_instance = None + for instance in self.create_context.instances: + if instance.creator_identifier == self.identifier: + existing_instance = instance + break + + context = self.host.get_current_context() + host_name = self.host.name + project_name = context["project_name"] + asset_name = context["asset_name"] + task_name = context["task_name"] + + if existing_instance is None: + asset_doc = get_asset_by_name(project_name, asset_name) + subset_name = self.get_subset_name( + self.default_variant, + task_name, + asset_doc, + project_name, + host_name + ) + data = { + "asset": asset_name, + "task": task_name, + "variant": self.default_variant + } + + new_instance = CreatedInstance( + self.family, subset_name, data, self + ) + instances_data = self.host.list_instances() + instances_data.append(new_instance.data_to_store()) + self.host.write_instances(instances_data) + self._add_instance_to_context(new_instance) + + elif ( + existing_instance["asset"] != asset_name + or existing_instance["task"] != task_name + ): + asset_doc = get_asset_by_name(project_name, asset_name) + subset_name = self.get_subset_name( + existing_instance["variant"], + task_name, + asset_doc, + project_name, + host_name, + existing_instance + ) + existing_instance["asset"] = asset_name + existing_instance["task"] = task_name + existing_instance["subset"] = subset_name From 8bad64e59f2fb2b10a912d57e451531da8099f7b Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 10:43:48 +0100 Subject: [PATCH 214/912] change lael of workfile creator --- openpype/hosts/tvpaint/plugins/create/create_workfile.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/tvpaint/plugins/create/create_workfile.py b/openpype/hosts/tvpaint/plugins/create/create_workfile.py index 3e5cd86852..e421fbc3f8 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_workfile.py +++ b/openpype/hosts/tvpaint/plugins/create/create_workfile.py @@ -6,6 +6,7 @@ from openpype.hosts.tvpaint.api.plugin import TVPaintAutoCreator class TVPaintWorkfileCreator(TVPaintAutoCreator): family = "workfile" identifier = "workfile" + label = "Workfile" default_variant = "Main" From dae4094d8a3c3ec00f60c13e344a4e211b105ce1 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 10:44:50 +0100 Subject: [PATCH 215/912] change how instance frames are calculated --- .../publish/collect_instance_frames.py | 41 +++++++++---------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/publish/collect_instance_frames.py b/openpype/hosts/tvpaint/plugins/publish/collect_instance_frames.py index d5b79758ad..5eb702a1da 100644 --- a/openpype/hosts/tvpaint/plugins/publish/collect_instance_frames.py +++ b/openpype/hosts/tvpaint/plugins/publish/collect_instance_frames.py @@ -1,37 +1,34 @@ import pyblish.api -class CollectOutputFrameRange(pyblish.api.ContextPlugin): +class CollectOutputFrameRange(pyblish.api.InstancePlugin): """Collect frame start/end from context. When instances are collected context does not contain `frameStart` and `frameEnd` keys yet. They are collected in global plugin `CollectContextEntities`. """ + label = "Collect output frame range" - order = pyblish.api.CollectorOrder + order = pyblish.api.CollectorOrder + 0.4999 hosts = ["tvpaint"] + families = ["review", "render"] - def process(self, context): - for instance in context: - frame_start = instance.data.get("frameStart") - frame_end = instance.data.get("frameEnd") - if frame_start is not None and frame_end is not None: - self.log.debug( - "Instance {} already has set frames {}-{}".format( - str(instance), frame_start, frame_end - ) - ) - return + def process(self, instance): + asset_doc = instance.data.get("assetEntity") + if not asset_doc: + return - frame_start = context.data.get("frameStart") - frame_end = context.data.get("frameEnd") + context = instance.context - instance.data["frameStart"] = frame_start - instance.data["frameEnd"] = frame_end - - self.log.info( - "Set frames {}-{} on instance {} ".format( - frame_start, frame_end, str(instance) - ) + frame_start = asset_doc["data"]["frameStart"] + frame_end = frame_start + ( + context.data["sceneMarkOut"] - context.data["sceneMarkIn"] + ) + instance.data["frameStart"] = frame_start + instance.data["frameEnd"] = frame_end + self.log.info( + "Set frames {}-{} on instance {} ".format( + frame_start, frame_end, instance.data["subset"] ) + ) From 71d9ceb91e5eddc9daa82da27cb21d55d04e3ffb Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 10:45:57 +0100 Subject: [PATCH 216/912] fix collect workfile data --- .../plugins/publish/collect_workfile_data.py | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py b/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py index 8fe71a4a46..95a5cd77bd 100644 --- a/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py +++ b/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py @@ -65,9 +65,9 @@ class CollectWorkfileData(pyblish.api.ContextPlugin): # Collect and store current context to have reference current_context = { - "project": legacy_io.Session["AVALON_PROJECT"], - "asset": legacy_io.Session["AVALON_ASSET"], - "task": legacy_io.Session["AVALON_TASK"] + "project_name": context.data["projectName"], + "asset_name": context.data["asset"], + "task_name": context.data["task"] } context.data["previous_context"] = current_context self.log.debug("Current context is: {}".format(current_context)) @@ -76,25 +76,31 @@ class CollectWorkfileData(pyblish.api.ContextPlugin): self.log.info("Collecting workfile context") workfile_context = get_current_workfile_context() + if "project" in workfile_context: + workfile_context = { + "project_name": workfile_context.get("project"), + "asset_name": workfile_context.get("asset"), + "task_name": workfile_context.get("task"), + } # Store workfile context to pyblish context context.data["workfile_context"] = workfile_context if workfile_context: # Change current context with context from workfile key_map = ( - ("AVALON_ASSET", "asset"), - ("AVALON_TASK", "task") + ("AVALON_ASSET", "asset_name"), + ("AVALON_TASK", "task_name") ) for env_key, key in key_map: legacy_io.Session[env_key] = workfile_context[key] os.environ[env_key] = workfile_context[key] self.log.info("Context changed to: {}".format(workfile_context)) - asset_name = workfile_context["asset"] - task_name = workfile_context["task"] + asset_name = workfile_context["asset_name"] + task_name = workfile_context["task_name"] else: - asset_name = current_context["asset"] - task_name = current_context["task"] + asset_name = current_context["asset_name"] + task_name = current_context["task_name"] # Handle older workfiles or workfiles without metadata self.log.warning(( "Workfile does not contain information about context." @@ -103,6 +109,7 @@ class CollectWorkfileData(pyblish.api.ContextPlugin): # Store context asset name context.data["asset"] = asset_name + context.data["task"] = task_name self.log.info( "Context is set to Asset: \"{}\" and Task: \"{}\"".format( asset_name, task_name From b3e34fce324603cf955f3fcf8dca795995796d98 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 10:46:17 +0100 Subject: [PATCH 217/912] fix few validators --- .../publish/validate_render_pass_group.py | 1 - .../publish/validate_workfile_metadata.py | 17 +++++++++++++---- .../publish/validate_workfile_project_name.py | 7 +++---- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_render_pass_group.py b/openpype/hosts/tvpaint/plugins/publish/validate_render_pass_group.py index 0fbfca6c56..2a3173c698 100644 --- a/openpype/hosts/tvpaint/plugins/publish/validate_render_pass_group.py +++ b/openpype/hosts/tvpaint/plugins/publish/validate_render_pass_group.py @@ -85,6 +85,5 @@ class ValidateLayersGroup(pyblish.api.InstancePlugin): ), "expected_group": correct_group["name"], "layer_names": ", ".join(invalid_layer_names) - } ) diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py b/openpype/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py index d66ae50c60..b38231e208 100644 --- a/openpype/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py +++ b/openpype/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py @@ -1,5 +1,9 @@ import pyblish.api -from openpype.pipeline import PublishXmlValidationError, registered_host +from openpype.pipeline import ( + PublishXmlValidationError, + PublishValidationError, + registered_host, +) class ValidateWorkfileMetadataRepair(pyblish.api.Action): @@ -27,13 +31,18 @@ class ValidateWorkfileMetadata(pyblish.api.ContextPlugin): actions = [ValidateWorkfileMetadataRepair] - required_keys = {"project", "asset", "task"} + required_keys = {"project_name", "asset_name", "task_name"} def process(self, context): workfile_context = context.data["workfile_context"] if not workfile_context: - raise AssertionError( - "Current workfile is missing whole metadata about context." + raise PublishValidationError( + "Current workfile is missing whole metadata about context.", + "Missing context", + ( + "Current workfile is missing metadata about task." + " To fix this issue save the file using Workfiles tool." + ) ) missing_keys = [] diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py b/openpype/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py index 0f25f2f7be..2ed5afa11c 100644 --- a/openpype/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py +++ b/openpype/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py @@ -1,4 +1,3 @@ -import os import pyblish.api from openpype.pipeline import PublishXmlValidationError @@ -16,15 +15,15 @@ class ValidateWorkfileProjectName(pyblish.api.ContextPlugin): def process(self, context): workfile_context = context.data.get("workfile_context") # If workfile context is missing than project is matching to - # `AVALON_PROJECT` value for 100% + # global project if not workfile_context: self.log.info( "Workfile context (\"workfile_context\") is not filled." ) return - workfile_project_name = workfile_context["project"] - env_project_name = os.environ["AVALON_PROJECT"] + workfile_project_name = workfile_context["project_name"] + env_project_name = context.data["projectName"] if workfile_project_name == env_project_name: self.log.info(( "Both workfile project and environment project are same. {}" From 8551b1f1b3969ef1fb2db815883169175dd1b0ce Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 10:59:06 +0100 Subject: [PATCH 218/912] change how extract sequence works --- .../tvpaint/plugins/publish/extract_sequence.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py b/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py index 78074f720c..f2856c72a9 100644 --- a/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py +++ b/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py @@ -6,6 +6,7 @@ from PIL import Image import pyblish.api +from openpype.pipeline.publish import KnownPublishError from openpype.hosts.tvpaint.api.lib import ( execute_george, execute_george_through_file, @@ -24,8 +25,7 @@ from openpype.hosts.tvpaint.lib import ( class ExtractSequence(pyblish.api.Extractor): label = "Extract Sequence" hosts = ["tvpaint"] - families = ["review", "renderPass", "renderLayer", "renderScene"] - families_to_review = ["review"] + families = ["review", "render"] # Modifiable with settings review_bg = [255, 255, 255, 255] @@ -136,7 +136,7 @@ class ExtractSequence(pyblish.api.Extractor): # Fill tags and new families from project settings tags = [] - if family_lowered in self.families_to_review: + if family_lowered == "review": tags.append("review") # Sequence of one frame @@ -162,10 +162,6 @@ class ExtractSequence(pyblish.api.Extractor): instance.data["representations"].append(new_repre) - if family_lowered in ("renderpass", "renderlayer", "renderscene"): - # Change family to render - instance.data["family"] = "render" - if not thumbnail_fullpath: return @@ -259,7 +255,7 @@ class ExtractSequence(pyblish.api.Extractor): output_filepaths_by_frame_idx[frame_idx] = filepath if not os.path.exists(filepath): - raise AssertionError( + raise KnownPublishError( "Output was not rendered. File was not found {}".format( filepath ) From ff7b3004ad953253afbc8e3a9640aa99a24f1c47 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 11:00:10 +0100 Subject: [PATCH 219/912] added validator for duplicated usage of render layer groups --- .../help/validate_render_layer_group.xml | 18 +++++ .../publish/validate_render_layer_group.py | 74 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 openpype/hosts/tvpaint/plugins/publish/help/validate_render_layer_group.xml create mode 100644 openpype/hosts/tvpaint/plugins/publish/validate_render_layer_group.py diff --git a/openpype/hosts/tvpaint/plugins/publish/help/validate_render_layer_group.xml b/openpype/hosts/tvpaint/plugins/publish/help/validate_render_layer_group.xml new file mode 100644 index 0000000000..a95387356f --- /dev/null +++ b/openpype/hosts/tvpaint/plugins/publish/help/validate_render_layer_group.xml @@ -0,0 +1,18 @@ + + + +Overused Color group +## One Color group is used by multiple Render Layers + +Single color group used by multiple Render Layers would cause clashes of rendered TVPaint layers. The same layers would be used for output files of both groups. + +### Missing layer names + +{groups_information} + +### How to repair? + +Refresh, go to 'Publish' tab and go through Render Layers and change their groups to not clash each other. If you reach limit of TVPaint color groups there is nothing you can do about it to fix the issue. + + + diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_render_layer_group.py b/openpype/hosts/tvpaint/plugins/publish/validate_render_layer_group.py new file mode 100644 index 0000000000..bb0a9a4ffe --- /dev/null +++ b/openpype/hosts/tvpaint/plugins/publish/validate_render_layer_group.py @@ -0,0 +1,74 @@ +import collections +import pyblish.api +from openpype.pipeline import PublishXmlValidationError + + +class ValidateRenderLayerGroups(pyblish.api.ContextPlugin): + """Validate group ids of renderLayer subsets. + + Validate that there are not 2 render layers using the same group. + """ + + label = "Validate Render Layers Group" + order = pyblish.api.ValidatorOrder + 0.1 + + def process(self, context): + # Prepare layers + render_layers_by_group_id = collections.defaultdict(list) + for instance in context: + families = instance.data.get("families") + if not families or "renderLayer" not in families: + continue + + group_id = instance.data["creator_attributes"]["group_id"] + render_layers_by_group_id[group_id].append(instance) + + duplicated_instances = [] + for group_id, instances in render_layers_by_group_id.items(): + if len(instances) > 1: + duplicated_instances.append((group_id, instances)) + + if not duplicated_instances: + return + + # Exception message preparations + groups_data = context.data["groupsData"] + groups_by_id = { + group["group_id"]: group + for group in groups_data + } + + per_group_msgs = [] + groups_information_lines = [] + for group_id, instances in duplicated_instances: + group = groups_by_id[group_id] + group_label = "Group \"{}\" ({})".format( + group["name"], + group["group_id"], + ) + line_join_subset_names = "\n".join([ + f" - {instance['subset']}" + for instance in instances + ]) + joined_subset_names = ", ".join([ + f"\"{instance['subset']}\"" + for instance in instances + ]) + per_group_msgs.append( + "{} < {} >".format(group_label, joined_subset_names) + ) + groups_information_lines.append( + "{}\n{}".format(group_label, line_join_subset_names) + ) + + # Raise an error + raise PublishXmlValidationError( + self, + ( + "More than one Render Layer is using the same TVPaint" + " group color. {}" + ).format(" | ".join(per_group_msgs)), + formatting_data={ + "groups_information": "\n".join(groups_information_lines) + } + ) From b405cac45cc082cfd30e735a0b8e8ee0859aae74 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 11:07:59 +0100 Subject: [PATCH 220/912] implemented new collection of render instances --- .../plugins/publish/collect_instances.py | 280 ------------------ .../publish/collect_render_instances.py | 87 ++++++ 2 files changed, 87 insertions(+), 280 deletions(-) delete mode 100644 openpype/hosts/tvpaint/plugins/publish/collect_instances.py create mode 100644 openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py diff --git a/openpype/hosts/tvpaint/plugins/publish/collect_instances.py b/openpype/hosts/tvpaint/plugins/publish/collect_instances.py deleted file mode 100644 index ae1326a5bd..0000000000 --- a/openpype/hosts/tvpaint/plugins/publish/collect_instances.py +++ /dev/null @@ -1,280 +0,0 @@ -import json -import copy -import pyblish.api - -from openpype.client import get_asset_by_name -from openpype.pipeline import legacy_io -from openpype.pipeline.create import get_subset_name - - -class CollectInstances(pyblish.api.ContextPlugin): - label = "Collect Instances" - order = pyblish.api.CollectorOrder - 0.4 - hosts = ["tvpaint"] - - def process(self, context): - workfile_instances = context.data["workfileInstances"] - - self.log.debug("Collected ({}) instances:\n{}".format( - len(workfile_instances), - json.dumps(workfile_instances, indent=4) - )) - - filtered_instance_data = [] - # Backwards compatibility for workfiles that already have review - # instance in metadata. - review_instance_exist = False - for instance_data in workfile_instances: - family = instance_data["family"] - if family == "review": - review_instance_exist = True - - elif family not in ("renderPass", "renderLayer"): - self.log.info("Unknown family \"{}\". Skipping {}".format( - family, json.dumps(instance_data, indent=4) - )) - continue - - filtered_instance_data.append(instance_data) - - # Fake review instance if review was not found in metadata families - if not review_instance_exist: - filtered_instance_data.append( - self._create_review_instance_data(context) - ) - - for instance_data in filtered_instance_data: - instance_data["fps"] = context.data["sceneFps"] - - # Conversion from older instances - # - change 'render_layer' to 'renderlayer' - render_layer = instance_data.get("instance_data") - if not render_layer: - # Render Layer has only variant - if instance_data["family"] == "renderLayer": - render_layer = instance_data.get("variant") - - # Backwards compatibility for renderPasses - elif "render_layer" in instance_data: - render_layer = instance_data["render_layer"] - - if render_layer: - instance_data["renderlayer"] = render_layer - - # Store workfile instance data to instance data - instance_data["originData"] = copy.deepcopy(instance_data) - # Global instance data modifications - # Fill families - family = instance_data["family"] - families = [family] - if family != "review": - families.append("review") - # Add `review` family for thumbnail integration - instance_data["families"] = families - - # Instance name - subset_name = instance_data["subset"] - name = instance_data.get("name", subset_name) - instance_data["name"] = name - instance_data["label"] = "{} [{}-{}]".format( - name, - context.data["sceneMarkIn"] + 1, - context.data["sceneMarkOut"] + 1 - ) - - active = instance_data.get("active", True) - instance_data["active"] = active - instance_data["publish"] = active - # Add representations key - instance_data["representations"] = [] - - # Different instance creation based on family - instance = None - if family == "review": - # Change subset name of review instance - - # Project name from workfile context - project_name = context.data["workfile_context"]["project"] - - # Collect asset doc to get asset id - # - not sure if it's good idea to require asset id in - # get_subset_name? - asset_name = context.data["workfile_context"]["asset"] - asset_doc = get_asset_by_name(project_name, asset_name) - - # Host name from environment variable - host_name = context.data["hostName"] - # Use empty variant value - variant = "" - task_name = legacy_io.Session["AVALON_TASK"] - new_subset_name = get_subset_name( - family, - variant, - task_name, - asset_doc, - project_name, - host_name, - project_settings=context.data["project_settings"] - ) - instance_data["subset"] = new_subset_name - - instance = context.create_instance(**instance_data) - - instance.data["layers"] = copy.deepcopy( - context.data["layersData"] - ) - - elif family == "renderLayer": - instance = self.create_render_layer_instance( - context, instance_data - ) - elif family == "renderPass": - instance = self.create_render_pass_instance( - context, instance_data - ) - - if instance is None: - continue - - any_visible = False - for layer in instance.data["layers"]: - if layer["visible"]: - any_visible = True - break - - instance.data["publish"] = any_visible - - self.log.debug("Created instance: {}\n{}".format( - instance, json.dumps(instance.data, indent=4) - )) - - def _create_review_instance_data(self, context): - """Fake review instance data.""" - - return { - "family": "review", - "asset": context.data["asset"], - # Dummy subset name - "subset": "reviewMain" - } - - def create_render_layer_instance(self, context, instance_data): - name = instance_data["name"] - # Change label - subset_name = instance_data["subset"] - - # Backwards compatibility - # - subset names were not stored as final subset names during creation - if "variant" not in instance_data: - instance_data["label"] = "{}_Beauty".format(name) - - # Change subset name - # Final family of an instance will be `render` - new_family = "render" - task_name = legacy_io.Session["AVALON_TASK"] - new_subset_name = "{}{}_{}_Beauty".format( - new_family, task_name.capitalize(), name - ) - instance_data["subset"] = new_subset_name - self.log.debug("Changed subset name \"{}\"->\"{}\"".format( - subset_name, new_subset_name - )) - - # Get all layers for the layer - layers_data = context.data["layersData"] - group_id = instance_data["group_id"] - group_layers = [] - for layer in layers_data: - if layer["group_id"] == group_id: - group_layers.append(layer) - - if not group_layers: - # Should be handled here? - self.log.warning(( - f"Group with id {group_id} does not contain any layers." - f" Instance \"{name}\" not created." - )) - return None - - instance_data["layers"] = group_layers - - return context.create_instance(**instance_data) - - def create_render_pass_instance(self, context, instance_data): - pass_name = instance_data["pass"] - self.log.info( - "Creating render pass instance. \"{}\"".format(pass_name) - ) - # Change label - render_layer = instance_data["renderlayer"] - - # Backwards compatibility - # - subset names were not stored as final subset names during creation - if "variant" not in instance_data: - instance_data["label"] = "{}_{}".format(render_layer, pass_name) - # Change subset name - # Final family of an instance will be `render` - new_family = "render" - old_subset_name = instance_data["subset"] - task_name = legacy_io.Session["AVALON_TASK"] - new_subset_name = "{}{}_{}_{}".format( - new_family, task_name.capitalize(), render_layer, pass_name - ) - instance_data["subset"] = new_subset_name - self.log.debug("Changed subset name \"{}\"->\"{}\"".format( - old_subset_name, new_subset_name - )) - - layers_data = context.data["layersData"] - layers_by_name = { - layer["name"]: layer - for layer in layers_data - } - - if "layer_names" in instance_data: - layer_names = instance_data["layer_names"] - else: - # Backwards compatibility - # - not 100% working as it was found out that layer ids can't be - # used as unified identifier across multiple workstations - layers_by_id = { - layer["layer_id"]: layer - for layer in layers_data - } - layer_ids = instance_data["layer_ids"] - layer_names = [] - for layer_id in layer_ids: - layer = layers_by_id.get(layer_id) - if layer: - layer_names.append(layer["name"]) - - if not layer_names: - raise ValueError(( - "Metadata contain old way of storing layers information." - " It is not possible to identify layers to publish with" - " these data. Please remove Render Pass instances with" - " Subset manager and use Creator tool to recreate them." - )) - - render_pass_layers = [] - for layer_name in layer_names: - layer = layers_by_name.get(layer_name) - # NOTE This is kind of validation before validators? - if not layer: - self.log.warning( - f"Layer with name {layer_name} was not found." - ) - continue - - render_pass_layers.append(layer) - - if not render_pass_layers: - name = instance_data["name"] - self.log.warning( - f"None of the layers from the RenderPass \"{name}\"" - " exist anymore. Instance not created." - ) - return None - - instance_data["layers"] = render_pass_layers - return context.create_instance(**instance_data) diff --git a/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py b/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py new file mode 100644 index 0000000000..34bb5aba24 --- /dev/null +++ b/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py @@ -0,0 +1,87 @@ +import copy +import pyblish.api +from openpype.lib import prepare_template_data + + +class CollectRenderInstances(pyblish.api.InstancePlugin): + label = "Collect Render Instances" + order = pyblish.api.CollectorOrder - 0.4 + hosts = ["tvpaint"] + families = ["render", "review"] + + def process(self, instance): + context = instance.context + creator_identifier = instance.data["creator_identifier"] + if creator_identifier == "render.layer": + self._collect_data_for_render_layer(instance) + + elif creator_identifier == "render.pass": + self._collect_data_for_render_pass(instance) + + else: + if creator_identifier == "scene.review": + self._collect_data_for_review(instance) + return + + subset_name = instance.data["subset"] + instance.data["name"] = subset_name + instance.data["label"] = "{} [{}-{}]".format( + subset_name, + context.data["sceneMarkIn"] + 1, + context.data["sceneMarkOut"] + 1 + ) + + def _collect_data_for_render_layer(self, instance): + instance.data["families"].append("renderLayer") + creator_attributes = instance.data["creator_attributes"] + group_id = creator_attributes["group_id"] + if creator_attributes["mark_for_review"]: + instance.data["families"].append("review") + + layers_data = instance.context.data["layersData"] + instance.data["layers"] = [ + copy.deepcopy(layer) + for layer in layers_data + if layer["group_id"] == group_id + ] + + def _collect_data_for_render_pass(self, instance): + instance.data["families"].append("renderPass") + + layer_names = set(instance.data["layer_names"]) + layers_data = instance.context.data["layersData"] + + creator_attributes = instance.data["creator_attributes"] + if creator_attributes["mark_for_review"]: + instance.data["families"].append("review") + + instance.data["layers"] = [ + copy.deepcopy(layer) + for layer in layers_data + if layer["name"] in layer_names + ] + + render_layer_data = None + render_layer_id = creator_attributes["render_layer_instance_id"] + for in_data in instance.context.data["workfileInstances"]: + if ( + in_data["creator_identifier"] == "render.layer" + and in_data["instance_id"] == render_layer_id + ): + render_layer_data = in_data + break + + instance.data["renderLayerData"] = copy.deepcopy(render_layer_data) + # Invalid state + if render_layer_data is None: + return + render_layer_name = render_layer_data["variant"] + subset_name = instance.data["subset"] + instance.data["subset"] = subset_name.format( + **prepare_template_data({"renderlayer": render_layer_name}) + ) + + def _collect_data_for_review(self, instance): + instance.data["layers"] = copy.deepcopy( + instance.context.data["layersData"] + ) From db75420899f3419e937dbf7b88d6f89e8dc42ae1 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 11:09:49 +0100 Subject: [PATCH 221/912] removed legacy creators --- .../plugins/create/create_render_layer.py | 231 ------------------ .../plugins/create/create_render_pass.py | 167 ------------- 2 files changed, 398 deletions(-) delete mode 100644 openpype/hosts/tvpaint/plugins/create/create_render_layer.py delete mode 100644 openpype/hosts/tvpaint/plugins/create/create_render_pass.py diff --git a/openpype/hosts/tvpaint/plugins/create/create_render_layer.py b/openpype/hosts/tvpaint/plugins/create/create_render_layer.py deleted file mode 100644 index 009b69c4f1..0000000000 --- a/openpype/hosts/tvpaint/plugins/create/create_render_layer.py +++ /dev/null @@ -1,231 +0,0 @@ -from openpype.lib import prepare_template_data -from openpype.pipeline import CreatorError -from openpype.hosts.tvpaint.api import ( - plugin, - CommunicationWrapper -) -from openpype.hosts.tvpaint.api.lib import ( - get_layers_data, - get_groups_data, - execute_george_through_file, -) -from openpype.hosts.tvpaint.api.pipeline import list_instances - - -class CreateRenderlayer(plugin.Creator): - """Mark layer group as one instance.""" - name = "render_layer" - label = "RenderLayer" - family = "renderLayer" - icon = "cube" - defaults = ["Main"] - - rename_group = True - render_pass = "beauty" - - rename_script_template = ( - "tv_layercolor \"setcolor\"" - " {clip_id} {group_id} {r} {g} {b} \"{name}\"" - ) - - dynamic_subset_keys = [ - "renderpass", "renderlayer", "render_pass", "render_layer", "group" - ] - - @classmethod - def get_dynamic_data( - cls, variant, task_name, asset_id, project_name, host_name - ): - dynamic_data = super(CreateRenderlayer, cls).get_dynamic_data( - variant, task_name, asset_id, project_name, host_name - ) - # Use render pass name from creator's plugin - dynamic_data["renderpass"] = cls.render_pass - # Add variant to render layer - dynamic_data["renderlayer"] = variant - # Change family for subset name fill - dynamic_data["family"] = "render" - - # TODO remove - Backwards compatibility for old subset name templates - # - added 2022/04/28 - dynamic_data["render_pass"] = dynamic_data["renderpass"] - dynamic_data["render_layer"] = dynamic_data["renderlayer"] - - return dynamic_data - - @classmethod - def get_default_variant(cls): - """Default value for variant in Creator tool. - - Method checks if TVPaint implementation is running and tries to find - selected layers from TVPaint. If only one is selected it's name is - returned. - - Returns: - str: Default variant name for Creator tool. - """ - # Validate that communication is initialized - if CommunicationWrapper.communicator: - # Get currently selected layers - layers_data = get_layers_data() - - selected_layers = [ - layer - for layer in layers_data - if layer["selected"] - ] - # Return layer name if only one is selected - if len(selected_layers) == 1: - return selected_layers[0]["name"] - - # Use defaults - if cls.defaults: - return cls.defaults[0] - return None - - def process(self): - self.log.debug("Query data from workfile.") - instances = list_instances() - layers_data = get_layers_data() - - self.log.debug("Checking for selection groups.") - # Collect group ids from selection - group_ids = set() - for layer in layers_data: - if layer["selected"]: - group_ids.add(layer["group_id"]) - - # Raise if there is no selection - if not group_ids: - raise CreatorError("Nothing is selected.") - - # This creator should run only on one group - if len(group_ids) > 1: - raise CreatorError("More than one group is in selection.") - - group_id = tuple(group_ids)[0] - # If group id is `0` it is `default` group which is invalid - if group_id == 0: - raise CreatorError( - "Selection is not in group. Can't mark selection as Beauty." - ) - - self.log.debug(f"Selected group id is \"{group_id}\".") - self.data["group_id"] = group_id - - group_data = get_groups_data() - group_name = None - for group in group_data: - if group["group_id"] == group_id: - group_name = group["name"] - break - - if group_name is None: - raise AssertionError( - "Couldn't find group by id \"{}\"".format(group_id) - ) - - subset_name_fill_data = { - "group": group_name - } - - family = self.family = self.data["family"] - - # Fill dynamic key 'group' - subset_name = self.data["subset"].format( - **prepare_template_data(subset_name_fill_data) - ) - self.data["subset"] = subset_name - - # Check for instances of same group - existing_instance = None - existing_instance_idx = None - # Check if subset name is not already taken - same_subset_instance = None - same_subset_instance_idx = None - for idx, instance in enumerate(instances): - if instance["family"] == family: - if instance["group_id"] == group_id: - existing_instance = instance - existing_instance_idx = idx - elif instance["subset"] == subset_name: - same_subset_instance = instance - same_subset_instance_idx = idx - - if ( - same_subset_instance_idx is not None - and existing_instance_idx is not None - ): - break - - if same_subset_instance_idx is not None: - if self._ask_user_subset_override(same_subset_instance): - instances.pop(same_subset_instance_idx) - else: - return - - if existing_instance is not None: - self.log.info( - f"Beauty instance for group id {group_id} already exists" - ", overriding" - ) - instances[existing_instance_idx] = self.data - else: - instances.append(self.data) - - self.write_instances(instances) - - if not self.rename_group: - self.log.info("Group rename function is turned off. Skipping") - return - - self.log.debug("Querying groups data from workfile.") - groups_data = get_groups_data() - - self.log.debug("Changing name of the group.") - selected_group = None - for group_data in groups_data: - if group_data["group_id"] == group_id: - selected_group = group_data - - # Rename TVPaint group (keep color same) - # - groups can't contain spaces - new_group_name = self.data["variant"].replace(" ", "_") - rename_script = self.rename_script_template.format( - clip_id=selected_group["clip_id"], - group_id=selected_group["group_id"], - r=selected_group["red"], - g=selected_group["green"], - b=selected_group["blue"], - name=new_group_name - ) - execute_george_through_file(rename_script) - - self.log.info( - f"Name of group with index {group_id}" - f" was changed to \"{new_group_name}\"." - ) - - def _ask_user_subset_override(self, instance): - from qtpy import QtCore - from qtpy.QtWidgets import QMessageBox - - title = "Subset \"{}\" already exist".format(instance["subset"]) - text = ( - "Instance with subset name \"{}\" already exists." - "\n\nDo you want to override existing?" - ).format(instance["subset"]) - - dialog = QMessageBox() - dialog.setWindowFlags( - dialog.windowFlags() - | QtCore.Qt.WindowStaysOnTopHint - ) - dialog.setWindowTitle(title) - dialog.setText(text) - dialog.setStandardButtons(QMessageBox.Yes | QMessageBox.No) - dialog.setDefaultButton(QMessageBox.Yes) - dialog.exec_() - if dialog.result() == QMessageBox.Yes: - return True - return False diff --git a/openpype/hosts/tvpaint/plugins/create/create_render_pass.py b/openpype/hosts/tvpaint/plugins/create/create_render_pass.py deleted file mode 100644 index a44cb29f20..0000000000 --- a/openpype/hosts/tvpaint/plugins/create/create_render_pass.py +++ /dev/null @@ -1,167 +0,0 @@ -from openpype.pipeline import CreatorError -from openpype.lib import prepare_template_data -from openpype.hosts.tvpaint.api import ( - plugin, - CommunicationWrapper -) -from openpype.hosts.tvpaint.api.lib import get_layers_data -from openpype.hosts.tvpaint.api.pipeline import list_instances - - -class CreateRenderPass(plugin.Creator): - """Render pass is combination of one or more layers from same group. - - Requirement to create Render Pass is to have already created beauty - instance. Beauty instance is used as base for subset name. - """ - name = "render_pass" - label = "RenderPass" - family = "renderPass" - icon = "cube" - defaults = ["Main"] - - dynamic_subset_keys = [ - "renderpass", "renderlayer", "render_pass", "render_layer" - ] - - @classmethod - def get_dynamic_data( - cls, variant, task_name, asset_id, project_name, host_name - ): - dynamic_data = super(CreateRenderPass, cls).get_dynamic_data( - variant, task_name, asset_id, project_name, host_name - ) - dynamic_data["renderpass"] = variant - dynamic_data["family"] = "render" - - # TODO remove - Backwards compatibility for old subset name templates - # - added 2022/04/28 - dynamic_data["render_pass"] = dynamic_data["renderpass"] - - return dynamic_data - - @classmethod - def get_default_variant(cls): - """Default value for variant in Creator tool. - - Method checks if TVPaint implementation is running and tries to find - selected layers from TVPaint. If only one is selected it's name is - returned. - - Returns: - str: Default variant name for Creator tool. - """ - # Validate that communication is initialized - if CommunicationWrapper.communicator: - # Get currently selected layers - layers_data = get_layers_data() - - selected_layers = [ - layer - for layer in layers_data - if layer["selected"] - ] - # Return layer name if only one is selected - if len(selected_layers) == 1: - return selected_layers[0]["name"] - - # Use defaults - if cls.defaults: - return cls.defaults[0] - return None - - def process(self): - self.log.debug("Query data from workfile.") - instances = list_instances() - layers_data = get_layers_data() - - self.log.debug("Checking selection.") - # Get all selected layers and their group ids - group_ids = set() - selected_layers = [] - for layer in layers_data: - if layer["selected"]: - selected_layers.append(layer) - group_ids.add(layer["group_id"]) - - # Raise if nothing is selected - if not selected_layers: - raise CreatorError("Nothing is selected.") - - # Raise if layers from multiple groups are selected - if len(group_ids) != 1: - raise CreatorError("More than one group is in selection.") - - group_id = tuple(group_ids)[0] - self.log.debug(f"Selected group id is \"{group_id}\".") - - # Find beauty instance for selected layers - beauty_instance = None - for instance in instances: - if ( - instance["family"] == "renderLayer" - and instance["group_id"] == group_id - ): - beauty_instance = instance - break - - # Beauty is required for this creator so raise if was not found - if beauty_instance is None: - raise CreatorError("Beauty pass does not exist yet.") - - subset_name = self.data["subset"] - - subset_name_fill_data = {} - - # Backwards compatibility - # - beauty may be created with older creator where variant was not - # stored - if "variant" not in beauty_instance: - render_layer = beauty_instance["name"] - else: - render_layer = beauty_instance["variant"] - - subset_name_fill_data["renderlayer"] = render_layer - subset_name_fill_data["render_layer"] = render_layer - - # Format dynamic keys in subset name - new_subset_name = subset_name.format( - **prepare_template_data(subset_name_fill_data) - ) - self.data["subset"] = new_subset_name - self.log.info(f"New subset name is \"{new_subset_name}\".") - - family = self.data["family"] - variant = self.data["variant"] - - self.data["group_id"] = group_id - self.data["pass"] = variant - self.data["renderlayer"] = render_layer - - # Collect selected layer ids to be stored into instance - layer_names = [layer["name"] for layer in selected_layers] - self.data["layer_names"] = layer_names - - # Check if same instance already exists - existing_instance = None - existing_instance_idx = None - for idx, instance in enumerate(instances): - if ( - instance["family"] == family - and instance["group_id"] == group_id - and instance["pass"] == variant - ): - existing_instance = instance - existing_instance_idx = idx - break - - if existing_instance is not None: - self.log.info( - f"Render pass instance for group id {group_id}" - f" and name \"{variant}\" already exists, overriding." - ) - instances[existing_instance_idx] = self.data - else: - instances.append(self.data) - - self.write_instances(instances) From 6097a9627607a70bb91d977274da8bd9f39742b6 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 12:14:53 +0100 Subject: [PATCH 222/912] added option to use 'subset_template_family_filter' in all tvpaint creators --- openpype/hosts/tvpaint/api/plugin.py | 62 +++++++++++++++------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/openpype/hosts/tvpaint/api/plugin.py b/openpype/hosts/tvpaint/api/plugin.py index d267d87acd..397e4295f5 100644 --- a/openpype/hosts/tvpaint/api/plugin.py +++ b/openpype/hosts/tvpaint/api/plugin.py @@ -22,6 +22,10 @@ SHARED_DATA_KEY = "openpype.tvpaint.instances" class TVPaintCreatorCommon: + @property + def subset_template_family_filter(self): + return self.family + def _cache_and_get_instances(self): return cache_and_get_instances( self, SHARED_DATA_KEY, self.host.list_instances @@ -56,12 +60,33 @@ class TVPaintCreatorCommon: cur_instance_data.update(instance_data) self.host.write_instances(cur_instances) + def _custom_get_subset_name( + self, + variant, + task_name, + asset_doc, + project_name, + host_name=None, + instance=None + ): + dynamic_data = self.get_dynamic_data( + variant, task_name, asset_doc, project_name, host_name, instance + ) + + return get_subset_name( + self.family, + variant, + task_name, + asset_doc, + project_name, + host_name, + dynamic_data=dynamic_data, + project_settings=self.project_settings, + family_filter=self.subset_template_family_filter + ) + class TVPaintCreator(NewCreator, TVPaintCreatorCommon): - @property - def subset_template_family_filter(self): - return self.family - def collect_instances(self): self._collect_create_instances() @@ -101,30 +126,8 @@ class TVPaintCreator(NewCreator, TVPaintCreatorCommon): output["task"] = task_name return output - def get_subset_name( - self, - variant, - task_name, - asset_doc, - project_name, - host_name=None, - instance=None - ): - dynamic_data = self.get_dynamic_data( - variant, task_name, asset_doc, project_name, host_name, instance - ) - - return get_subset_name( - self.family, - variant, - task_name, - asset_doc, - project_name, - host_name, - dynamic_data=dynamic_data, - project_settings=self.project_settings, - family_filter=self.subset_template_family_filter - ) + def get_subset_name(self, *args, **kwargs): + return self._custom_get_subset_name(*args, **kwargs) def _store_new_instance(self, new_instance): instances_data = self.host.list_instances() @@ -140,6 +143,9 @@ class TVPaintAutoCreator(AutoCreator, TVPaintCreatorCommon): def update_instances(self, update_list): self._update_create_instances(update_list) + def get_subset_name(self, *args, **kwargs): + return self._custom_get_subset_name(*args, **kwargs) + class Creator(LegacyCreator): def __init__(self, *args, **kwargs): From d727ec1f5f58b1fcd18401cd9ad03b9a690a2cff Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 12:23:24 +0100 Subject: [PATCH 223/912] added screne render auto creator --- .../tvpaint/plugins/create/create_render.py | 125 +++++++++++++++++- .../publish/collect_render_instances.py | 22 +++ .../plugins/publish/collect_scene_render.py | 114 ---------------- 3 files changed, 146 insertions(+), 115 deletions(-) delete mode 100644 openpype/hosts/tvpaint/plugins/publish/collect_scene_render.py diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 8f7ba121c1..2b693d4bc0 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -32,6 +32,7 @@ Todos: import collections +from openpype.client import get_asset_by_name from openpype.lib import ( prepare_template_data, EnumDef, @@ -42,7 +43,10 @@ from openpype.pipeline.create import ( CreatedInstance, CreatorError, ) -from openpype.hosts.tvpaint.api.plugin import TVPaintCreator +from openpype.hosts.tvpaint.api.plugin import ( + TVPaintCreator, + TVPaintAutoCreator, +) from openpype.hosts.tvpaint.api.lib import ( get_layers_data, get_groups_data, @@ -480,3 +484,122 @@ class CreateRenderPass(TVPaintCreator): def get_instance_attr_defs(self): return self.get_pre_create_attr_defs() + + +class TVPaintSceneRenderCreator(TVPaintAutoCreator): + family = "render" + subset_template_family_filter = "renderScene" + identifier = "render.scene" + label = "Scene Render" + + # Settings + default_variant = "Main" + default_pass_name = "beauty" + mark_for_review = True + + def get_dynamic_data(self, variant, *args, **kwargs): + dynamic_data = super().get_dynamic_data(variant, *args, **kwargs) + dynamic_data["renderpass"] = "{renderpass}" + dynamic_data["renderlayer"] = variant + return dynamic_data + + def _create_new_instance(self): + context = self.host.get_current_context() + host_name = self.host.name + project_name = context["project_name"] + asset_name = context["asset_name"] + task_name = context["task_name"] + + asset_doc = get_asset_by_name(project_name, asset_name) + subset_name = self.get_subset_name( + self.default_variant, + task_name, + asset_doc, + project_name, + host_name + ) + data = { + "asset": asset_name, + "task": task_name, + "variant": self.default_variant, + "creator_attributes": { + "render_pass_name": self.default_pass_name, + "mark_for_review": True + }, + "label": self._get_label( + subset_name, + self.default_pass_name + ) + } + + new_instance = CreatedInstance( + self.family, subset_name, data, self + ) + instances_data = self.host.list_instances() + instances_data.append(new_instance.data_to_store()) + self.host.write_instances(instances_data) + self._add_instance_to_context(new_instance) + return new_instance + + def create(self): + existing_instance = None + for instance in self.create_context.instances: + if instance.creator_identifier == self.identifier: + existing_instance = instance + break + + if existing_instance is None: + return self._create_new_instance() + + context = self.host.get_current_context() + host_name = self.host.name + project_name = context["project_name"] + asset_name = context["asset_name"] + task_name = context["task_name"] + + if ( + existing_instance["asset"] != asset_name + or existing_instance["task"] != task_name + ): + asset_doc = get_asset_by_name(project_name, asset_name) + subset_name = self.get_subset_name( + existing_instance["variant"], + task_name, + asset_doc, + project_name, + host_name, + existing_instance + ) + existing_instance["asset"] = asset_name + existing_instance["task"] = task_name + existing_instance["subset"] = subset_name + + existing_instance["label"] = self._get_label( + existing_instance["subset"], + existing_instance["creator_attributes"]["render_pass_name"] + ) + + + + def _get_label(self, subset_name, render_layer_name): + return subset_name.format(**prepare_template_data({ + "renderlayer": render_layer_name + })) + + def get_instance_attr_defs(self): + return [ + TextDef( + "render_pass_name", + label="Pass Name", + default=self.default_pass_name, + tooltip=( + "Value is calculated during publishing and UI will update" + " label after refresh." + ) + ), + BoolDef( + "mark_for_review", + label="Review", + default=self.mark_for_review + ) + ] \ No newline at end of file diff --git a/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py b/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py index 34bb5aba24..ba89deac5d 100644 --- a/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py +++ b/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py @@ -18,6 +18,9 @@ class CollectRenderInstances(pyblish.api.InstancePlugin): elif creator_identifier == "render.pass": self._collect_data_for_render_pass(instance) + elif creator_identifier == "render.scene": + self._collect_data_for_render_scene(instance) + else: if creator_identifier == "scene.review": self._collect_data_for_review(instance) @@ -81,6 +84,25 @@ class CollectRenderInstances(pyblish.api.InstancePlugin): **prepare_template_data({"renderlayer": render_layer_name}) ) + def _collect_data_for_render_scene(self, instance): + instance.data["families"].append("renderScene") + + creator_attributes = instance.data["creator_attributes"] + if creator_attributes["mark_for_review"]: + instance.data["families"].append("review") + + instance.data["layers"] = copy.deepcopy( + instance.context.data["layersData"] + ) + + render_pass_name = ( + instance.data["creator_attributes"]["render_pass_name"] + ) + subset_name = instance.data["subset"] + instance.data["subset"] = subset_name.format( + **prepare_template_data({"renderpass": render_pass_name}) + ) + def _collect_data_for_review(self, instance): instance.data["layers"] = copy.deepcopy( instance.context.data["layersData"] diff --git a/openpype/hosts/tvpaint/plugins/publish/collect_scene_render.py b/openpype/hosts/tvpaint/plugins/publish/collect_scene_render.py deleted file mode 100644 index 92a2815ba0..0000000000 --- a/openpype/hosts/tvpaint/plugins/publish/collect_scene_render.py +++ /dev/null @@ -1,114 +0,0 @@ -import json -import copy -import pyblish.api - -from openpype.client import get_asset_by_name -from openpype.pipeline.create import get_subset_name - - -class CollectRenderScene(pyblish.api.ContextPlugin): - """Collect instance which renders whole scene in PNG. - - Creates instance with family 'renderScene' which will have all layers - to render which will be composite into one result. The instance is not - collected from scene. - - Scene will be rendered with all visible layers similar way like review is. - - Instance is disabled if there are any created instances of 'renderLayer' - or 'renderPass'. That is because it is expected that this instance is - used as lazy publish of TVPaint file. - - Subset name is created similar way like 'renderLayer' family. It can use - `renderPass` and `renderLayer` keys which can be set using settings and - `variant` is filled using `renderPass` value. - """ - label = "Collect Render Scene" - order = pyblish.api.CollectorOrder - 0.39 - hosts = ["tvpaint"] - - # Value of 'render_pass' in subset name template - render_pass = "beauty" - - # Settings attributes - enabled = False - # Value of 'render_layer' and 'variant' in subset name template - render_layer = "Main" - - def process(self, context): - # Check if there are created instances of renderPass and renderLayer - # - that will define if renderScene instance is enabled after - # collection - any_created_instance = False - for instance in context: - family = instance.data["family"] - if family in ("renderPass", "renderLayer"): - any_created_instance = True - break - - # Global instance data modifications - # Fill families - family = "renderScene" - # Add `review` family for thumbnail integration - families = [family, "review"] - - # Collect asset doc to get asset id - # - not sure if it's good idea to require asset id in - # get_subset_name? - workfile_context = context.data["workfile_context"] - # Project name from workfile context - project_name = context.data["workfile_context"]["project"] - asset_name = workfile_context["asset"] - asset_doc = get_asset_by_name(project_name, asset_name) - - # Host name from environment variable - host_name = context.data["hostName"] - # Variant is using render pass name - variant = self.render_layer - dynamic_data = { - "renderlayer": self.render_layer, - "renderpass": self.render_pass, - } - # TODO remove - Backwards compatibility for old subset name templates - # - added 2022/04/28 - dynamic_data["render_layer"] = dynamic_data["renderlayer"] - dynamic_data["render_pass"] = dynamic_data["renderpass"] - - task_name = workfile_context["task"] - subset_name = get_subset_name( - "render", - variant, - task_name, - asset_doc, - project_name, - host_name, - dynamic_data=dynamic_data, - project_settings=context.data["project_settings"] - ) - - instance_data = { - "family": family, - "families": families, - "fps": context.data["sceneFps"], - "subset": subset_name, - "name": subset_name, - "label": "{} [{}-{}]".format( - subset_name, - context.data["sceneMarkIn"] + 1, - context.data["sceneMarkOut"] + 1 - ), - "active": not any_created_instance, - "publish": not any_created_instance, - "representations": [], - "layers": copy.deepcopy(context.data["layersData"]), - "asset": asset_name, - "task": task_name, - # Add render layer to instance data - "renderlayer": self.render_layer - } - - instance = context.create_instance(**instance_data) - - self.log.debug("Created instance: {}\n{}".format( - instance, json.dumps(instance.data, indent=4) - )) From b21d55c10d9885c1d184e609253592bf4f44c6e7 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 12:24:09 +0100 Subject: [PATCH 224/912] change families filter for validate layers visibility --- openpype/hosts/tvpaint/plugins/create/create_render.py | 2 +- .../hosts/tvpaint/plugins/publish/validate_layers_visibility.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 2b693d4bc0..2d44282879 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -602,4 +602,4 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator): label="Review", default=self.mark_for_review ) - ] \ No newline at end of file + ] diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_layers_visibility.py b/openpype/hosts/tvpaint/plugins/publish/validate_layers_visibility.py index d3a04cc69f..47632453fc 100644 --- a/openpype/hosts/tvpaint/plugins/publish/validate_layers_visibility.py +++ b/openpype/hosts/tvpaint/plugins/publish/validate_layers_visibility.py @@ -8,7 +8,7 @@ class ValidateLayersVisiblity(pyblish.api.InstancePlugin): label = "Validate Layers Visibility" order = pyblish.api.ValidatorOrder - families = ["review", "renderPass", "renderLayer", "renderScene"] + families = ["review", "render"] def process(self, instance): layer_names = set() From 8598d5c1f3f5d10c9c72ad4c0f413cb5119d70fb Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 12:25:18 +0100 Subject: [PATCH 225/912] remove empty lines --- openpype/hosts/tvpaint/plugins/create/create_render.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 2d44282879..7acd9b2260 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -579,8 +579,6 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator): existing_instance["creator_attributes"]["render_pass_name"] ) - - def _get_label(self, subset_name, render_layer_name): return subset_name.format(**prepare_template_data({ "renderlayer": render_layer_name From 122a72506257bf15354b0dedf20fdd73495c8c47 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 15:17:25 +0100 Subject: [PATCH 226/912] implemented basic of conver plugin --- .../tvpaint/plugins/create/convert_legacy.py | 135 ++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 openpype/hosts/tvpaint/plugins/create/convert_legacy.py diff --git a/openpype/hosts/tvpaint/plugins/create/convert_legacy.py b/openpype/hosts/tvpaint/plugins/create/convert_legacy.py new file mode 100644 index 0000000000..79244b4fc4 --- /dev/null +++ b/openpype/hosts/tvpaint/plugins/create/convert_legacy.py @@ -0,0 +1,135 @@ +import collections + +from openpype.pipeline.create.creator_plugins import ( + SubsetConvertorPlugin, + cache_and_get_instances, +) +from openpype.hosts.tvpaint.api.plugin import SHARED_DATA_KEY +from openpype.hosts.tvpaint.api.lib import get_groups_data + + +class TVPaintLegacyConverted(SubsetConvertorPlugin): + identifier = "tvpaint.legacy.converter" + + def find_instances(self): + instances = cache_and_get_instances( + self, SHARED_DATA_KEY, self.host.list_instances + ) + + for instance in instances: + if instance.get("creator_identifier") is None: + self.add_convertor_item("Convert legacy instances") + return + + def convert(self): + current_instances = self.host.list_instances() + to_convert = collections.defaultdict(list) + converted = False + for instance in current_instances: + if instance.get("creator_identifier") is not None: + continue + converted = True + + family = instance.get("family") + if family in ( + "renderLayer", + "renderPass", + "renderScene", + "review", + "workfile", + ): + to_convert[family].append(instance) + else: + instance["keep"] = False + + # Skip if nothing was changed + if not converted: + self.remove_convertor_item() + return + + self._convert_render_layers( + to_convert["renderLayer"], current_instances) + self._convert_render_passes( + to_convert["renderpass"], current_instances) + self._convert_render_scenes( + to_convert["renderScene"], current_instances) + self._convert_workfiles( + to_convert["workfile"], current_instances) + self._convert_reviews( + to_convert["review"], current_instances) + + new_instances = [ + instance + for instance in current_instances + if instance.get("keep") is not False + ] + self.host.write_instances(new_instances) + # remove legacy item if all is fine + self.remove_convertor_item() + + def _convert_render_layers(self, render_layers, current_instances): + if not render_layers: + return + + render_layers_by_group_id = {} + for instance in current_instances: + if instance.get("creator_identifier") == "render.layer": + group_id = instance["creator_identifier"]["group_id"] + render_layers_by_group_id[group_id] = instance + + groups_by_id = { + group["group_id"]: group + for group in get_groups_data() + } + for render_layer in render_layers: + group_id = render_layer.pop("group_id") + if group_id in render_layers_by_group_id: + render_layer["keep"] = False + continue + render_layer["creator_identifier"] = "render.layer" + render_layer["instance_id"] = render_layer.pop("uuid") + render_layer["creator_attributes"] = { + "group_id": group_id + } + render_layer["family"] = "render" + group = groups_by_id[group_id] + group["variant"] = group["name"] + + def _convert_render_passes(self, render_passes, current_instances): + if not render_passes: + return + + render_layers_by_group_id = {} + for instance in current_instances: + if instance.get("creator_identifier") == "render.layer": + group_id = instance["creator_identifier"]["group_id"] + render_layers_by_group_id[group_id] = instance + + for render_pass in render_passes: + group_id = render_pass.pop("group_id") + render_layer = render_layers_by_group_id.get(group_id) + if not render_layer: + render_pass["keep"] = False + continue + + render_pass["creator_identifier"] = "render.pass" + render_pass["instance_id"] = render_pass.pop("uuid") + render_pass["family"] = "render" + + render_pass["creator_attributes"] = { + "render_layer_instance_id": render_layer["instance_id"] + } + render_pass["variant"] = render_pass.pop("pass") + render_pass.pop("renderlayer") + + def _convert_render_scenes(self, render_scenes, current_instances): + for render_scene in render_scenes: + render_scene["keep"] = False + + def _convert_workfiles(self, workfiles, current_instances): + for render_scene in workfiles: + render_scene["keep"] = False + + def _convert_reviews(self, reviews, current_instances): + for render_scene in reviews: + render_scene["keep"] = False From 06e11a45c20740307a45273ee236d44f3272d55c Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 15:17:39 +0100 Subject: [PATCH 227/912] removed legacy creator --- openpype/hosts/tvpaint/api/plugin.py | 47 ++-------------------------- 1 file changed, 3 insertions(+), 44 deletions(-) diff --git a/openpype/hosts/tvpaint/api/plugin.py b/openpype/hosts/tvpaint/api/plugin.py index 397e4295f5..64784bfb83 100644 --- a/openpype/hosts/tvpaint/api/plugin.py +++ b/openpype/hosts/tvpaint/api/plugin.py @@ -1,21 +1,15 @@ import re -import uuid -from openpype.pipeline import ( - LegacyCreator, - LoaderPlugin, - registered_host, -) +from openpype.pipeline import LoaderPlugin from openpype.pipeline.create import ( CreatedInstance, get_subset_name, AutoCreator, - Creator as NewCreator, + Creator, ) from openpype.pipeline.create.creator_plugins import cache_and_get_instances from .lib import get_layers_data -from .pipeline import get_current_workfile_context SHARED_DATA_KEY = "openpype.tvpaint.instances" @@ -86,7 +80,7 @@ class TVPaintCreatorCommon: ) -class TVPaintCreator(NewCreator, TVPaintCreatorCommon): +class TVPaintCreator(Creator, TVPaintCreatorCommon): def collect_instances(self): self._collect_create_instances() @@ -147,41 +141,6 @@ class TVPaintAutoCreator(AutoCreator, TVPaintCreatorCommon): return self._custom_get_subset_name(*args, **kwargs) -class Creator(LegacyCreator): - def __init__(self, *args, **kwargs): - super(Creator, self).__init__(*args, **kwargs) - # Add unified identifier created with `uuid` module - self.data["uuid"] = str(uuid.uuid4()) - - @classmethod - def get_dynamic_data(cls, *args, **kwargs): - dynamic_data = super(Creator, cls).get_dynamic_data(*args, **kwargs) - - # Change asset and name by current workfile context - workfile_context = get_current_workfile_context() - asset_name = workfile_context.get("asset") - task_name = workfile_context.get("task") - if "asset" not in dynamic_data and asset_name: - dynamic_data["asset"] = asset_name - - if "task" not in dynamic_data and task_name: - dynamic_data["task"] = task_name - return dynamic_data - - def write_instances(self, data): - self.log.debug( - "Storing instance data to workfile. {}".format(str(data)) - ) - host = registered_host() - return host.write_instances(data) - - def process(self): - host = registered_host() - data = host.list_instances() - data.append(self.data) - self.write_instances(data) - - class Loader(LoaderPlugin): hosts = ["tvpaint"] From 3b87087a574fc35aa8cb7c7d190f1a5f8291f5c5 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 15:39:51 +0100 Subject: [PATCH 228/912] don't use project document during context settings --- openpype/hosts/tvpaint/api/pipeline.py | 55 +++++--------------------- 1 file changed, 10 insertions(+), 45 deletions(-) diff --git a/openpype/hosts/tvpaint/api/pipeline.py b/openpype/hosts/tvpaint/api/pipeline.py index 3794bf2e24..88ad3b4b4d 100644 --- a/openpype/hosts/tvpaint/api/pipeline.py +++ b/openpype/hosts/tvpaint/api/pipeline.py @@ -147,27 +147,6 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): def write_instances(self, data): return write_instances(data) - # --- Legacy Create --- - def remove_instance(self, instance): - """Remove instance from current workfile metadata. - - Implementation for Subset manager tool. - """ - - current_instances = get_workfile_metadata(SECTION_NAME_INSTANCES) - instance_id = instance.get("uuid") - found_idx = None - if instance_id: - for idx, _inst in enumerate(current_instances): - if _inst["uuid"] == instance_id: - found_idx = idx - break - - if found_idx is None: - return - current_instances.pop(found_idx) - write_instances(current_instances) - # --- Workfile --- def open_workfile(self, filepath): george_script = "tv_LoadProject '\"'\"{}\"'\"'".format( @@ -515,17 +494,19 @@ def set_context_settings(asset_doc=None): Change fps, resolution and frame start/end. """ - project_name = legacy_io.active_project() - if asset_doc is None: - asset_name = legacy_io.Session["AVALON_ASSET"] - # Use current session asset if not passed - asset_doc = get_asset_by_name(project_name, asset_name) + width_key = "resolutionWidth" + height_key = "resolutionHeight" - project_doc = get_project(project_name) + width = asset_doc["data"].get(width_key) + height = asset_doc["data"].get(height_key) + if width is None or height is None: + print("Resolution was not found!") + else: + execute_george( + "tv_resizepage {} {} 0".format(width, height) + ) framerate = asset_doc["data"].get("fps") - if framerate is None: - framerate = project_doc["data"].get("fps") if framerate is not None: execute_george( @@ -534,22 +515,6 @@ def set_context_settings(asset_doc=None): else: print("Framerate was not found!") - width_key = "resolutionWidth" - height_key = "resolutionHeight" - - width = asset_doc["data"].get(width_key) - height = asset_doc["data"].get(height_key) - if width is None or height is None: - width = project_doc["data"].get(width_key) - height = project_doc["data"].get(height_key) - - if width is None or height is None: - print("Resolution was not found!") - else: - execute_george( - "tv_resizepage {} {} 0".format(width, height) - ) - frame_start = asset_doc["data"].get("frameStart") frame_end = asset_doc["data"].get("frameEnd") From 7438aebc58217d85327360ee228e469dd138b168 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 15:40:16 +0100 Subject: [PATCH 229/912] remove logic related to pyblish instance toggle --- openpype/hosts/tvpaint/api/pipeline.py | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/openpype/hosts/tvpaint/api/pipeline.py b/openpype/hosts/tvpaint/api/pipeline.py index 88ad3b4b4d..4a737f8f72 100644 --- a/openpype/hosts/tvpaint/api/pipeline.py +++ b/openpype/hosts/tvpaint/api/pipeline.py @@ -87,10 +87,6 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): registered_callbacks = ( pyblish.api.registered_callbacks().get("instanceToggled") or [] ) - if self.on_instance_toggle not in registered_callbacks: - pyblish.api.register_callback( - "instanceToggled", self.on_instance_toggle - ) register_event_callback("application.launched", self.initial_launch) register_event_callback("application.exit", self.application_exit) @@ -209,28 +205,6 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): rest_api_url = "{}/timers_manager/stop_timer".format(webserver_url) requests.post(rest_api_url) - # --- Legacy Publish --- - def on_instance_toggle(self, instance, old_value, new_value): - """Update instance data in workfile on publish toggle.""" - # Review may not have real instance in wokrfile metadata - if not instance.data.get("uuid"): - return - - instance_id = instance.data["uuid"] - found_idx = None - current_instances = list_instances() - for idx, workfile_instance in enumerate(current_instances): - if workfile_instance.get("uuid") == instance_id: - found_idx = idx - break - - if found_idx is None: - return - - if "active" in current_instances[found_idx]: - current_instances[found_idx]["active"] = new_value - self.write_instances(current_instances) - def containerise( name, namespace, members, context, loader, current_containers=None From 7721520dd8cbb58b96a39cc2bb46ce0034767db2 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 15:40:36 +0100 Subject: [PATCH 230/912] set context settings is called with explicit arguments --- openpype/hosts/tvpaint/api/pipeline.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/tvpaint/api/pipeline.py b/openpype/hosts/tvpaint/api/pipeline.py index 4a737f8f72..575e6aa755 100644 --- a/openpype/hosts/tvpaint/api/pipeline.py +++ b/openpype/hosts/tvpaint/api/pipeline.py @@ -185,7 +185,15 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): return log.info("Setting up project...") - set_context_settings() + global_context = get_global_context() + project_name = global_context.get("project_name") + asset_name = global_context.get("aset_name") + if not project_name or not asset_name: + return + + asset_doc = get_asset_by_name(project_name, asset_name) + + set_context_settings(project_name, asset_doc) def application_exit(self): """Logic related to TimerManager. @@ -462,7 +470,7 @@ def get_containers(): return output -def set_context_settings(asset_doc=None): +def set_context_settings(project_name, asset_doc): """Set workfile settings by asset document data. Change fps, resolution and frame start/end. From 118cf08d91e9fd3a4a540a5bf5d118198965fad6 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 15:40:50 +0100 Subject: [PATCH 231/912] removed not needed tools --- .../hosts/tvpaint/api/communication_server.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/openpype/hosts/tvpaint/api/communication_server.py b/openpype/hosts/tvpaint/api/communication_server.py index 6fd2d69373..e94e64e04a 100644 --- a/openpype/hosts/tvpaint/api/communication_server.py +++ b/openpype/hosts/tvpaint/api/communication_server.py @@ -309,8 +309,6 @@ class QtTVPaintRpc(BaseTVPaintRpc): self.add_methods( (route_name, self.workfiles_tool), (route_name, self.loader_tool), - (route_name, self.creator_tool), - (route_name, self.subset_manager_tool), (route_name, self.publish_tool), (route_name, self.scene_inventory_tool), (route_name, self.library_loader_tool), @@ -330,18 +328,6 @@ class QtTVPaintRpc(BaseTVPaintRpc): self._execute_in_main_thread(item) return - async def creator_tool(self): - log.info("Triggering Creator tool") - item = MainThreadItem(self.tools_helper.show_creator) - await self._async_execute_in_main_thread(item, wait=False) - - async def subset_manager_tool(self): - log.info("Triggering Subset Manager tool") - item = MainThreadItem(self.tools_helper.show_subset_manager) - # Do not wait for result of callback - self._execute_in_main_thread(item, wait=False) - return - async def publish_tool(self): log.info("Triggering Publish tool") item = MainThreadItem(self.tools_helper.show_publisher_tool) @@ -859,10 +845,6 @@ class QtCommunicator(BaseCommunicator): "callback": "loader_tool", "label": "Load", "help": "Open loader tool" - }, { - "callback": "creator_tool", - "label": "Create", - "help": "Open creator tool" }, { "callback": "scene_inventory_tool", "label": "Scene inventory", From 38ff3adc4ea9e614f44f7fbbb84655bb91b87250 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 15:42:17 +0100 Subject: [PATCH 232/912] use context from create context --- openpype/hosts/tvpaint/api/plugin.py | 8 +++----- .../tvpaint/plugins/create/create_render.py | 20 +++++++++---------- .../tvpaint/plugins/create/create_review.py | 10 +++++----- .../tvpaint/plugins/create/create_workfile.py | 10 +++++----- 4 files changed, 23 insertions(+), 25 deletions(-) diff --git a/openpype/hosts/tvpaint/api/plugin.py b/openpype/hosts/tvpaint/api/plugin.py index 64784bfb83..96b99199f2 100644 --- a/openpype/hosts/tvpaint/api/plugin.py +++ b/openpype/hosts/tvpaint/api/plugin.py @@ -31,7 +31,6 @@ class TVPaintCreatorCommon: instance = CreatedInstance.from_existing(instance_data, self) self._add_instance_to_context(instance) - def _update_create_instances(self, update_list): if not update_list: return @@ -109,10 +108,9 @@ class TVPaintCreator(Creator, TVPaintCreatorCommon): def get_dynamic_data(self, *args, **kwargs): # Change asset and name by current workfile context - # TODO use context from 'create_context' - workfile_context = self.host.get_current_context() - asset_name = workfile_context.get("asset") - task_name = workfile_context.get("task") + create_context = self.create_context + asset_name = create_context.get_current_asset_name() + task_name = create_context.get_current_task_name() output = {} if asset_name: output["asset"] = asset_name diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 7acd9b2260..0df066edc4 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -504,11 +504,11 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator): return dynamic_data def _create_new_instance(self): - context = self.host.get_current_context() - host_name = self.host.name - project_name = context["project_name"] - asset_name = context["asset_name"] - task_name = context["task_name"] + create_context = self.create_context + host_name = create_context.host_name + project_name = create_context.get_current_project_name() + asset_name = create_context.get_current_asset_name() + task_name = create_context.get_current_task_name() asset_doc = get_asset_by_name(project_name, asset_name) subset_name = self.get_subset_name( @@ -551,11 +551,11 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator): if existing_instance is None: return self._create_new_instance() - context = self.host.get_current_context() - host_name = self.host.name - project_name = context["project_name"] - asset_name = context["asset_name"] - task_name = context["task_name"] + create_context = self.create_context + host_name = create_context.host_name + project_name = create_context.get_current_project_name() + asset_name = create_context.get_current_asset_name() + task_name = create_context.get_current_task_name() if ( existing_instance["asset"] != asset_name diff --git a/openpype/hosts/tvpaint/plugins/create/create_review.py b/openpype/hosts/tvpaint/plugins/create/create_review.py index 84127eb9b7..1c220831bf 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_review.py +++ b/openpype/hosts/tvpaint/plugins/create/create_review.py @@ -17,11 +17,11 @@ class TVPaintReviewCreator(TVPaintAutoCreator): existing_instance = instance break - context = self.host.get_current_context() - host_name = self.host.name - project_name = context["project_name"] - asset_name = context["asset_name"] - task_name = context["task_name"] + create_context = self.create_context + host_name = create_context.host_name + project_name = create_context.get_current_project_name() + asset_name = create_context.get_current_asset_name() + task_name = create_context.get_current_task_name() if existing_instance is None: asset_doc = get_asset_by_name(project_name, asset_name) diff --git a/openpype/hosts/tvpaint/plugins/create/create_workfile.py b/openpype/hosts/tvpaint/plugins/create/create_workfile.py index e421fbc3f8..d968e4f77d 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_workfile.py +++ b/openpype/hosts/tvpaint/plugins/create/create_workfile.py @@ -17,11 +17,11 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator): existing_instance = instance break - context = self.host.get_current_context() - host_name = self.host.name - project_name = context["project_name"] - asset_name = context["asset_name"] - task_name = context["task_name"] + create_context = self.create_context + host_name = create_context.host_name + project_name = create_context.get_current_project_name() + asset_name = create_context.get_current_asset_name() + task_name = create_context.get_current_task_name() if existing_instance is None: asset_doc = get_asset_by_name(project_name, asset_name) From 0abcbc152390c00aa596b80ccc40c6a64c4861c4 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 15 Feb 2023 16:04:59 +0100 Subject: [PATCH 233/912] OP-4642 - added additional command arguments to Settings --- .../schemas/schema_global_publish.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 3956f403f4..5333d514b5 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -286,6 +286,20 @@ "label": "View", "type": "text" }, + { + "key": "oiiotool_args", + "label": "OIIOtool arguments", + "type": "dict", + "highlight_content": true, + "children": [ + { + "key": "additional_command_args", + "label": "Additional command line arguments", + "type": "list", + "object_type": "text" + } + ] + }, { "type": "schema", "name": "schema_representation_tags" From 5ec5cda2bcd1e68de459496c20a1cc9699ba7144 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 15 Feb 2023 16:08:06 +0100 Subject: [PATCH 234/912] OP-4642 - added additional command arguments for oiiotool Some extension requires special command line arguments (.dpx and binary depth). --- openpype/lib/transcoding.py | 6 ++++++ openpype/plugins/publish/extract_color_transcode.py | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 18273dd432..95042fb74c 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1047,6 +1047,7 @@ def convert_colorspace( target_colorspace, view=None, display=None, + additional_command_args=None, logger=None ): """Convert source file from one color space to another. @@ -1066,6 +1067,8 @@ def convert_colorspace( view (str): name for viewer space (ocio valid) both 'view' and 'display' must be filled (if 'target_colorspace') display (str): name for display-referred reference space (ocio valid) + additional_command_args (list): arguments for oiiotool (like binary + depth for .dpx) logger (logging.Logger): Logger used for logging. Raises: ValueError: if misconfigured @@ -1088,6 +1091,9 @@ def convert_colorspace( if not target_colorspace and not all([view, display]): raise ValueError("Both screen and display must be set.") + if additional_command_args: + oiio_cmd.extend(additional_command_args) + if target_colorspace: oiio_cmd.extend(["--colorconvert", source_colorspace, diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 4a03e623fd..3de404125d 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -128,6 +128,9 @@ class ExtractOIIOTranscode(publish.Extractor): if display: new_repre["colorspaceData"]["display"] = display + additional_command_args = (output_def["oiiotool_args"] + ["additional_command_args"]) + files_to_convert = self._translate_to_sequence( files_to_convert) for file_name in files_to_convert: @@ -144,6 +147,7 @@ class ExtractOIIOTranscode(publish.Extractor): target_colorspace, view, display, + additional_command_args, self.log ) From b30979b8c1a4d4da0d998862516f95a89e522d9d Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 15 Feb 2023 16:21:25 +0100 Subject: [PATCH 235/912] OP-4642 - refactored newly added representations --- openpype/plugins/publish/extract_color_transcode.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 3de404125d..8c4ef59de9 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -82,6 +82,7 @@ class ExtractOIIOTranscode(publish.Extractor): if not profile: return + new_representations = [] repres = instance.data.get("representations") or [] for idx, repre in enumerate(list(repres)): self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) @@ -174,9 +175,7 @@ class ExtractOIIOTranscode(publish.Extractor): if tag == "review": added_review = True - new_repre["tags"].append("newly_added") - - instance.data["representations"].append(new_repre) + new_representations.append(new_repre) added_representations = True if added_representations: @@ -185,15 +184,11 @@ class ExtractOIIOTranscode(publish.Extractor): for repre in tuple(instance.data["representations"]): tags = repre.get("tags") or [] - # TODO implement better way, for now do not delete new repre - # new repre might have 'delete' tag to removed, but it first must - # be there for review to be created - if "newly_added" in tags: - tags.remove("newly_added") - continue if "delete" in tags and "thumbnail" not in tags: instance.data["representations"].remove(repre) + instance.data["representations"].extend(new_representations) + def _rename_in_representation(self, new_repre, files_to_convert, output_name, output_extension): """Replace old extension with new one everywhere in representation. From 73cca8299506e95b2ec515e6ac085b85a9b2049d Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 15 Feb 2023 16:24:53 +0100 Subject: [PATCH 236/912] OP-4642 - refactored query of representations line 73 returns if no representations. --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 8c4ef59de9..de36ea7d5f 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -83,7 +83,7 @@ class ExtractOIIOTranscode(publish.Extractor): return new_representations = [] - repres = instance.data.get("representations") or [] + repres = instance.data["representations"] for idx, repre in enumerate(list(repres)): self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) if not self._repre_is_valid(repre): From 0182f73e32f42f130bf71249ce137d1b95788953 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 16:51:23 +0100 Subject: [PATCH 237/912] fix double spaces --- openpype/hosts/tvpaint/plugins/create/create_render.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 0df066edc4..2069a657b9 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -228,7 +228,7 @@ class CreateRenderlayer(TVPaintCreator): render_layer_instances = {} render_pass_instances = collections.defaultdict(list) - for instance in self.create_context.instances: + for instance in self.create_context.instances: if instance.creator_identifier == CreateRenderPass.identifier: render_layer_id = ( instance["creator_attributes"]["render_layer_instance_id"] From 7397bdcac23619177998c8460a9297af5d135319 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 17:52:42 +0100 Subject: [PATCH 238/912] added host property to legacy convertor --- openpype/pipeline/create/creator_plugins.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openpype/pipeline/create/creator_plugins.py b/openpype/pipeline/create/creator_plugins.py index 53acb618ed..14c5d70462 100644 --- a/openpype/pipeline/create/creator_plugins.py +++ b/openpype/pipeline/create/creator_plugins.py @@ -79,6 +79,10 @@ class SubsetConvertorPlugin(object): self._log = Logger.get_logger(self.__class__.__name__) return self._log + @property + def host(self): + return self._create_context.host + @abstractproperty def identifier(self): """Converted identifier. From bb112ad1560294c92285b8794dedf28dad5c72cb Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 17:53:01 +0100 Subject: [PATCH 239/912] fix legacy convertor --- openpype/hosts/tvpaint/plugins/create/convert_legacy.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/convert_legacy.py b/openpype/hosts/tvpaint/plugins/create/convert_legacy.py index 79244b4fc4..215c87f3e5 100644 --- a/openpype/hosts/tvpaint/plugins/create/convert_legacy.py +++ b/openpype/hosts/tvpaint/plugins/create/convert_legacy.py @@ -12,14 +12,11 @@ class TVPaintLegacyConverted(SubsetConvertorPlugin): identifier = "tvpaint.legacy.converter" def find_instances(self): - instances = cache_and_get_instances( + instances_by_identifier = cache_and_get_instances( self, SHARED_DATA_KEY, self.host.list_instances ) - - for instance in instances: - if instance.get("creator_identifier") is None: - self.add_convertor_item("Convert legacy instances") - return + if instances_by_identifier[None]: + self.add_convertor_item("Convert legacy instances") def convert(self): current_instances = self.host.list_instances() From c0f9811808c6a60f221c1b80a3c3e6bd76d4a6ac Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 17:53:14 +0100 Subject: [PATCH 240/912] fix render scene subset name creation --- openpype/hosts/tvpaint/plugins/create/create_render.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 2069a657b9..d2eb693ab9 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -579,9 +579,9 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator): existing_instance["creator_attributes"]["render_pass_name"] ) - def _get_label(self, subset_name, render_layer_name): + def _get_label(self, subset_name, render_pass_name): return subset_name.format(**prepare_template_data({ - "renderlayer": render_layer_name + "renderpass": render_pass_name })) def get_instance_attr_defs(self): From 54be749de62cbc5ee2847a71d6ddb4a02c7ff04c Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 17:55:25 +0100 Subject: [PATCH 241/912] safe string formatting --- .../tvpaint/plugins/create/create_render.py | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index d2eb693ab9..ebce695801 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -389,11 +389,16 @@ class CreateRenderPass(TVPaintCreator): subset_name_fill_data = {"renderlayer": render_layer} # Format dynamic keys in subset name - new_subset_name = subset_name.format( - **prepare_template_data(subset_name_fill_data) - ) - self.log.info(f"New subset name is \"{new_subset_name}\".") - instance_data["label"] = new_subset_name + label = subset_name + try: + label = label.format( + **prepare_template_data(subset_name_fill_data) + ) + except (KeyError, ValueError): + pass + + self.log.info(f"New subset name is \"{label}\".") + instance_data["label"] = label instance_data["group"] = f"{self.get_group_label()} ({render_layer})" instance_data["layer_names"] = list(selected_layer_names) if "creator_attributes" not in instance_data: @@ -580,9 +585,14 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator): ) def _get_label(self, subset_name, render_pass_name): - return subset_name.format(**prepare_template_data({ - "renderpass": render_pass_name - })) + try: + subset_name = subset_name.format(**prepare_template_data({ + "renderpass": render_pass_name + })) + except (KeyError, ValueError): + pass + + return subset_name def get_instance_attr_defs(self): return [ From 8441a5c54b64b14f1d3cd1911c89be36c7f46f3a Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 18:14:47 +0100 Subject: [PATCH 242/912] added at least some icons to creators --- openpype/hosts/tvpaint/plugins/create/create_render.py | 5 +++-- openpype/hosts/tvpaint/plugins/create/create_review.py | 1 + openpype/hosts/tvpaint/plugins/create/create_workfile.py | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index ebce695801..e8d6d2bb88 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -61,7 +61,7 @@ class CreateRenderlayer(TVPaintCreator): family = "render" subset_template_family_filter = "renderLayer" identifier = "render.layer" - icon = "fa.cube" + icon = "fa5.images" # George script to change color group rename_script_template = ( @@ -266,11 +266,11 @@ class CreateRenderlayer(TVPaintCreator): class CreateRenderPass(TVPaintCreator): - icon = "fa.cube" family = "render" subset_template_family_filter = "renderPass" identifier = "render.pass" label = "Render Pass" + icon = "fa5.image" order = CreateRenderlayer.order + 10 @@ -496,6 +496,7 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator): subset_template_family_filter = "renderScene" identifier = "render.scene" label = "Scene Render" + icon = "fa.file-image-o" # Settings default_variant = "Main" diff --git a/openpype/hosts/tvpaint/plugins/create/create_review.py b/openpype/hosts/tvpaint/plugins/create/create_review.py index 1c220831bf..1172b53032 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_review.py +++ b/openpype/hosts/tvpaint/plugins/create/create_review.py @@ -7,6 +7,7 @@ class TVPaintReviewCreator(TVPaintAutoCreator): family = "review" identifier = "scene.review" label = "Review" + icon = "ei.video" default_variant = "Main" diff --git a/openpype/hosts/tvpaint/plugins/create/create_workfile.py b/openpype/hosts/tvpaint/plugins/create/create_workfile.py index d968e4f77d..7e8978e73a 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_workfile.py +++ b/openpype/hosts/tvpaint/plugins/create/create_workfile.py @@ -7,6 +7,7 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator): family = "workfile" identifier = "workfile" label = "Workfile" + icon = "fa.file-o" default_variant = "Main" From 7d7c8a8d74ef201e4e063a6454ca8b15ac6483dc Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 18:26:31 +0100 Subject: [PATCH 243/912] added some dosctrings, comments and descriptions --- .../tvpaint/plugins/create/convert_legacy.py | 18 ++++++++ .../tvpaint/plugins/create/create_render.py | 46 ++++++++++++++++++- 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/tvpaint/plugins/create/convert_legacy.py b/openpype/hosts/tvpaint/plugins/create/convert_legacy.py index 215c87f3e5..538c6e4c5e 100644 --- a/openpype/hosts/tvpaint/plugins/create/convert_legacy.py +++ b/openpype/hosts/tvpaint/plugins/create/convert_legacy.py @@ -9,6 +9,14 @@ from openpype.hosts.tvpaint.api.lib import get_groups_data class TVPaintLegacyConverted(SubsetConvertorPlugin): + """Conversion of legacy instances in scene to new creators. + + This convertor handles only instances created by core creators. + + All instances that would be created using auto-creators are removed as at + the moment of finding them would there already be existing instances. + """ + identifier = "tvpaint.legacy.converter" def find_instances(self): @@ -68,6 +76,7 @@ class TVPaintLegacyConverted(SubsetConvertorPlugin): if not render_layers: return + # Look for possible existing render layers in scene render_layers_by_group_id = {} for instance in current_instances: if instance.get("creator_identifier") == "render.layer": @@ -80,22 +89,30 @@ class TVPaintLegacyConverted(SubsetConvertorPlugin): } for render_layer in render_layers: group_id = render_layer.pop("group_id") + # Just remove legacy instance if group is already occupied if group_id in render_layers_by_group_id: render_layer["keep"] = False continue + # Add identifier render_layer["creator_identifier"] = "render.layer" + # Change 'uuid' to 'instance_id' render_layer["instance_id"] = render_layer.pop("uuid") + # Fill creator attributes render_layer["creator_attributes"] = { "group_id": group_id } render_layer["family"] = "render" group = groups_by_id[group_id] + # Use group name for variant group["variant"] = group["name"] def _convert_render_passes(self, render_passes, current_instances): if not render_passes: return + # Render passes must have available render layers so we look for render + # layers first + # - '_convert_render_layers' must be called before this method render_layers_by_group_id = {} for instance in current_instances: if instance.get("creator_identifier") == "render.layer": @@ -119,6 +136,7 @@ class TVPaintLegacyConverted(SubsetConvertorPlugin): render_pass["variant"] = render_pass.pop("pass") render_pass.pop("renderlayer") + # Rest of instances are just marked for deletion def _convert_render_scenes(self, render_scenes, current_instances): for render_scene in render_scenes: render_scene["keep"] = False diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index e8d6d2bb88..87d9014922 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -25,6 +25,10 @@ default 'color' blend more. In that case it is not recommended to use this workflow at all as other blend modes may affect all layers in clip which can't be done. +There is special case for simple publishing of scene which is called +'render.scene'. That will use all visible layers and render them as one big +sequence. + Todos: Add option to extract marked layers and passes as json output format for AfterEffects. @@ -53,9 +57,42 @@ from openpype.hosts.tvpaint.api.lib import ( execute_george_through_file, ) +RENDER_LAYER_DETAILED_DESCRIPTIONS = ( +"""Render Layer is "a group of TVPaint layers" + +Be aware Render Layer is not TVPaint layer. + +All TVPaint layers in the scene with the color group id are rendered in the +beauty pass. To create sub passes use Render Layer creator which is +dependent on existence of render layer instance. + +The group can represent an asset (tree) or different part of scene that consist +of one or more TVPaint layers that can be used as single item during +compositing (for example). + +In some cases may be needed to have sub parts of the layer. For example 'Bob' +could be Render Layer which has 'Arm', 'Head' and 'Body' as Render Passes. +""" +) + + +RENDER_PASS_DETAILED_DESCRIPTIONS = ( +"""Render Pass is sub part of Rende Layer. + +Render Pass can consist of one or more TVPaint layers. Render Layers must +belong to a Render Layer. Marker TVPaint layers will change it's group color +to match group color of Render Layer. +""" +) + class CreateRenderlayer(TVPaintCreator): - """Mark layer group as one instance.""" + """Mark layer group as Render layer instance. + + All TVPaint layers in the scene with the color group id are rendered in the + beauty pass. To create sub passes use Render Layer creator which is + dependent on existence of render layer instance. + """ label = "Render Layer" family = "render" @@ -68,10 +105,15 @@ class CreateRenderlayer(TVPaintCreator): "tv_layercolor \"setcolor\"" " {clip_id} {group_id} {r} {g} {b} \"{name}\"" ) + # Order to be executed before Render Pass creator order = 90 + description = "Mark TVPaint color group as one Render Layer." + detailed_description = RENDER_LAYER_DETAILED_DESCRIPTIONS # Settings + # - Default render pass name for beauty render_pass = "beauty" + # - Mark by default instance for review mark_for_review = True def get_dynamic_data( @@ -271,6 +313,8 @@ class CreateRenderPass(TVPaintCreator): identifier = "render.pass" label = "Render Pass" icon = "fa5.image" + description = "Mark selected TVPaint layers as pass of Render Layer." + detailed_description = RENDER_PASS_DETAILED_DESCRIPTIONS order = CreateRenderlayer.order + 10 From d440956b4ecee14b9d1ca8962f1c523112c6c9d7 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 18:26:43 +0100 Subject: [PATCH 244/912] fix of empty chars --- openpype/hosts/tvpaint/plugins/create/create_render.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 87d9014922..21f6f86eb6 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -71,7 +71,7 @@ of one or more TVPaint layers that can be used as single item during compositing (for example). In some cases may be needed to have sub parts of the layer. For example 'Bob' -could be Render Layer which has 'Arm', 'Head' and 'Body' as Render Passes. +could be Render Layer which has 'Arm', 'Head' and 'Body' as Render Passes. """ ) @@ -81,7 +81,7 @@ RENDER_PASS_DETAILED_DESCRIPTIONS = ( Render Pass can consist of one or more TVPaint layers. Render Layers must belong to a Render Layer. Marker TVPaint layers will change it's group color -to match group color of Render Layer. +to match group color of Render Layer. """ ) From f73b84d6c36bdf31b48acd01292404400eee0196 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 18:40:33 +0100 Subject: [PATCH 245/912] added some basic options for settings --- openpype/hosts/tvpaint/plugins/create/create_render.py | 8 +++++--- openpype/hosts/tvpaint/plugins/create/create_workfile.py | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 21f6f86eb6..255f2605aa 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -112,7 +112,7 @@ class CreateRenderlayer(TVPaintCreator): # Settings # - Default render pass name for beauty - render_pass = "beauty" + default_pass_name = "beauty" # - Mark by default instance for review mark_for_review = True @@ -122,7 +122,7 @@ class CreateRenderlayer(TVPaintCreator): dynamic_data = super().get_dynamic_data( variant, task_name, asset_doc, project_name, host_name, instance ) - dynamic_data["renderpass"] = self.render_pass + dynamic_data["renderpass"] = self.default_pass_name dynamic_data["renderlayer"] = variant return dynamic_data @@ -543,9 +543,9 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator): icon = "fa.file-image-o" # Settings - default_variant = "Main" default_pass_name = "beauty" mark_for_review = True + active_on_create = False def get_dynamic_data(self, variant, *args, **kwargs): dynamic_data = super().get_dynamic_data(variant, *args, **kwargs) @@ -581,6 +581,8 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator): self.default_pass_name ) } + if not self.active_on_create: + data["active"] = False new_instance = CreatedInstance( self.family, subset_name, data, self diff --git a/openpype/hosts/tvpaint/plugins/create/create_workfile.py b/openpype/hosts/tvpaint/plugins/create/create_workfile.py index 7e8978e73a..152d29cf6f 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_workfile.py +++ b/openpype/hosts/tvpaint/plugins/create/create_workfile.py @@ -9,6 +9,8 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator): label = "Workfile" icon = "fa.file-o" + # Settings + active_on_create = True default_variant = "Main" def create(self): @@ -38,6 +40,8 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator): "task": task_name, "variant": self.default_variant } + if not self.active_on_create: + data["active"] = False new_instance = CreatedInstance( self.family, subset_name, data, self From 9bb6c606985aa936279633f4b5bef2f7af1cbb71 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 18:40:56 +0100 Subject: [PATCH 246/912] added settings for tvpaint creators --- .../defaults/project_settings/tvpaint.json | 32 ++++ .../schema_project_tvpaint.json | 171 ++++++++++++++++++ 2 files changed, 203 insertions(+) diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json index 5a3e1dc2df..0441b2da00 100644 --- a/openpype/settings/defaults/project_settings/tvpaint.json +++ b/openpype/settings/defaults/project_settings/tvpaint.json @@ -10,6 +10,38 @@ } }, "stop_timer_on_application_exit": false, + "create": { + "create_workfile": { + "enabled": true, + "default_variant": "Main", + "default_variants": [] + }, + "create_review": { + "enabled": true, + "active_on_create": true, + "default_variant": "Main", + "default_variants": [] + }, + "create_render_scene": { + "enabled": true, + "active_on_create": false, + "mark_for_review": true, + "default_pass_name": "beauty", + "default_variant": "Main", + "default_variants": [] + }, + "create_render_layer": { + "mark_for_review": true, + "render_pass_name": "beauty", + "default_variant": "Main", + "default_variants": [] + }, + "create_render_pass": { + "mark_for_review": true, + "default_variant": "Main", + "default_variants": [] + } + }, "publish": { "CollectRenderScene": { "enabled": false, diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json index db38c938dc..10f4b538f7 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json @@ -27,6 +27,177 @@ "key": "stop_timer_on_application_exit", "label": "Stop timer on application exit" }, + { + "type": "dict", + "collapsible": true, + "key": "create", + "label": "Create plugins", + "children": [ + { + "type": "dict", + "collapsible": true, + "key": "create_workfile", + "label": "Create Workfile", + "is_group": true, + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "text", + "key": "default_variant", + "label": "Default variant" + }, + { + "type": "list", + "key": "default_variants", + "label": "Default variants", + "object_type": { + "type": "text" + } + } + ] + }, + { + "type": "dict", + "collapsible": true, + "key": "create_review", + "label": "Create Review", + "is_group": true, + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "active_on_create", + "label": "Active by default" + }, + { + "type": "text", + "key": "default_variant", + "label": "Default variant" + }, + { + "type": "list", + "key": "default_variants", + "label": "Default variants", + "object_type": { + "type": "text" + } + } + ] + }, + { + "type": "dict", + "collapsible": true, + "key": "create_render_scene", + "label": "Create Render Scene", + "is_group": true, + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "active_on_create", + "label": "Active by default" + }, + { + "type": "boolean", + "key": "mark_for_review", + "label": "Review by default" + }, + { + "type": "text", + "key": "default_pass_name", + "label": "Default beauty pass" + }, + { + "type": "text", + "key": "default_variant", + "label": "Default variant" + }, + { + "type": "list", + "key": "default_variants", + "label": "Default variants", + "object_type": { + "type": "text" + } + } + ] + }, + { + "type": "dict", + "collapsible": true, + "key": "create_render_layer", + "label": "Create Render Layer", + "is_group": true, + "children": [ + { + "type": "boolean", + "key": "mark_for_review", + "label": "Review by default" + }, + { + "type": "text", + "key": "render_pass_name", + "label": "Default beauty pass" + }, + { + "type": "text", + "key": "default_variant", + "label": "Default variant" + }, + { + "type": "list", + "key": "default_variants", + "label": "Default variants", + "object_type": { + "type": "text" + } + } + ] + }, + { + "type": "dict", + "collapsible": true, + "key": "create_render_pass", + "label": "Create Render Pass", + "is_group": true, + "children": [ + { + "type": "boolean", + "key": "mark_for_review", + "label": "Review by default" + }, + { + "type": "text", + "key": "default_variant", + "label": "Default variant" + }, + { + "type": "list", + "key": "default_variants", + "label": "Default variants", + "object_type": { + "type": "text" + } + } + ] + } + ] + }, { "type": "dict", "collapsible": true, From 51196290b2419d37b3c71ead5501d918a47c9211 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 18:46:48 +0100 Subject: [PATCH 247/912] apply settings in creators --- .../tvpaint/plugins/create/create_render.py | 27 +++++++++++++++++++ .../tvpaint/plugins/create/create_review.py | 5 +++- .../tvpaint/plugins/create/create_workfile.py | 7 ++++- .../defaults/project_settings/tvpaint.json | 2 +- .../schema_project_tvpaint.json | 2 +- 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 255f2605aa..fa724fabe2 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -116,6 +116,15 @@ class CreateRenderlayer(TVPaintCreator): # - Mark by default instance for review mark_for_review = True + def apply_settings(self, project_settings, system_settings): + plugin_settings = ( + project_settings["tvpain"]["create"]["create_render_layer"] + ) + self.default_variant = plugin_settings["default_variant"] + self.default_variants = plugin_settings["default_variants"] + self.default_pass_name = plugin_settings["default_pass_name"] + self.mark_for_review = plugin_settings["mark_for_review"] + def get_dynamic_data( self, variant, task_name, asset_doc, project_name, host_name, instance ): @@ -321,6 +330,14 @@ class CreateRenderPass(TVPaintCreator): # Settings mark_for_review = True + def apply_settings(self, project_settings, system_settings): + plugin_settings = ( + project_settings["tvpain"]["create"]["create_render_pass"] + ) + self.default_variant = plugin_settings["default_variant"] + self.default_variants = plugin_settings["default_variants"] + self.mark_for_review = plugin_settings["mark_for_review"] + def collect_instances(self): instances_by_identifier = self._cache_and_get_instances() render_layers = { @@ -547,6 +564,16 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator): mark_for_review = True active_on_create = False + def apply_settings(self, project_settings, system_settings): + plugin_settings = ( + project_settings["tvpain"]["create"]["create_render_scene"] + ) + self.default_variant = plugin_settings["default_variant"] + self.default_variants = plugin_settings["default_variants"] + self.mark_for_review = plugin_settings["mark_for_review"] + self.active_on_create = plugin_settings["active_on_create"] + self.default_pass_name = plugin_settings["default_pass_name"] + def get_dynamic_data(self, variant, *args, **kwargs): dynamic_data = super().get_dynamic_data(variant, *args, **kwargs) dynamic_data["renderpass"] = "{renderpass}" diff --git a/openpype/hosts/tvpaint/plugins/create/create_review.py b/openpype/hosts/tvpaint/plugins/create/create_review.py index 1172b53032..a0af10f3be 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_review.py +++ b/openpype/hosts/tvpaint/plugins/create/create_review.py @@ -9,7 +9,10 @@ class TVPaintReviewCreator(TVPaintAutoCreator): label = "Review" icon = "ei.video" - default_variant = "Main" + def apply_settings(self, project_settings, system_settings): + plugin_settings = project_settings["tvpain"]["create"]["create_review"] + self.default_variant = plugin_settings["default_variant"] + self.default_variants = plugin_settings["default_variants"] def create(self): existing_instance = None diff --git a/openpype/hosts/tvpaint/plugins/create/create_workfile.py b/openpype/hosts/tvpaint/plugins/create/create_workfile.py index 152d29cf6f..e247072e3b 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_workfile.py +++ b/openpype/hosts/tvpaint/plugins/create/create_workfile.py @@ -11,7 +11,12 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator): # Settings active_on_create = True - default_variant = "Main" + + def apply_settings(self, project_settings, system_settings): + plugin_settings = project_settings["tvpain"]["create"]["create_workfile"] + self.default_variant = plugin_settings["default_variant"] + self.default_variants = plugin_settings["default_variants"] + self.active_on_create = plugin_settings["active_on_create"] def create(self): existing_instance = None diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json index 0441b2da00..74a5af403c 100644 --- a/openpype/settings/defaults/project_settings/tvpaint.json +++ b/openpype/settings/defaults/project_settings/tvpaint.json @@ -32,7 +32,7 @@ }, "create_render_layer": { "mark_for_review": true, - "render_pass_name": "beauty", + "default_pass_name": "beauty", "default_variant": "Main", "default_variants": [] }, diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json index 10f4b538f7..d09c666d50 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json @@ -151,7 +151,7 @@ }, { "type": "text", - "key": "render_pass_name", + "key": "default_pass_name", "label": "Default beauty pass" }, { From a651553fe6847af29c5ee4becc02304cf2ee08e3 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 16 Feb 2023 09:41:44 +0100 Subject: [PATCH 248/912] fix settings access --- openpype/hosts/tvpaint/plugins/create/create_render.py | 6 +++--- openpype/hosts/tvpaint/plugins/create/create_review.py | 4 +++- openpype/hosts/tvpaint/plugins/create/create_workfile.py | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index fa724fabe2..cadd045fbf 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -118,7 +118,7 @@ class CreateRenderlayer(TVPaintCreator): def apply_settings(self, project_settings, system_settings): plugin_settings = ( - project_settings["tvpain"]["create"]["create_render_layer"] + project_settings["tvpaint"]["create"]["create_render_layer"] ) self.default_variant = plugin_settings["default_variant"] self.default_variants = plugin_settings["default_variants"] @@ -332,7 +332,7 @@ class CreateRenderPass(TVPaintCreator): def apply_settings(self, project_settings, system_settings): plugin_settings = ( - project_settings["tvpain"]["create"]["create_render_pass"] + project_settings["tvpaint"]["create"]["create_render_pass"] ) self.default_variant = plugin_settings["default_variant"] self.default_variants = plugin_settings["default_variants"] @@ -566,7 +566,7 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator): def apply_settings(self, project_settings, system_settings): plugin_settings = ( - project_settings["tvpain"]["create"]["create_render_scene"] + project_settings["tvpaint"]["create"]["create_render_scene"] ) self.default_variant = plugin_settings["default_variant"] self.default_variants = plugin_settings["default_variants"] diff --git a/openpype/hosts/tvpaint/plugins/create/create_review.py b/openpype/hosts/tvpaint/plugins/create/create_review.py index a0af10f3be..423c3ab30f 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_review.py +++ b/openpype/hosts/tvpaint/plugins/create/create_review.py @@ -10,7 +10,9 @@ class TVPaintReviewCreator(TVPaintAutoCreator): icon = "ei.video" def apply_settings(self, project_settings, system_settings): - plugin_settings = project_settings["tvpain"]["create"]["create_review"] + plugin_settings = ( + project_settings["tvpaint"]["create"]["create_review"] + ) self.default_variant = plugin_settings["default_variant"] self.default_variants = plugin_settings["default_variants"] diff --git a/openpype/hosts/tvpaint/plugins/create/create_workfile.py b/openpype/hosts/tvpaint/plugins/create/create_workfile.py index e247072e3b..cc64936bdd 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_workfile.py +++ b/openpype/hosts/tvpaint/plugins/create/create_workfile.py @@ -13,7 +13,9 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator): active_on_create = True def apply_settings(self, project_settings, system_settings): - plugin_settings = project_settings["tvpain"]["create"]["create_workfile"] + plugin_settings = ( + project_settings["tvpaint"]["create"]["create_workfile"] + ) self.default_variant = plugin_settings["default_variant"] self.default_variants = plugin_settings["default_variants"] self.active_on_create = plugin_settings["active_on_create"] From 69cc794ed1492e2c22c84ee8ad2499a23ecbf023 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 16 Feb 2023 09:41:55 +0100 Subject: [PATCH 249/912] fix indentation --- openpype/hosts/tvpaint/plugins/create/create_render.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index cadd045fbf..41288e5968 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -58,7 +58,7 @@ from openpype.hosts.tvpaint.api.lib import ( ) RENDER_LAYER_DETAILED_DESCRIPTIONS = ( -"""Render Layer is "a group of TVPaint layers" + """Render Layer is "a group of TVPaint layers" Be aware Render Layer is not TVPaint layer. @@ -77,7 +77,7 @@ could be Render Layer which has 'Arm', 'Head' and 'Body' as Render Passes. RENDER_PASS_DETAILED_DESCRIPTIONS = ( -"""Render Pass is sub part of Rende Layer. + """Render Pass is sub part of Render Layer. Render Pass can consist of one or more TVPaint layers. Render Layers must belong to a Render Layer. Marker TVPaint layers will change it's group color From 71adfb8b5044e38ffc0c5edcb39f0eeb54e2ed18 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 16 Feb 2023 09:56:07 +0100 Subject: [PATCH 250/912] update instance label on refresh --- openpype/tools/publisher/widgets/card_view_widgets.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openpype/tools/publisher/widgets/card_view_widgets.py b/openpype/tools/publisher/widgets/card_view_widgets.py index 47f8ebb914..3fd5243ce9 100644 --- a/openpype/tools/publisher/widgets/card_view_widgets.py +++ b/openpype/tools/publisher/widgets/card_view_widgets.py @@ -385,6 +385,7 @@ class InstanceCardWidget(CardWidget): self._last_subset_name = None self._last_variant = None + self._last_label = None icon_widget = IconValuePixmapLabel(group_icon, self) icon_widget.setObjectName("FamilyIconLabel") @@ -462,14 +463,17 @@ class InstanceCardWidget(CardWidget): def _update_subset_name(self): variant = self.instance["variant"] subset_name = self.instance["subset"] + label = self.instance.label if ( variant == self._last_variant and subset_name == self._last_subset_name + and label == self._last_label ): return self._last_variant = variant self._last_subset_name = subset_name + self._last_label = label # Make `variant` bold label = html_escape(self.instance.label) found_parts = set(re.findall(variant, label, re.IGNORECASE)) From 2fce95a9df1cf89fb801e1228698be03ad93aaa0 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 16 Feb 2023 16:10:03 +0100 Subject: [PATCH 251/912] OP-3026 - first implementation of saving settings changes to DB This logs all changes in Settings to separate collection ('setting_log') to help debug/trace changes. This functionality is pretty basic as it will be replaced by Ayon implementation in the future. --- openpype/settings/handlers.py | 34 ++++++++++++++++++++++++++++++++++ openpype/settings/lib.py | 4 +++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/openpype/settings/handlers.py b/openpype/settings/handlers.py index 373029d9df..3706433692 100644 --- a/openpype/settings/handlers.py +++ b/openpype/settings/handlers.py @@ -235,6 +235,18 @@ class SettingsHandler(object): """ pass + @abstractmethod + def save_change_log(self, project_name, changes, settings_type): + """Stores changes to settings to separate logging collection. + + Args: + project_name(str, null): Project name for which overrides are + or None for global settings. + changes(dict): Data of project overrides with override metadata. + settings_type (str): system|project|anatomy + """ + pass + @abstractmethod def get_studio_system_settings_overrides(self, return_version): """Studio overrides of system settings.""" @@ -913,6 +925,28 @@ class MongoSettingsHandler(SettingsHandler): return data + def save_change_log(self, project_name, changes, settings_type): + """Log all settings changes to separate collection""" + if not changes: + return + + from openpype.lib import get_local_site_id + + if settings_type == "project" and not project_name: + project_name = "default" + + document = { + "user": get_local_site_id(), + "date_created": datetime.datetime.now(), + "project": project_name, + "settings_type": settings_type, + "changes": changes + } + collection_name = "settings_log" + collection = (self.settings_collection[self.database_name] + [collection_name]) + collection.insert_one(document) + def _save_project_anatomy_data(self, project_name, data_cache): # Create copy of data as they will be modified during save new_data = data_cache.data_copy() diff --git a/openpype/settings/lib.py b/openpype/settings/lib.py index 796eaeda01..73554df236 100644 --- a/openpype/settings/lib.py +++ b/openpype/settings/lib.py @@ -159,6 +159,7 @@ def save_studio_settings(data): except SaveWarningExc as exc: warnings.extend(exc.warnings) + _SETTINGS_HANDLER.save_change_log(None, changes, "system") _SETTINGS_HANDLER.save_studio_settings(data) if warnings: raise SaveWarningExc(warnings) @@ -218,7 +219,7 @@ def save_project_settings(project_name, overrides): ) except SaveWarningExc as exc: warnings.extend(exc.warnings) - + _SETTINGS_HANDLER.save_change_log(project_name, changes, "project") _SETTINGS_HANDLER.save_project_settings(project_name, overrides) if warnings: @@ -280,6 +281,7 @@ def save_project_anatomy(project_name, anatomy_data): except SaveWarningExc as exc: warnings.extend(exc.warnings) + _SETTINGS_HANDLER.save_change_log(project_name, changes, "anatomy") _SETTINGS_HANDLER.save_project_anatomy(project_name, anatomy_data) if warnings: From 43f88ca797b286f6dfaf0bcc8f1a45e099f4886c Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 16 Feb 2023 16:31:27 +0100 Subject: [PATCH 252/912] OP-3026 - Hound --- openpype/settings/handlers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/handlers.py b/openpype/settings/handlers.py index 3706433692..3fa5737b6f 100644 --- a/openpype/settings/handlers.py +++ b/openpype/settings/handlers.py @@ -238,7 +238,7 @@ class SettingsHandler(object): @abstractmethod def save_change_log(self, project_name, changes, settings_type): """Stores changes to settings to separate logging collection. - + Args: project_name(str, null): Project name for which overrides are or None for global settings. From 718f4e748d86177617e12915eae7c53fdc3a5eec Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov <11698866+movalex@users.noreply.github.com> Date: Fri, 17 Feb 2023 00:46:40 +0300 Subject: [PATCH 253/912] Update openpype/hosts/fusion/hooks/pre_fusion_setup.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- .../hosts/fusion/hooks/pre_fusion_setup.py | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index 3bb345b72f..9ae57d2a17 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -53,14 +53,21 @@ class FusionPrelaunch(PreLaunchHook): def get_copy_fusion_prefs_settings(self): """Get copy prefserences options from the global application settings""" - copy_status = copy_path = None - try: - copy_status, copy_path, force_sync = get_system_settings()["applications"]["fusion"][ - "copy_fusion_settings"].values() - except ValueError: - self.log.error('Copy prefs settings not found') - finally: - return copy_status, Path(copy_path).expanduser(), force_sync + copy_fusion_settings = ( + self.data + ["system_settings"] + ["applications"] + ["fusion"] + .get("copy_fusion_settings", {}) + ) + if not copy_fusion_settings: + self.log.error("Copy prefs settings not found") + copy_status = copy_fusion_settings.get("copy_status", False) + force_sync = copy_fusion_settings.get("force_sync", False) + copy_path = copy_fusion_settings.get("copy_path") or None + if copy_path: + copy_path = Path(copy_path).expanduser() + return copy_status, copy_path, force_sync def copy_existing_prefs(self, copy_from: Path, copy_to: Path, force_sync: bool) -> None: """On the first Fusion launch copy the Fusion profile to the working directory. From 7109c6ea1a483ed4b95a77e3dec2e379e569a2c2 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Fri, 17 Feb 2023 16:20:26 +0800 Subject: [PATCH 254/912] update the naming convention for the render outputs --- openpype/hosts/max/api/lib_renderproducts.py | 8 ++- openpype/hosts/max/api/lib_rendersettings.py | 25 ++++++- .../plugins/publish/submit_3dmax_deadline.py | 66 +++++++++++++++++-- .../plugins/publish/submit_publish_job.py | 5 +- .../defaults/project_settings/deadline.json | 3 +- .../defaults/project_settings/max.json | 2 +- .../schema_project_deadline.json | 5 ++ 7 files changed, 104 insertions(+), 10 deletions(-) diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index b54e2513e1..e09934e5de 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -25,11 +25,17 @@ class RenderProducts(object): def render_product(self, container): folder = rt.maxFilePath + file = rt.maxFileName folder = folder.replace("\\", "/") setting = self._project_settings render_folder = get_default_render_folder(setting) + filename, ext = os.path.splitext(file) + + output_file = os.path.join(folder, + render_folder, + filename, + container) - output_file = os.path.join(folder, render_folder, container) context = get_current_project_asset() startFrame = context["data"].get("frameStart") endFrame = context["data"].get("frameEnd") + 1 diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index bc9b02bc77..d4784d9dfb 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -44,11 +44,15 @@ class RenderSettings(object): def set_renderoutput(self, container): folder = rt.maxFilePath # hard-coded, should be customized in the setting + file = rt.maxFileName folder = folder.replace("\\", "/") # hard-coded, set the renderoutput path setting = self._project_settings render_folder = get_default_render_folder(setting) - output_dir = os.path.join(folder, render_folder) + filename, ext = os.path.splitext(file) + output_dir = os.path.join(folder, + render_folder, + filename) if not os.path.exists(output_dir): os.makedirs(output_dir) # hard-coded, should be customized in the setting @@ -139,3 +143,22 @@ class RenderSettings(object): target, renderpass = str(renderlayer_name).split(":") aov_name = "{0}_{1}..{2}".format(dir, renderpass, ext) render_elem.SetRenderElementFileName(i, aov_name) + + def get_renderoutput(self, container, output_dir): + output = os.path.join(output_dir, container) + img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"] # noqa + outputFilename = "{0}..{1}".format(output, img_fmt) + return outputFilename + + def get_render_element(self): + orig_render_elem = list() + render_elem = rt.maxOps.GetCurRenderElementMgr() + render_elem_num = render_elem.NumRenderElements() + if render_elem_num < 0: + return + + for i in range(render_elem_num): + render_element = render_elem.GetRenderElementFilename(i) + orig_render_elem.append(render_element) + + return orig_render_elem diff --git a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py index dec951da7a..9316e34898 100644 --- a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py @@ -5,8 +5,10 @@ import getpass import requests import pyblish.api - +from pymxs import runtme as rt from openpype.pipeline import legacy_io +from openpype.hosts.max.api.lib import get_current_renderer +from openpype.hosts.max.api.lib_rendersettings import RenderSettings class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): @@ -26,6 +28,7 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): group = None deadline_pool = None deadline_pool_secondary = None + framePerTask = 1 def process(self, instance): context = instance.context @@ -55,10 +58,30 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): anatomy_filled = anatomy_data.format(template_data) template_filled = anatomy_filled["publish"]["path"] filepath = os.path.normpath(template_filled) - + filepath = filepath.replace("\\", "/") self.log.info( "Using published scene for render {}".format(filepath) ) + if not os.path.exists(filepath): + self.log.error("published scene does not exist!") + + new_scene = self._clean_name(filepath) + # use the anatomy data for setting up the path of the files + orig_scene = self._clean_name(instance.context.data["currentFile"]) + expected_files = instance.data.get("expectedFiles") + + new_exp = [] + for file in expected_files: + new_file = str(file).replace(orig_scene, new_scene) + new_exp.append(new_file) + + instance.data["expectedFiles"] = new_exp + + metadata_folder = instance.data.get("publishRenderMetadataFolder") + if metadata_folder: + metadata_folder = metadata_folder.replace(orig_scene, + new_scene) + instance.data["publishRenderMetadataFolder"] = metadata_folder payload = { "JobInfo": { @@ -78,7 +101,8 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): "Frames": frames, "ChunkSize": self.chunk_size, "Priority": instance.data.get("priority", self.priority), - "Comment": comment + "Comment": comment, + "FramesPerTask": self.framePerTask }, "PluginInfo": { # Input @@ -131,8 +155,37 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): self.log.info("Ensuring output directory exists: %s" % dirname) os.makedirs(dirname) + plugin_data = {} + if self.use_published: + old_output_dir = os.path.dirname(expected_files[0]) + output_beauty = RenderSettings().get_renderoutput(instance.name, + old_output_dir) + output_beauty = output_beauty.replace(orig_scene, new_scene) + output_beauty = output_beauty.replace("\\", "/") + plugin_data["RenderOutput"] = output_beauty + + renderer_class = get_current_renderer() + renderer = str(renderer_class).split(":")[0] + if ( + renderer == "ART_Renderer" or + renderer == "Redshift_Renderer" or + renderer == "V_Ray_6_Hotfix_3" or + renderer == "V_Ray_GPU_6_Hotfix_3" or + renderer == "Default_Scanline_Renderer" or + renderer == "Quicksilver_Hardware_Renderer" + ): + render_elem_list = RenderSettings().get_render_element() + for i, render_element in enumerate(render_elem_list): + render_element = render_element.replace(orig_scene, new_scene) + plugin_data["RenderElementOutputFilename%d" % i] = render_element + + self.log.debug("plugin data:{}".format(plugin_data)) + self.log.info("Scene name was switched {} -> {}".format( + orig_scene, new_scene + )) payload["JobInfo"].update(output_data) + payload["PluginInfo"].update(plugin_data) self.submit(instance, payload) @@ -158,8 +211,13 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): raise Exception(response.text) # Store output dir for unified publisher (expectedFilesequence) expected_files = instance.data["expectedFiles"] - self.log.info("exp:{}".format(expected_files)) output_dir = os.path.dirname(expected_files[0]) instance.data["toBeRenderedOn"] = "deadline" instance.data["outputDir"] = output_dir instance.data["deadlineSubmissionJob"] = response.json() + + def rename_render_element(self): + pass + + def _clean_name(self, path): + return os.path.splitext(os.path.basename(path))[0] \ No newline at end of file diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index b70301ab7e..34fa8a8c03 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -293,8 +293,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): "Group": self.deadline_group, "Pool": instance.data.get("primaryPool"), "SecondaryPool": instance.data.get("secondaryPool"), - - "OutputDirectory0": output_dir + # ensure the outputdirectory with correct slashes + "OutputDirectory0": output_dir.replace("\\", "/") }, "PluginInfo": { "Version": self.plugin_pype_version, @@ -1000,6 +1000,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): "FTRACK_SERVER": os.environ.get("FTRACK_SERVER"), } + submission_type = instance.data["toBeRenderedOn"] if submission_type == "deadline": # get default deadline webservice url from deadline module self.deadline_url = instance.context.data["defaultDeadline"] diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json index 0fab284c66..25d2988982 100644 --- a/openpype/settings/defaults/project_settings/deadline.json +++ b/openpype/settings/defaults/project_settings/deadline.json @@ -44,7 +44,8 @@ "chunk_size": 10, "group": "none", "deadline_pool": "", - "deadline_pool_secondary": "" + "deadline_pool_secondary": "", + "framePerTask": 1 }, "NukeSubmitDeadline": { "enabled": true, diff --git a/openpype/settings/defaults/project_settings/max.json b/openpype/settings/defaults/project_settings/max.json index 651a074a08..617e298310 100644 --- a/openpype/settings/defaults/project_settings/max.json +++ b/openpype/settings/defaults/project_settings/max.json @@ -1,6 +1,6 @@ { "RenderSettings": { - "default_render_image_folder": "renders/max", + "default_render_image_folder": "renders/3dsmax", "aov_separator": "underscore", "image_format": "exr" } diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json index afefd3266a..f71a253105 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json @@ -249,6 +249,11 @@ "type": "text", "key": "deadline_pool_secondary", "label": "Deadline pool (secondary)" + }, + { + "type": "number", + "key": "framePerTask", + "label": "Frame Per Task" } ] }, From f1843b1120575e5a40c87c09ccc222e785c23d91 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Fri, 17 Feb 2023 16:24:19 +0800 Subject: [PATCH 255/912] hound fix --- openpype/hosts/max/api/lib_rendersettings.py | 4 ++-- .../deadline/plugins/publish/submit_3dmax_deadline.py | 9 ++++----- .../deadline/plugins/publish/submit_publish_job.py | 3 +-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index d4784d9dfb..92f716ba54 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -158,7 +158,7 @@ class RenderSettings(object): return for i in range(render_elem_num): - render_element = render_elem.GetRenderElementFilename(i) - orig_render_elem.append(render_element) + render_element = render_elem.GetRenderElementFilename(i) + orig_render_elem.append(render_element) return orig_render_elem diff --git a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py index 9316e34898..656f550e9e 100644 --- a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py @@ -5,7 +5,6 @@ import getpass import requests import pyblish.api -from pymxs import runtme as rt from openpype.pipeline import legacy_io from openpype.hosts.max.api.lib import get_current_renderer from openpype.hosts.max.api.lib_rendersettings import RenderSettings @@ -175,9 +174,9 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): renderer == "Quicksilver_Hardware_Renderer" ): render_elem_list = RenderSettings().get_render_element() - for i, render_element in enumerate(render_elem_list): - render_element = render_element.replace(orig_scene, new_scene) - plugin_data["RenderElementOutputFilename%d" % i] = render_element + for i, element in enumerate(render_elem_list): + element = element.replace(orig_scene, new_scene) + plugin_data["RenderElementOutputFilename%d" % i] = element # noqa self.log.debug("plugin data:{}".format(plugin_data)) self.log.info("Scene name was switched {} -> {}".format( @@ -220,4 +219,4 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): pass def _clean_name(self, path): - return os.path.splitext(os.path.basename(path))[0] \ No newline at end of file + return os.path.splitext(os.path.basename(path))[0] diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 34fa8a8c03..c347f50c59 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -339,7 +339,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): self.log.info("Submitting Deadline job ...") url = "{}/api/jobs".format(self.deadline_url) - response = requests.post(url, json=payload, timeout=10) + response = requests.post(url, json=payload, timeout=10, verify=False) if not response.ok: raise Exception(response.text) @@ -1000,7 +1000,6 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): "FTRACK_SERVER": os.environ.get("FTRACK_SERVER"), } - submission_type = instance.data["toBeRenderedOn"] if submission_type == "deadline": # get default deadline webservice url from deadline module self.deadline_url = instance.context.data["defaultDeadline"] From bf3bf31d999c179e2a88e850e4f7db8e6c7082d3 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Fri, 17 Feb 2023 16:40:43 +0800 Subject: [PATCH 256/912] fix the bug of reference before assignment --- .../modules/deadline/plugins/publish/submit_publish_job.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index c347f50c59..22a5069ac2 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -339,7 +339,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): self.log.info("Submitting Deadline job ...") url = "{}/api/jobs".format(self.deadline_url) - response = requests.post(url, json=payload, timeout=10, verify=False) + response = requests.post(url, json=payload, timeout=10) if not response.ok: raise Exception(response.text) @@ -961,6 +961,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): ''' render_job = None + submission_type = "" if instance.data.get("toBeRenderedOn") == "deadline": render_job = data.pop("deadlineSubmissionJob", None) submission_type = "deadline" From e6bf6add2f0b25d93dfd0d822b3d1d5a4393f1a2 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 17 Feb 2023 10:48:15 +0100 Subject: [PATCH 257/912] modify integrate ftrack instances to be able upload origin filename --- .../ftrack/plugins/publish/integrate_ftrack_instances.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py index d6cb3daf0d..75f43cb22f 100644 --- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py +++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py @@ -56,6 +56,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin): "reference": "reference" } keep_first_subset_name_for_review = True + upload_reviewable_with_origin_name = False asset_versions_status_profiles = [] additional_metadata_keys = [] @@ -294,6 +295,13 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin): ) # Add item to component list component_list.append(review_item) + if self.upload_reviewable_with_origin_name: + origin_name_component = copy.deepcopy(review_item) + filename = os.path.basename(repre_path) + origin_name_component["component_data"]["name"] = ( + os.path.splitext(filename)[0] + ) + component_list.append(origin_name_component) # Duplicate thumbnail component for all not first reviews if first_thumbnail_component is not None: From f42831ecb04d163e647f68db8b008530926de81e Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 17 Feb 2023 10:48:48 +0100 Subject: [PATCH 258/912] added settings for original basename upload --- .../defaults/project_settings/ftrack.json | 3 ++- .../projects_schema/schema_project_ftrack.json | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_settings/ftrack.json b/openpype/settings/defaults/project_settings/ftrack.json index cdf861df4a..f3f2345a0f 100644 --- a/openpype/settings/defaults/project_settings/ftrack.json +++ b/openpype/settings/defaults/project_settings/ftrack.json @@ -488,7 +488,8 @@ }, "keep_first_subset_name_for_review": true, "asset_versions_status_profiles": [], - "additional_metadata_keys": [] + "additional_metadata_keys": [], + "upload_reviewable_with_origin_name": false }, "IntegrateFtrackFarmStatus": { "farm_status_profiles": [] diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json b/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json index da414cc961..7050721742 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json @@ -1037,6 +1037,21 @@ {"fps": "FPS"}, {"code": "Codec"} ] + }, + { + "type": "separator" + }, + { + "type": "boolean", + "key": "upload_reviewable_with_origin_name", + "label": "Upload reviewable with origin name" + }, + { + "type": "label", + "label": "Note: Reviewable will be uploaded twice into ftrack when enabled. One with original name and second with required 'ftrackreview-mp4'. That may cause dramatic increase of ftrack storage usage." + }, + { + "type": "separator" } ] }, From dacc90f9ad8ddab10ad60f814950db818e3327f3 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 17 Feb 2023 13:31:52 +0300 Subject: [PATCH 259/912] remove redundant get gomp name function --- openpype/hosts/fusion/api/lib.py | 7 ------- openpype/hosts/fusion/api/workio.py | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/fusion/api/lib.py b/openpype/hosts/fusion/api/lib.py index ec96d6cf18..f175d3a1d3 100644 --- a/openpype/hosts/fusion/api/lib.py +++ b/openpype/hosts/fusion/api/lib.py @@ -316,13 +316,6 @@ def get_current_comp(): return comp -def get_comp_filename(): - """Get comp's Filename""" - comp = get_current_comp() - if comp: - return comp.GetAttrs()["COMPS_FileName"] - - @contextlib.contextmanager def comp_lock_and_undo_chunk(comp, undo_queue_name="Script CMD"): """Lock comp and open an undo chunk during the context""" diff --git a/openpype/hosts/fusion/api/workio.py b/openpype/hosts/fusion/api/workio.py index 048e6e090a..8012d600da 100644 --- a/openpype/hosts/fusion/api/workio.py +++ b/openpype/hosts/fusion/api/workio.py @@ -25,7 +25,8 @@ def open_file(filepath): def current_file(): - current_filepath = get_comp_filename() + comp = get_current_comp() + current_filepath = comp.GetAttrs()["COMPS_FileName"] return current_filepath or None From d77c0e252be994a242d7004b675a8247abfc8326 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 17 Feb 2023 13:49:32 +0300 Subject: [PATCH 260/912] move fusion prefs settings to project_settings --- .../hosts/fusion/hooks/pre_fusion_setup.py | 23 +++++++------- .../defaults/project_settings/fusion.json | 5 ++++ .../system_settings/applications.json | 5 ---- .../schema_project_fusion.json | 24 +++++++++++++++ .../host_settings/schema_fusion.json | 30 ------------------- 5 files changed, 39 insertions(+), 48 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index 9ae57d2a17..ad2ec7eb2d 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -4,7 +4,6 @@ import platform from pathlib import Path from openpype.lib import PreLaunchHook, ApplicationLaunchFailed from openpype.hosts.fusion import FUSION_HOST_DIR -from openpype.settings import get_system_settings class FusionPrelaunch(PreLaunchHook): @@ -39,11 +38,10 @@ class FusionPrelaunch(PreLaunchHook): self.log.info(f"Local Fusion prefs environment is set to {fusion_prefs_dir}") fusion_prefs_filepath = fusion_prefs_dir / "Fusion.prefs" return fusion_prefs_filepath - # otherwise get the profile from default prefs location fusion_prefs_path = f"Blackmagic Design/Fusion/Profiles/{fusion_profile}/Fusion.prefs" if platform.system() == "Windows": - prefs_source = Path(os.getenv("AppData")) / fusion_prefs_path + prefs_source = Path(os.getenv("AppData"), fusion_prefs_path) elif platform.system() == "Darwin": prefs_source = Path("~/Library/Application Support/", fusion_prefs_path).expanduser() elif platform.system() == "Linux": @@ -55,8 +53,7 @@ class FusionPrelaunch(PreLaunchHook): """Get copy prefserences options from the global application settings""" copy_fusion_settings = ( self.data - ["system_settings"] - ["applications"] + ["project_settings"] ["fusion"] .get("copy_fusion_settings", {}) ) @@ -73,7 +70,7 @@ class FusionPrelaunch(PreLaunchHook): """On the first Fusion launch copy the Fusion profile to the working directory. If the Openpype profile folder exists, skip copying, unless Force sync is checked. If the prefs were not copied on the first launch, clean Fusion profile - will be created in openpype_fusion_profile_dir. + will be created in fusion_profile_dir. """ if copy_to.exists() and not force_sync: self.log.info("Local Fusion preferences folder exists, skipping profile copy") @@ -127,14 +124,14 @@ class FusionPrelaunch(PreLaunchHook): self.log.info(f"Setting OPENPYPE_FUSION: {FUSION_HOST_DIR}") self.launch_context.env["OPENPYPE_FUSION"] = FUSION_HOST_DIR - copy_status, openpype_fusion_profile_dir, force_sync = self.get_copy_fusion_prefs_settings() + copy_status, fusion_profile_dir, force_sync = self.get_copy_fusion_prefs_settings() if copy_status: prefs_source = self.get_profile_source() - self.copy_existing_prefs(prefs_source, openpype_fusion_profile_dir, force_sync) + self.copy_existing_prefs(prefs_source, fusion_profile_dir, force_sync) fusion_profile_dir_variable = f"FUSION{self.PROFILE_NUMBER}_PROFILE_DIR" master_prefs_variable = f"FUSION{self.PROFILE_NUMBER}_MasterPrefs" - openpype_master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") - self.log.info(f"Setting {fusion_profile_dir_variable}: {openpype_fusion_profile_dir}") - self.launch_context.env[fusion_profile_dir_variable] = str(openpype_fusion_profile_dir) - self.log.info(f"Setting {master_prefs_variable}: {openpype_master_prefs}") - self.launch_context.env[master_prefs_variable] = str(openpype_master_prefs) + master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") + self.log.info(f"Setting {fusion_profile_dir_variable}: {fusion_profile_dir}") + self.launch_context.env[fusion_profile_dir_variable] = str(fusion_profile_dir) + self.log.info(f"Setting {master_prefs_variable}: {master_prefs}") + self.launch_context.env[master_prefs_variable] = str(master_prefs) diff --git a/openpype/settings/defaults/project_settings/fusion.json b/openpype/settings/defaults/project_settings/fusion.json index 720178e17a..74863ece43 100644 --- a/openpype/settings/defaults/project_settings/fusion.json +++ b/openpype/settings/defaults/project_settings/fusion.json @@ -16,5 +16,10 @@ "linux": [] } } + }, + "copy_fusion_settings": { + "copy_status": false, + "copy_path": "~/.openpype/hosts/fusion/prefs", + "force_sync": false } } \ No newline at end of file diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json index 9fb730568e..d498bccda9 100644 --- a/openpype/settings/defaults/system_settings/applications.json +++ b/openpype/settings/defaults/system_settings/applications.json @@ -835,11 +835,6 @@ "linux": "/opt/Python/3.6/bin" } }, - "copy_fusion_settings": { - "copy_prefs": false, - "prefs_path": "~/.openpype/hosts/fusion/prefs", - "force_sync": false - }, "variants": { "18": { "executables": { diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_fusion.json b/openpype/settings/entities/schemas/projects_schema/schema_project_fusion.json index 8c62d75815..540f840aad 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_fusion.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_fusion.json @@ -45,6 +45,30 @@ ] } ] + }, + { + "type": "dict", + "key": "copy_fusion_settings", + "collapsible": true, + "checkbox_key": "copy_status", + "label": "Copy Fusion settings on launch", + "children": [ + { + "type": "boolean", + "key": "copy_status", + "label": "Enabled" + }, + { + "key": "copy_path", + "type": "path", + "label": "Local prefs directory" + }, + { + "key":"force_sync", + "type": "boolean", + "label": "Force sync preferences" + } + ] } ] } diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json index 48355932ae..5960da7774 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json @@ -19,36 +19,6 @@ "label": "Environment", "type": "raw-json" }, - { - "type": "splitter" - }, - { - "type": "dict", - "key": "copy_fusion_settings", - "collapsible": true, - "checkbox_key": "copy_prefs", - "label": "Copy Fusion settings when launched from OpenPype", - "children": [ - { - "type": "boolean", - "key": "copy_prefs", - "label": "Enabled" - }, - { - "key": "prefs_path", - "type": "path", - "label": "Local prefs directory" - }, - { - "key":"force_sync", - "type": "boolean", - "label": "Always sync preferences on launch" - } - ] - }, - { - "type": "splitter" - }, { "type": "dict-modifiable", "key": "variants", From 87ab9e35983241b255347d7f98daafadac09def6 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 17 Feb 2023 13:50:08 +0300 Subject: [PATCH 261/912] rename get_fusion module --- openpype/hosts/fusion/api/lib.py | 4 ++-- openpype/hosts/fusion/api/workio.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/fusion/api/lib.py b/openpype/hosts/fusion/api/lib.py index f175d3a1d3..709d3cbdc6 100644 --- a/openpype/hosts/fusion/api/lib.py +++ b/openpype/hosts/fusion/api/lib.py @@ -302,7 +302,7 @@ def get_frame_path(path): return filename, padding, ext -def get_fusion(): +def get_fusion_module(): """Get current Fusion instance""" fusion = getattr(sys.modules["__main__"], "fusion", None) return fusion @@ -310,7 +310,7 @@ def get_fusion(): def get_current_comp(): """Get current comp in this session""" - fusion = get_fusion() + fusion = get_fusion_module() if fusion: comp = fusion.CurrentComp return comp diff --git a/openpype/hosts/fusion/api/workio.py b/openpype/hosts/fusion/api/workio.py index 8012d600da..f51c4fa9c1 100644 --- a/openpype/hosts/fusion/api/workio.py +++ b/openpype/hosts/fusion/api/workio.py @@ -2,7 +2,7 @@ import sys import os -from .lib import get_fusion, get_current_comp, get_comp_filename +from .lib import get_fusion_module, get_current_comp, get_comp_filename def file_extensions(): @@ -20,7 +20,7 @@ def save_file(filepath): def open_file(filepath): - fusion = get_fusion() + fusion = get_fusion_module() return fusion.LoadComp(filepath) From 40ce393b808a60d37454712cbaa44609afe379d0 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 17 Feb 2023 12:28:32 +0100 Subject: [PATCH 262/912] swap workfile and review settings --- openpype/hosts/tvpaint/plugins/create/create_review.py | 4 ++++ openpype/hosts/tvpaint/plugins/create/create_workfile.py | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_review.py b/openpype/hosts/tvpaint/plugins/create/create_review.py index 423c3ab30f..0164d58262 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_review.py +++ b/openpype/hosts/tvpaint/plugins/create/create_review.py @@ -9,12 +9,16 @@ class TVPaintReviewCreator(TVPaintAutoCreator): label = "Review" icon = "ei.video" + # Settings + active_on_create = True + def apply_settings(self, project_settings, system_settings): plugin_settings = ( project_settings["tvpaint"]["create"]["create_review"] ) self.default_variant = plugin_settings["default_variant"] self.default_variants = plugin_settings["default_variants"] + self.active_on_create = plugin_settings["active_on_create"] def create(self): existing_instance = None diff --git a/openpype/hosts/tvpaint/plugins/create/create_workfile.py b/openpype/hosts/tvpaint/plugins/create/create_workfile.py index cc64936bdd..d56a6c59e7 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_workfile.py +++ b/openpype/hosts/tvpaint/plugins/create/create_workfile.py @@ -9,16 +9,12 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator): label = "Workfile" icon = "fa.file-o" - # Settings - active_on_create = True - def apply_settings(self, project_settings, system_settings): plugin_settings = ( project_settings["tvpaint"]["create"]["create_workfile"] ) self.default_variant = plugin_settings["default_variant"] self.default_variants = plugin_settings["default_variants"] - self.active_on_create = plugin_settings["active_on_create"] def create(self): existing_instance = None From 173b404d0e2af1712f9e7cf4d9f60ac5ea030570 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 17 Feb 2023 13:06:52 +0100 Subject: [PATCH 263/912] swap also usage of settings in review and workfile creators --- openpype/hosts/tvpaint/plugins/create/create_review.py | 2 ++ openpype/hosts/tvpaint/plugins/create/create_workfile.py | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_review.py b/openpype/hosts/tvpaint/plugins/create/create_review.py index 0164d58262..886dae7c39 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_review.py +++ b/openpype/hosts/tvpaint/plugins/create/create_review.py @@ -47,6 +47,8 @@ class TVPaintReviewCreator(TVPaintAutoCreator): "task": task_name, "variant": self.default_variant } + if not self.active_on_create: + data["active"] = False new_instance = CreatedInstance( self.family, subset_name, data, self diff --git a/openpype/hosts/tvpaint/plugins/create/create_workfile.py b/openpype/hosts/tvpaint/plugins/create/create_workfile.py index d56a6c59e7..41347576d5 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_workfile.py +++ b/openpype/hosts/tvpaint/plugins/create/create_workfile.py @@ -43,8 +43,6 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator): "task": task_name, "variant": self.default_variant } - if not self.active_on_create: - data["active"] = False new_instance = CreatedInstance( self.family, subset_name, data, self From 9d600e45880c8e8ab107b87ff14495003d1a76a9 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 17 Feb 2023 13:20:29 +0100 Subject: [PATCH 264/912] OP-4974 - fix - missing set of frame range when opening scene Added check for not up-to-date loaded containers. --- openpype/hosts/harmony/api/pipeline.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/harmony/api/pipeline.py b/openpype/hosts/harmony/api/pipeline.py index 4b9849c190..686770b64e 100644 --- a/openpype/hosts/harmony/api/pipeline.py +++ b/openpype/hosts/harmony/api/pipeline.py @@ -126,10 +126,6 @@ def check_inventory(): def application_launch(event): """Event that is executed after Harmony is launched.""" - # FIXME: This is breaking server <-> client communication. - # It is now moved so it it manually called. - # ensure_scene_settings() - # check_inventory() # fills OPENPYPE_HARMONY_JS pype_harmony_path = Path(__file__).parent.parent / "js" / "PypeHarmony.js" pype_harmony_js = pype_harmony_path.read_text() @@ -146,6 +142,9 @@ def application_launch(event): harmony.send({"script": script}) inject_avalon_js() + ensure_scene_settings() + check_inventory() + def export_template(backdrops, nodes, filepath): """Export Template to file. From a28cc008302328fe7b615551a567cdd8496baa94 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Fri, 17 Feb 2023 21:13:14 +0800 Subject: [PATCH 265/912] add multipass as setting and regex filter in publish job setting --- openpype/hosts/max/api/lib.py | 5 +++++ .../plugins/publish/submit_3dmax_deadline.py | 17 ++++++++++++++++- .../plugins/publish/submit_publish_job.py | 3 ++- .../defaults/project_settings/deadline.json | 3 +++ .../settings/defaults/project_settings/max.json | 3 ++- .../projects_schema/schema_project_max.json | 5 +++++ 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/max/api/lib.py b/openpype/hosts/max/api/lib.py index 0477b43182..a28ec4b6af 100644 --- a/openpype/hosts/max/api/lib.py +++ b/openpype/hosts/max/api/lib.py @@ -151,3 +151,8 @@ def set_framerange(startFrame, endFrame): if startFrame is not None and endFrame is not None: frameRange = "{0}-{1}".format(startFrame, endFrame) rt.rendPickupFrames = frameRange + +def get_multipass_setting(project_setting=None): + return (project_setting["max"] + ["RenderSettings"] + ["multipass"]) diff --git a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py index 656f550e9e..d7716527b1 100644 --- a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py @@ -6,7 +6,11 @@ import requests import pyblish.api from openpype.pipeline import legacy_io -from openpype.hosts.max.api.lib import get_current_renderer +from openpype.settings import get_project_settings +from openpype.hosts.max.api.lib import ( + get_current_renderer, + get_multipass_setting +) from openpype.hosts.max.api.lib_rendersettings import RenderSettings @@ -154,7 +158,18 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): self.log.info("Ensuring output directory exists: %s" % dirname) os.makedirs(dirname) + plugin_data = {} + project_setting = get_project_settings( + legacy_io.Session["AVALON_PROJECT"] + ) + + multipass = get_multipass_setting(project_setting) + if multipass: + plugin_data["DisableMultipass"] = 0 + else: + plugin_data["DisableMultipass"] = 1 + if self.use_published: old_output_dir = os.path.dirname(expected_files[0]) output_beauty = RenderSettings().get_renderoutput(instance.name, diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 22a5069ac2..505b940356 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -126,7 +126,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): aov_filter = {"maya": [r".*([Bb]eauty).*"], "aftereffects": [r".*"], # for everything from AE "harmony": [r".*"], # for everything from AE - "celaction": [r".*"]} + "celaction": [r".*"], + "max": [r".*"]} environ_job_filter = [ "OPENPYPE_METADATA_FILE" diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json index 24d1f7405b..7a5903d8e0 100644 --- a/openpype/settings/defaults/project_settings/deadline.json +++ b/openpype/settings/defaults/project_settings/deadline.json @@ -115,6 +115,9 @@ ], "harmony": [ ".*" + ], + "max": [ + ".*" ] } } diff --git a/openpype/settings/defaults/project_settings/max.json b/openpype/settings/defaults/project_settings/max.json index 617e298310..84e0c7dba7 100644 --- a/openpype/settings/defaults/project_settings/max.json +++ b/openpype/settings/defaults/project_settings/max.json @@ -2,6 +2,7 @@ "RenderSettings": { "default_render_image_folder": "renders/3dsmax", "aov_separator": "underscore", - "image_format": "exr" + "image_format": "exr", + "multipass": true } } \ No newline at end of file diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_max.json b/openpype/settings/entities/schemas/projects_schema/schema_project_max.json index fbd9358c74..8a283c1acc 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_max.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_max.json @@ -44,6 +44,11 @@ {"tga": "tga"}, {"dds": "dds"} ] + }, + { + "type": "boolean", + "key": "multipass", + "label": "multipass" } ] } From 281d53bb01d1da9504be0a19ae0a004804ac8cc9 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Fri, 17 Feb 2023 21:14:43 +0800 Subject: [PATCH 266/912] hound fix --- openpype/hosts/max/api/lib.py | 1 + .../modules/deadline/plugins/publish/submit_3dmax_deadline.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/max/api/lib.py b/openpype/hosts/max/api/lib.py index a28ec4b6af..ecea8b5541 100644 --- a/openpype/hosts/max/api/lib.py +++ b/openpype/hosts/max/api/lib.py @@ -152,6 +152,7 @@ def set_framerange(startFrame, endFrame): frameRange = "{0}-{1}".format(startFrame, endFrame) rt.rendPickupFrames = frameRange + def get_multipass_setting(project_setting=None): return (project_setting["max"] ["RenderSettings"] diff --git a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py index d7716527b1..ed448abe1f 100644 --- a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py @@ -161,8 +161,8 @@ class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): plugin_data = {} project_setting = get_project_settings( - legacy_io.Session["AVALON_PROJECT"] - ) + legacy_io.Session["AVALON_PROJECT"] + ) multipass = get_multipass_setting(project_setting) if multipass: From 8afd618a0d2b2abbe6441d6d9c3d5c57170424ac Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 17 Feb 2023 15:38:43 +0100 Subject: [PATCH 267/912] updating workflows --- .../workflows/miletone_release_trigger.yml | 47 ++++++++++++ .github/workflows/nightly_merge.yml | 29 ------- .github/workflows/prerelease.yml | 67 ---------------- .github/workflows/release.yml | 76 ------------------- 4 files changed, 47 insertions(+), 172 deletions(-) create mode 100644 .github/workflows/miletone_release_trigger.yml delete mode 100644 .github/workflows/nightly_merge.yml delete mode 100644 .github/workflows/prerelease.yml delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/miletone_release_trigger.yml b/.github/workflows/miletone_release_trigger.yml new file mode 100644 index 0000000000..b5b8aab1dc --- /dev/null +++ b/.github/workflows/miletone_release_trigger.yml @@ -0,0 +1,47 @@ +name: Milestone Release [trigger] + +on: + workflow_dispatch: + inputs: + milestone: + required: true + release-type: + type: choice + description: What release should be created + options: + - release + - pre-release + milestone: + types: closed + + +jobs: + milestone-title: + runs-on: ubuntu-latest + outputs: + milestone: ${{ steps.milestoneTitle.outputs.value }} + steps: + - name: Switch input milestone + uses: haya14busa/action-cond@v1 + id: milestoneTitle + with: + cond: ${{ inputs.milestone == '' }} + if_true: ${{ github.event.milestone.title }} + if_false: ${{ inputs.milestone }} + - name: Print resulted milestone + run: | + echo "${{ steps.milestoneTitle.outputs.value }}" + + call-ci-tools-milestone-release: + needs: milestone-title + uses: ynput/ci-tools/.github/workflows/milestone_release_ref.yml@main + with: + milestone: ${{ needs.milestone-title.outputs.milestone }} + repo-owner: ${{ github.event.repository.owner.login }} + repo-name: ${{ github.event.repository.name }} + version-py-path: "./openpype/version.py" + pyproject-path: "./pyproject.toml" + secrets: + token: ${{ secrets.YNPUT_BOT_TOKEN }} + user_email: ${{ secrets.CI_EMAIL }} + user_name: ${{ secrets.CI_USER }} diff --git a/.github/workflows/nightly_merge.yml b/.github/workflows/nightly_merge.yml deleted file mode 100644 index 1776d7a464..0000000000 --- a/.github/workflows/nightly_merge.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Dev -> Main - -on: - schedule: - - cron: '21 3 * * 3,6' - workflow_dispatch: - -jobs: - develop-to-main: - - runs-on: ubuntu-latest - - steps: - - name: 🚛 Checkout Code - uses: actions/checkout@v2 - - - name: 🔨 Merge develop to main - uses: everlytic/branch-merge@1.1.0 - with: - github_token: ${{ secrets.YNPUT_BOT_TOKEN }} - source_ref: 'develop' - target_branch: 'main' - commit_message_template: '[Automated] Merged {source_ref} into {target_branch}' - - - name: Invoke pre-release workflow - uses: benc-uk/workflow-dispatch@v1 - with: - workflow: Nightly Prerelease - token: ${{ secrets.YNPUT_BOT_TOKEN }} diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml deleted file mode 100644 index 571b0339e1..0000000000 --- a/.github/workflows/prerelease.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: Nightly Prerelease - -on: - workflow_dispatch: - - -jobs: - create_nightly: - runs-on: ubuntu-latest - - steps: - - name: 🚛 Checkout Code - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: 3.9 - - - name: Install Python requirements - run: pip install gitpython semver PyGithub - - - name: 🔎 Determine next version type - id: version_type - run: | - TYPE=$(python ./tools/ci_tools.py --bump --github_token ${{ secrets.YNPUT_BOT_TOKEN }}) - echo "type=${TYPE}" >> $GITHUB_OUTPUT - - - name: 💉 Inject new version into files - id: version - if: steps.version_type.outputs.type != 'skip' - run: | - NEW_VERSION_TAG=$(python ./tools/ci_tools.py --nightly --github_token ${{ secrets.YNPUT_BOT_TOKEN }}) - echo "next_tag=${NEW_VERSION_TAG}" >> $GITHUB_OUTPUT - - - name: 💾 Commit and Tag - id: git_commit - if: steps.version_type.outputs.type != 'skip' - run: | - git config user.email ${{ secrets.CI_EMAIL }} - git config user.name ${{ secrets.CI_USER }} - git checkout main - git pull - git add . - git commit -m "[Automated] Bump version" - tag_name="CI/${{ steps.version.outputs.next_tag }}" - echo $tag_name - git tag -a $tag_name -m "nightly build" - - - name: Push to protected main branch - uses: CasperWA/push-protected@v2.10.0 - with: - token: ${{ secrets.YNPUT_BOT_TOKEN }} - branch: main - tags: true - unprotect_reviews: true - - - name: 🔨 Merge main back to develop - uses: everlytic/branch-merge@1.1.0 - if: steps.version_type.outputs.type != 'skip' - with: - github_token: ${{ secrets.YNPUT_BOT_TOKEN }} - source_ref: 'main' - target_branch: 'develop' - commit_message_template: '[Automated] Merged {source_ref} into {target_branch}' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 0b4c8af2c7..0000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,76 +0,0 @@ -name: Stable Release - -on: - release: - types: - - prereleased - -jobs: - create_release: - runs-on: ubuntu-latest - if: github.actor != 'pypebot' - - steps: - - name: 🚛 Checkout Code - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: 3.9 - - name: Install Python requirements - run: pip install gitpython semver PyGithub - - - name: 💉 Inject new version into files - id: version - run: | - NEW_VERSION=$(python ./tools/ci_tools.py --finalize ${GITHUB_REF#refs/*/}) - LAST_VERSION=$(python ./tools/ci_tools.py --lastversion release) - - echo "current_version=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT - echo "last_release=${LAST_VERSION}" >> $GITHUB_OUTPUT - echo "release_tag=${NEW_VERSION}" >> $GITHUB_OUTPUT - - - name: 💾 Commit and Tag - id: git_commit - if: steps.version.outputs.release_tag != 'skip' - run: | - git config user.email ${{ secrets.CI_EMAIL }} - git config user.name ${{ secrets.CI_USER }} - git add . - git commit -m "[Automated] Release" - tag_name="${{ steps.version.outputs.release_tag }}" - git tag -a $tag_name -m "stable release" - - - name: 🔏 Push to protected main branch - if: steps.version.outputs.release_tag != 'skip' - uses: CasperWA/push-protected@v2.10.0 - with: - token: ${{ secrets.YNPUT_BOT_TOKEN }} - branch: main - tags: true - unprotect_reviews: true - - - name: 🚀 Github Release - if: steps.version.outputs.release_tag != 'skip' - uses: ncipollo/release-action@v1 - with: - tag: ${{ steps.version.outputs.release_tag }} - token: ${{ secrets.YNPUT_BOT_TOKEN }} - - - name: ☠ Delete Pre-release - if: steps.version.outputs.release_tag != 'skip' - uses: cb80/delrel@latest - with: - tag: "${{ steps.version.outputs.current_version }}" - - - name: 🔁 Merge main back to develop - if: steps.version.outputs.release_tag != 'skip' - uses: everlytic/branch-merge@1.1.0 - with: - github_token: ${{ secrets.YNPUT_BOT_TOKEN }} - source_ref: 'main' - target_branch: 'develop' - commit_message_template: '[Automated] Merged release {source_ref} into {target_branch}' From 3af80e97e81204ee461acc58ac73cb402f505a6f Mon Sep 17 00:00:00 2001 From: Ynbot Date: Fri, 17 Feb 2023 14:54:45 +0000 Subject: [PATCH 268/912] [Automated] Release --- CHANGELOG.md | 76 +++++++++++++++++++++++++++++++++++++++++++++ openpype/version.py | 2 +- pyproject.toml | 8 ++--- 3 files changed, 81 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0da167763b..8a37886deb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,81 @@ # Changelog + +## [3.15.1](https://github.com/ynput/OpenPype/tree/3.15.1) + +[Full Changelog](https://github.com/ynput/OpenPype/compare/3.15.1...3.15.0) + +### **🆕 New features** + + +
+Maya: Xgen (3d / maya ) - #4256 + + +___ + + +## Brief description +Initial Xgen implementation. + +## Description +Client request of Xgen pipeline. + + + + +___ + + +
+ +### **🚀 Enhancements** + + +
+Adding path validator for non-maya nodes (3d / maya ) - #4271 + + +___ + + +## Brief description +Adding a path validator for filepaths from non-maya nodes, which are created by plugins such as Renderman, Yeti and abcImport. + +## Description +As File Path Editor cannot catch the wrong filenpaths from non-maya nodes such as AlembicNodes, It is neccessary to have a new validator to ensure the existence of the filepaths from the nodes. + + + + +___ + + +
+ +### **🐛 Bug fixes** + + +
+Fix features for gizmo menu (2d / nuke ) - #4280 + + +___ + + +## Brief description +Fix features for the Gizmo Menu project settings (shortcut for python type of usage and file type of usage functionality) + + + + +___ + + +
+ + + ## [3.15.0](https://github.com/ynput/OpenPype/tree/HEAD) [Full Changelog](https://github.com/ynput/OpenPype/compare/3.14.10...HEAD) diff --git a/openpype/version.py b/openpype/version.py index 6d060656cb..72d6b64c60 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.15.1-nightly.6" +__version__ = "3.15.1" diff --git a/pyproject.toml b/pyproject.toml index a872ed3609..d1d5c8e2d3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "OpenPype" -version = "3.15.0" # OpenPype +version = "3.15.1" # OpenPype description = "Open VFX and Animation pipeline with support." authors = ["OpenPype Team "] license = "MIT License" @@ -114,15 +114,15 @@ build-backend = "poetry.core.masonry.api" # https://pip.pypa.io/en/stable/cli/pip_install/#requirement-specifiers [openpype.qtbinding.windows] package = "PySide2" -version = "5.15.2" +version = "3.15.1" [openpype.qtbinding.darwin] package = "PySide6" -version = "6.4.1" +version = "3.15.1" [openpype.qtbinding.linux] package = "PySide2" -version = "5.15.2" +version = "3.15.1" # TODO: we will need to handle different linux flavours here and # also different macos versions too. From 15c9f71633c1cb598618e7629ef496b6d1abeec7 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 17 Feb 2023 16:12:04 +0100 Subject: [PATCH 269/912] updating changelog --- CHANGELOG.md | 383 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 378 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a37886deb..752a7dc1d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,82 +3,455 @@ ## [3.15.1](https://github.com/ynput/OpenPype/tree/3.15.1) -[Full Changelog](https://github.com/ynput/OpenPype/compare/3.15.1...3.15.0) +[Full Changelog](https://github.com/ynput/OpenPype/compare/3.15.0...3.15.1) ### **🆕 New features** + +
Maya: Xgen (3d / maya ) - #4256 + ___ + ## Brief description + Initial Xgen implementation. + + ## Description + Client request of Xgen pipeline. + + + ___ +
+ ### **🚀 Enhancements** + +
Adding path validator for non-maya nodes (3d / maya ) - #4271 + ___ + ## Brief description + Adding a path validator for filepaths from non-maya nodes, which are created by plugins such as Renderman, Yeti and abcImport. + + ## Description + As File Path Editor cannot catch the wrong filenpaths from non-maya nodes such as AlembicNodes, It is neccessary to have a new validator to ensure the existence of the filepaths from the nodes. + + + ___ +
+ + +
+Deadline: Allow disabling strict error check in Maya submissions (3d / maya / deadline ) - #4420 + + + +___ + + + +## Brief description + +DL by default has Strict error checking, but some errors are not fatal. + + + +## Description + +This allows to set profile based on Task and Subset values to temporarily disable Strict Error Checks.Subset and task names should support regular expressions. (not wildcard notation though). + + + + + + + +___ + + + +
+ + + +
+Houdini: New publisher code tweak (3d / houdini ) - #4374 + + + +___ + + + +## Brief description + +This is cosmetics only - the previous code to me felt quite unreadable due to the lengthy strings being used. + + + +## Description + +Code should do roughly the same, but just be reformatted. + + + + + + + +___ + + + +
+ + + +
+Houdini: Do not visualize the hidden OpenPypeContext node (3d / houdini ) - #4382 + + + +___ + + + +## Brief description + +Using the new publisher UI would generate a visible 'null' locator at the origin. It's confusing to the user since it's supposed to be 'hidden'. + + + +## Description + +Before this PR the user would see a locator/null at the origin which was the 'hidden' `/obj/OpenPypeContext` node. This null would suddenly appear if the user would've ever opened the Publisher UI once.After this PR it will not show:Nice and tidy. + + + + + + + +___ + + + +
+ + + +
+Global: supporting `OPENPYPE_TMPDIR` in staging dir maker (editorial / hiero ) - #4398 + + + +___ + + + +## Brief description + +Productions can use OPENPYPE_TMPDIR for staging temp publishing directory + + + +## Description + +Studios were demanding to be able to configure their own shared storages as temporary staging directories. Template formatting is also supported with optional keys formatting and following anatomy keys: - root[work | ] - project[name | code] + + + + + + + +___ + + + +
+ + ### **🐛 Bug fixes** + + +
+Maya: Fix Validate Attributes plugin (3d / maya ) - #4401 + + + +___ + + + +## Brief description + +Code was broken. So either plug-in was unused or it had gone unnoticed. + + + +## Description + +Looking at the commit history of the plug-in itself it seems this might have been broken somewhere between two to three years. I think it's broken since two years since this commit.Should this plug-in be removed completely?@tokejepsen Is there still a use case where we should have this plug-in? (You created the original one) + + + + + + + +___ + + + +
+ + + +
+Maya: Ignore workfile lock in Untitled scene (3d / maya ) - #4414 + + + +___ + + + +## Brief description + +Skip workfile lock check if current scene is 'Untitled'. + + + + + + + +___ + + + +
+ + + +
+Maya: fps rounding - OP-2549 (3d / maya ) - #4424 + + + +___ + + + +## Brief description + +When FPS is registered in for example Ftrack and round either down or up (floor/ceil), comparing to Maya FPS can fail. Example:23.97 (Ftrack/Mongo) != 23.976023976023978 (Maya) + + + +## Description + +Since Maya only has a select number of supported framerates, I've taken the approach of converting any fps to supported framerates in Maya. We validate the input fps to make sure they are supported in Maya in two ways:Whole Numbers - are validated straight against the supported framerates in Maya.Demical Numbers - we find the closest supported framerate in Maya. If the difference to the closest supported framerate, is more than 0.5 we'll throw an error.If Maya ever supports arbitrary framerates, then we might have a problem but I'm not holding my breath... + + + + + + + +___ + + + +
+ + + +
+Strict Error Checking Default (3d / maya ) - #4457 + + + +___ + + + +## Brief description + +Provide default of strict error checking for instances created prior to PR. + + + + + + + +___ + + + +
+ + + +
+Create: Enhance instance & context changes (3d / houdini,after effects,3dsmax ) - #4375 + + + +___ + + + +## Brief description + +Changes of instances and context have complex, hard to get structure. The structure did not change but instead of complex dictionaries are used objected data. + + + +## Description + +This is poposal of changes data improvement for creators. Implemented `TrackChangesItem` which handles the changes for us. The item is creating changes based on old and new value and can provide information about changed keys or access to full old or new value. Can give the values on any "sub-dictionary".Used this new approach to fix change in houdini and 3ds max and also modified one aftereffects plugin using changes. + + + + + + + +___ + + + +
+ + + +
+Houdini: hotfix condition (3d / houdini ) - #4391 + + + +___ + + + +## Hotfix + + + +This is fixing bug introduced int #4374 + + + +___ + + + +
+ + + +
+Houdini: Houdini shelf tools fixes (3d / houdini ) - #4428 + + + +___ + + + +## Brief description + +Fix Houdini shelf tools. + + + +## Description + +Use `label` as mandatory key instead of `name`. Changed how shelves are created. If the script is empty it is gracefully skipping it instead of crashing. + + + + + + + +___ + + + +
+ + +
Fix features for gizmo menu (2d / nuke ) - #4280 + ___ + ## Brief description + Fix features for the Gizmo Menu project settings (shortcut for python type of usage and file type of usage functionality) - - ___ +
-## [3.15.0](https://github.com/ynput/OpenPype/tree/HEAD) +## [3.15.0](https://github.com/ynput/OpenPype/tree/3.15.0) -[Full Changelog](https://github.com/ynput/OpenPype/compare/3.14.10...HEAD) +[Full Changelog](https://github.com/ynput/OpenPype/compare/3.14.10...3.15.0) **Deprecated:** From 39ee896d7ebb4ab22d7d747bd2693e79bb7d9512 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov <11698866+movalex@users.noreply.github.com> Date: Sat, 18 Feb 2023 07:47:42 +0300 Subject: [PATCH 270/912] Update openpype/hosts/fusion/api/lib.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- openpype/hosts/fusion/api/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/api/lib.py b/openpype/hosts/fusion/api/lib.py index 709d3cbdc6..4830c3b3df 100644 --- a/openpype/hosts/fusion/api/lib.py +++ b/openpype/hosts/fusion/api/lib.py @@ -311,7 +311,7 @@ def get_fusion_module(): def get_current_comp(): """Get current comp in this session""" fusion = get_fusion_module() - if fusion: + if fusion is not None: comp = fusion.CurrentComp return comp From aaba8c1f7be4dca894ab51c6a84092b9759e88e8 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Mon, 20 Feb 2023 07:37:50 +0000 Subject: [PATCH 271/912] Fix attributes --- openpype/settings/defaults/project_anatomy/attributes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_anatomy/attributes.json b/openpype/settings/defaults/project_anatomy/attributes.json index 0cc414fb69..bf8bbef8de 100644 --- a/openpype/settings/defaults/project_anatomy/attributes.json +++ b/openpype/settings/defaults/project_anatomy/attributes.json @@ -23,4 +23,4 @@ ], "tools_env": [], "active": true -} +} \ No newline at end of file From 9875185d7813e6cdf0212537b6a9eef0bb328ab8 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 20 Feb 2023 10:39:12 +0100 Subject: [PATCH 272/912] fix CI release [automation bugs] --- CHANGELOG.md | 1008 +++++++++++++++++++++++++++++++++++++++++------- pyproject.toml | 6 +- 2 files changed, 872 insertions(+), 142 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 752a7dc1d6..c7ecbc83bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,32 +13,47 @@
Maya: Xgen (3d / maya ) - #4256 - - ___ - - -## Brief description +#### Brief description Initial Xgen implementation. -## Description +#### Description Client request of Xgen pipeline. +___ + +
+ + + +
+Data exchange cameras for 3d Studio Max (3d / 3dsmax ) - #4376 + +___ + +#### Brief description + +Add Camera Family into the 3d Studio Max + + + +#### Description + +Adding Camera Extractors(extract abc camera and extract fbx camera) and validators(for camera contents) into 3dMaxAlso add the extractor for exporting 3d max raw scene (which is also related to 3dMax Scene Family) for camera family + ___ - -
@@ -50,32 +65,23 @@ ___
Adding path validator for non-maya nodes (3d / maya ) - #4271 - - ___ - - -## Brief description +#### Brief description Adding a path validator for filepaths from non-maya nodes, which are created by plugins such as Renderman, Yeti and abcImport. -## Description +#### Description As File Path Editor cannot catch the wrong filenpaths from non-maya nodes such as AlembicNodes, It is neccessary to have a new validator to ensure the existence of the filepaths from the nodes. - - - ___ - -
@@ -83,32 +89,23 @@ ___
Deadline: Allow disabling strict error check in Maya submissions (3d / maya / deadline ) - #4420 - - ___ - - -## Brief description +#### Brief description DL by default has Strict error checking, but some errors are not fatal. -## Description +#### Description This allows to set profile based on Task and Subset values to temporarily disable Strict Error Checks.Subset and task names should support regular expressions. (not wildcard notation though). - - - ___ - -
@@ -116,65 +113,43 @@ ___
Houdini: New publisher code tweak (3d / houdini ) - #4374 - - ___ - - -## Brief description +#### Brief description This is cosmetics only - the previous code to me felt quite unreadable due to the lengthy strings being used. -## Description +#### Description Code should do roughly the same, but just be reformatted. - - - ___ - -
-Houdini: Do not visualize the hidden OpenPypeContext node (3d / houdini ) - #4382 - - +3dsmax: enhance alembic loader update function (3d / 3dsmax ) - #4387 ___ - - -## Brief description - -Using the new publisher UI would generate a visible 'null' locator at the origin. It's confusing to the user since it's supposed to be 'hidden'. - - - -## Description - -Before this PR the user would see a locator/null at the origin which was the 'hidden' `/obj/OpenPypeContext` node. This null would suddenly appear if the user would've ever opened the Publisher UI once.After this PR it will not show:Nice and tidy. - +## Enhancement +This PR is adding update/switch ability to pointcache/alembic loader in 3dsmax and fixing wrong tool shown when clicking on "Manage" item on OpenPype menu, that is now correctly Scene Inventory (but was Subset Manager). +Alembic update has still one caveat - it doesn't cope with changed number of object inside alembic, since loading alembic in max involves creating all those objects as first class nodes. So it will keep the objects in scene, just update path to alembic file on them. ___ - -
@@ -182,32 +157,143 @@ ___
Global: supporting `OPENPYPE_TMPDIR` in staging dir maker (editorial / hiero ) - #4398 - - ___ - - -## Brief description +#### Brief description Productions can use OPENPYPE_TMPDIR for staging temp publishing directory -## Description +#### Description Studios were demanding to be able to configure their own shared storages as temporary staging directories. Template formatting is also supported with optional keys formatting and following anatomy keys: - root[work | ] - project[name | code] +___ + +
+ + + +
+General: Functions for current context (other ) - #4324 + +___ + +#### Brief description + +Defined more functions to receive current context information and added the methods to host integration so host can affect the result. + + + +#### Description + +This is one of steps to reduce usage of `legacy_io.Session`. This change define how to receive current context information -> call functions instead of accessing `legacy_io.Session` or `os.environ` directly. Plus, direct access on session or environments is unfortunatelly not enough for some DCCs where multiple workfiles can be opened at one time which can heavily affect the context but host integration sometimes can't affect that at all.`HostBase` already had implemented `get_current_context`, that was enhanced by adding more specific methods `get_current_project_name`, `get_current_asset_name` and `get_current_task_name`. The same functions were added to `~/openpype/pipeline/cotext_tools.py`. The functions in context tools are calling host integration methods (if are available) otherwise are using environent variables as default implementation does. Also was added `get_current_host_name` to receive host name from registered host if is available or from environment variable. + ___ +
+ +
+Houdini: Do not visualize the hidden OpenPypeContext node (other / houdini ) - #4382 + +___ + +#### Brief description + +Using the new publisher UI would generate a visible 'null' locator at the origin. It's confusing to the user since it's supposed to be 'hidden'. + + + +#### Description + +Before this PR the user would see a locator/null at the origin which was the 'hidden' `/obj/OpenPypeContext` node. This null would suddenly appear if the user would've ever opened the Publisher UI once.After this PR it will not show:Nice and tidy. + + + + +___ + +
+ + + +
+Maya + Blender: Pyblish plugins removed unused `version` and `category` attributes (other ) - #4402 + +___ + +#### Brief description + +Once upon a time in a land far far away there lived a few plug-ins who felt like they didn't belong in generic boxes and felt they needed to be versioned well above others. They tried, but with no success. + + + +#### Description + +Even though they now lived in a universe with elaborate `version` and `category` attributes embedded into their tiny little plug-in DNA this particular deviation has been greatly unused. There is nothing special about the version, nothing special about the category.It does nothing. + + + + +___ + +
+ + + +
+General: Fix original basename frame issues (other ) - #4452 + +___ + +#### Brief description + +Treat `{originalBasename}` in different way then standard files processing. In case template should use `{originalBasename}` the transfers will use them as they are without any changes or handling of frames. + + + +#### Description + +Frames handling is problematic with original basename because their padding can't be defined to match padding in source filenames. Also it limits the usage of functionality to "must have frame at end of fiename". This is proposal how that could be solved by simply ignoring frame handling and using filenames as are on representation. First frame is still stored to representation context but is not used in formatting part. This way we don't have to care about padding of frames at all. + + + + +___ + +
+ + + +
+Publisher: Report also crashed creators and convertors (other ) - #4473 + +___ + +#### Brief description + +Added crashes of creators and convertos discovery (lazy solution). + + + +#### Description + +Report in Publisher also contains information about crashed files caused during creator plugin discovery and convertor plugin discovery. They're not separated into categroies and there is no other information in the report about them, but this helps a lot during development. This change does not need to change format/schema of the report nor UI logic. + + + + +___ +
@@ -219,32 +305,23 @@ ___
Maya: Fix Validate Attributes plugin (3d / maya ) - #4401 - - ___ - - -## Brief description +#### Brief description Code was broken. So either plug-in was unused or it had gone unnoticed. -## Description +#### Description Looking at the commit history of the plug-in itself it seems this might have been broken somewhere between two to three years. I think it's broken since two years since this commit.Should this plug-in be removed completely?@tokejepsen Is there still a use case where we should have this plug-in? (You created the original one) - - - ___ - -
@@ -252,26 +329,17 @@ ___
Maya: Ignore workfile lock in Untitled scene (3d / maya ) - #4414 - - ___ - - -## Brief description +#### Brief description Skip workfile lock check if current scene is 'Untitled'. - - - ___ - -
@@ -279,32 +347,23 @@ ___
Maya: fps rounding - OP-2549 (3d / maya ) - #4424 - - ___ - - -## Brief description +#### Brief description When FPS is registered in for example Ftrack and round either down or up (floor/ceil), comparing to Maya FPS can fail. Example:23.97 (Ftrack/Mongo) != 23.976023976023978 (Maya) -## Description +#### Description Since Maya only has a select number of supported framerates, I've taken the approach of converting any fps to supported framerates in Maya. We validate the input fps to make sure they are supported in Maya in two ways:Whole Numbers - are validated straight against the supported framerates in Maya.Demical Numbers - we find the closest supported framerate in Maya. If the difference to the closest supported framerate, is more than 0.5 we'll throw an error.If Maya ever supports arbitrary framerates, then we might have a problem but I'm not holding my breath... - - - ___ - -
@@ -312,26 +371,17 @@ ___
Strict Error Checking Default (3d / maya ) - #4457 - - ___ - - -## Brief description +#### Brief description Provide default of strict error checking for instances created prior to PR. - - - ___ - -
@@ -339,32 +389,23 @@ ___
Create: Enhance instance & context changes (3d / houdini,after effects,3dsmax ) - #4375 - - ___ - - -## Brief description +#### Brief description Changes of instances and context have complex, hard to get structure. The structure did not change but instead of complex dictionaries are used objected data. -## Description +#### Description This is poposal of changes data improvement for creators. Implemented `TrackChangesItem` which handles the changes for us. The item is creating changes based on old and new value and can provide information about changed keys or access to full old or new value. Can give the values on any "sub-dictionary".Used this new approach to fix change in houdini and 3ds max and also modified one aftereffects plugin using changes. - - - ___ - -
@@ -372,24 +413,15 @@ ___
Houdini: hotfix condition (3d / houdini ) - #4391 - - ___ - - ## Hotfix This is fixing bug introduced int #4374 - - - ___ - -
@@ -397,32 +429,47 @@ ___
Houdini: Houdini shelf tools fixes (3d / houdini ) - #4428 - - ___ - - -## Brief description +#### Brief description Fix Houdini shelf tools. -## Description +#### Description Use `label` as mandatory key instead of `name`. Changed how shelves are created. If the script is empty it is gracefully skipping it instead of crashing. +___ + +
+ + + +
+3dsmax: startup fixes (3d / 3dsmax ) - #4412 + +___ + +#### Brief description + +This is fixing various issues that can occur on some of the 3dsmax versions. + + + +#### Description + +On displays with +4K resolution UI was broken, some 3dsmax versions couldn't process `PYTHONPATH` correctly. This PR is forcing `sys.path` and disabling `QT_AUTO_SCREEN_SCALE_FACTOR` + ___ - -
@@ -430,25 +477,708 @@ ___
Fix features for gizmo menu (2d / nuke ) - #4280 - - ___ - - -## Brief description +#### Brief description Fix features for the Gizmo Menu project settings (shortcut for python type of usage and file type of usage functionality) + + ___ +
+ +
+Photoshop: fix missing legacy io for legacy instances (2d / photoshop,after effects ) - #4467 + +___ + +#### Brief description + +`legacy_io` import was removed, but usage stayed. + + + +#### Description + +Usage of `legacy_io` should be eradicated, in creators it should be replaced by `self.create_context.get_current_project_name/asset_name/task_name`. + + + + +___ +
+
+Fix - addSite loader handles hero version (other / sitesync ) - #4359 + +___ + +#### Brief description + +If adding site to representation presence of hero version is checked, if found hero version is marked to be donwloaded too.Replacing https://github.com/ynput/OpenPype/pull/4191 + + + + +___ + +
+ + + +
+Remove OIIO build for macos (other ) - #4381 + +___ + +## Fix + + + +Since we are not able to provide OpenImageIO tools binaries for macos, we should remove the item from th `pyproject.toml`. This PR is taking care of it. + + + +It is also changing the way `fetch_thirdparty_libs` script works in that it doesn't crash when lib cannot be processed, it only issue warning. + + + + + +Resolves #3858 +___ + +
+ + + +
+General: Attribute definitions fixes (other ) - #4392 + +___ + +#### Brief description + +Fix possible issues with attribute definitions in publisher if there is unknown attribute on an instance. + + + +#### Description + +Source of the issue is that attribute definitions from creator plugin could be "expanded" during `CreatedInstance` initialization. Which would affect all other instances using the same list of attributes -> literally object of list. If the same list object is used in "BaseClass" for other creators it would affect all instances (because of 1 instance). There had to be implemented other changes to fix the issue and keep behavior the same.Object of `CreatedInstance` can be created without reference to creator object. `CreatedInstance` is responsible to give UI attribute definitions (technically is prepared for cases when each instance may have different attribute definitions -> not yet).Attribute definition has added more conditions for `__eq__` method and have implemented `__ne__` method (which is required for Py 2 compatibility). Renamed `AbtractAttrDef` to `AbstractAttrDef` (fix typo). + + + + +___ + +
+ + + +
+Ftrack: Don't force ftrackapp endpoint (other / ftrack ) - #4411 + +___ + +#### Brief description + +Auto-fill of ftrack url don't break custom urls. Custom urls couldn't be used as `ftrackapp.com` is added if is not in the url. + + + +#### Description + +The code was changed in a way that auto-fill is still supported but before `ftrackapp` is added it will try to use url as is. If the connection works as is it is used. + + + + +___ + +
+ + + +
+Fix: DL on MacOS (other ) - #4418 + +___ + +#### Brief description + +This works if DL Openpype plugin Installation Directories is set to level of app bundle (eg. '/Applications/OpenPype 3.15.0.app') + + + + +___ + +
+ + + +
+Photoshop: make usage of layer name in subset name more controllable (other ) - #4432 + +___ + +#### Brief description + +Layer name was previously used in subset name only if multiple instances were being created in single step. This adds explicit toggle. + + + +#### Description + +Toggling this button allows to use layer name in created subset name even if single instance is being created.This follows more closely implementation if AE. + + + + +___ + +
+ + + +
+SiteSync: fix dirmap (other ) - #4436 + +___ + +#### Brief description + +Fixed issue in dirmap in Maya and Nuke + + + +#### Description + +Loads of error were thrown in Nuke console about dictionary value.`AttributeError: 'dict' object has no attribute 'lower'` + + + + +___ + +
+ + + +
+General: Ignore decode error of stdout/stderr in run_subprocess (other ) - #4446 + +___ + +#### Brief description + +Ignore decode errors and replace invalid character (byte) with escaped byte character. + + + +#### Description + +Calling of `run_subprocess` may cause crashes if output contains some unicode character which (for example Polish name of encoder handler). + + + + +___ + +
+ + + +
+Publisher: Fix reopen bug (other ) - #4463 + +___ + +#### Brief description + +Use right name of constant 'ActiveWindow' -> 'WindowActive'. + + + + +___ + +
+ + + +
+Publisher: Fix compatibility of QAction in Publisher (other ) - #4474 + +___ + +#### Brief description + +Fix `QAction` for older version of Qt bindings where QAction requires a parent on initialization. + + + +#### Description + +This bug was discovered in Nuke 11. Fixed by creating QAction when QMenu is already available and can be used as parent. + + + + +___ + +
+ + +### **🔀 Refactored code** + + + + +
+General: Remove 'openpype.api' (other ) - #4413 + +___ + +#### Brief description + +PR is removing `openpype/api.py` file which is causing a lot of troubles and cross-imports. + + + +#### Description + +I wanted to remove the file slowly function by function but it always reappear somewhere in codebase even if most of the functionality imported from there is triggering deprecation warnings. This is small change which may have huge impact.There shouldn't be anything in openpype codebase which is using `openpype.api` anymore so only possible issues are in customized repositories or custom addons. + + + + +___ + +
+ + +### **📃 Documentation** + + + + +
+docs-user-Getting Started adjustments (other ) - #4365 + +___ + +#### Brief description + +Small typo fixes here and there, additional info on install/ running OP. + + + + +___ + +
+ + +### **Merged pull requests** + + + + +
+Renderman support for sample and display filters (3d / maya ) - #4003 + +___ + +#### Brief description + +User can set up both sample and display filters in Openpype settings if they are using Renderman as renderer. + + + +#### Description + +You can preset which sample and display filters for renderman , including the cryptomatte renderpass, in Openpype settings. Once you select which filters to be included in openpype settings and then create render instance for your camera in maya, it would automatically tell the system to generate your selected filters in render settings.The place you can find for setting up the filters: _Maya > Render Settings > Renderman Renderer > Display Filters/ Sample Filters_ + + + + +___ + +
+ + + +
+Maya: Create Arnold options on repair. (3d / maya ) - #4448 + +___ + +#### Brief description + +When validating/repairing we previously required users to open render settings to create the Arnold options. This is done through code now. + + + + +___ + +
+ + + +
+Update Asset field of creator Instances in Maya Template Builder (3d / maya ) - #4470 + +___ + +#### Brief description + +When we build a template with Maya Template Builder, it will update the asset field of the sets (creator instances) that are imported from the template. + + + +#### Description + +When building a template, we also want to define the publishable content in advance: create an instance of a model, or look, etc., to speed up the workflow and reduce the number of questions we are asked. After building a work file from a saved template that contains pre-created instances, the template builder should update the asset field to the current asset. + + + + +___ + +
+ + + +
+Blender: fix import workfile all families (3d / blender ) - #4405 + +___ + +#### Brief description + +Having this feature related to workfile available for any family is absurd. + + + + +___ + +
+ + + +
+Nuke: update rendered frames in latest version (2d / nuke ) - #4362 + +___ + +#### Brief description + +Introduced new field to insert frame(s) to rerender only. + + + +#### Description + +Rendering is expensive, sometimes it is helpful only to re-render changed frames and reuse existing.Artists can in Publisher fill which frame(s) should be re-rendered.If there is already published version of currently publishing subset, all representation files are collected (currently for `render` family only) and then when Nuke is rendering (locally only for now), old published files are copied into into temporary render folder where will be rewritten only by frames explicitly set in new field.That way review/burnin process could also reuse old files and recreate reviews/burnins.New version is produced during this process! + + + + +___ + +
+ + + +
+Feature: Keep synced hero representations up-to-date. (other ) - #4343 + +___ + +#### Brief description + +Keep previously synchronized sites up-to-date by comparing old and new sites and adding old sites if missing in new ones.Fix #4331 + + + + +___ + +
+ + + +
+Maya: Fix template builder bug where assets are not put in the right hierarchy (other ) - #4367 + +___ + +#### Brief description + +When buiding scene from template, the assets loaded from the placeholders are not put in the hierarchy. Plus, the assets are loaded in double. + + + + +___ + +
+ + + +
+Bump ua-parser-js from 0.7.31 to 0.7.33 in /website (other ) - #4371 + +___ + +Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.31 to 0.7.33. +
+Changelog +

Sourced from ua-parser-js's changelog.

+
+

Version 0.7.31 / 1.0.2

+
    +
  • Fix OPPO Reno A5 incorrect detection
    • +
  • Fix TypeError Bug
    • +
  • Use AST to extract regexes and verify them with safe-regex
    • +
+

Version 0.7.32 / 1.0.32

+
    +
  • Add new browser : DuckDuckGo, Huawei Browser, LinkedIn
    • +
  • Add new OS : HarmonyOS
    • +
  • Add some Huawei models
    • +
  • Add Sharp Aquos TV
    • +
  • Improve detection Xiaomi Mi CC9
    • +
  • Fix Sony Xperia 1 III misidentified as Acer tablet
    • +
  • Fix Detect Sony BRAVIA as SmartTV
    • +
  • Fix Detect Xiaomi Mi TV as SmartTV
    • +
  • Fix Detect Galaxy Tab S8 as tablet
    • +
  • Fix WeGame mistakenly identified as WeChat
    • +
  • Fix included commas in Safari / Mobile Safari version
    • +
  • Increase UA_MAX_LENGTH to 350
    • +
+

Version 0.7.33 / 1.0.33

+
    +
  • Add new browser : Cobalt
    • +
  • Identify Macintosh as an Apple device
    • +
  • Fix ReDoS vulnerability
    • +
+

Version 0.8

+

Version 0.8 was created by accident. This version is now deprecated and no longer maintained, please update to version 0.7 / 1.0.

+
+
+
+Commits +
    +
  • f2d0db0 Bump version 0.7.33
    • +
  • a6140a1 Remove unsafe regex in trim() function
    • +
  • a886604 Fix #605 - Identify Macintosh as Apple device
    • +
  • b814bcd Merge pull request #606 from rileyjshaw/patch-1
    • +
  • 7f71024 Fix documentation
    • +
  • c239ac5 Merge pull request #604 from obecerra3/master
    • +
  • 8d3c2d3 Add new browser: Cobalt
    • +
  • d11fc47 Bump version 0.7.32
    • +
  • b490110 Merge branch 'develop' of github.com:faisalman/ua-parser-js
    • +
  • cb5da5e Merge pull request #600 from moekm/develop
    • +
  • Additional commits viewable in compare view
    • +
+
+
+ + +[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=ua-parser-js&package-manager=npm_and_yarn&previous-version=0.7.31&new-version=0.7.33)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) + +Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. + +[//]: # (dependabot-automerge-start) +[//]: # (dependabot-automerge-end) + +--- + +
+Dependabot commands and options +
+ +You can trigger Dependabot actions by commenting on this PR: +- `@dependabot rebase` will rebase this PR +- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it +- `@dependabot merge` will merge this PR after your CI passes on it +- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it +- `@dependabot cancel merge` will cancel a previously requested merge and block automerging +- `@dependabot reopen` will reopen this PR if it is closed +- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually +- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) +- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) +- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) +- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language +- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language +- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language +- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language + +You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/ynput/OpenPype/network/alerts). + +
+___ + +
+ + + +
+Docs: Question about renaming in Kitsu (other ) - #4384 + +___ + +#### Brief description + +To keep memory of this discussion: https://discord.com/channels/517362899170230292/563751989075378201/1068112668491255818 + + + + +___ + +
+ + + +
+New Publisher: Fix Creator error typo (other ) - #4396 + +___ + +#### Brief description + +Fixes typo in error message. + + + + +___ + +
+ + + +
+Chore: pyproject.toml version because of Poetry (other ) - #4408 + +___ + +#### Brief description + +Automatization injects wrong format + + + + +___ + +
+ + + +
+Fix - remove minor part in toml (other ) - #4437 + +___ + +#### Brief description + +Causes issue in create_env and new Poetry + + + + +___ + +
+ + + +
+General: Add project code to anatomy (other ) - #4445 + +___ + +#### Brief description + +Added attribute `project_code` to `Anatomy` object. + + + +#### Description + +Anatomy already have access to almost all attributes from project anatomy except project code. This PR changing it. Technically `Anatomy` is everything what would be needed to get fill data of project. + +``` + +{ + + "project": { + + "name": anatomy.project_name, + + "code": anatomy.project_code + + } + +} + +``` + + +___ + +
+ + + +
+Maya: Arnold Scene Source overhaul - OP-4865 (other / maya ) - #4449 + +___ + +#### Brief description + +General overhaul of the Arnold Scene Source (ASS) workflow. + + + +#### Description + +This originally was to support static files (non-sequencial) ASS publishing, but digging deeper whole workflow needed an update to get ready for further issues. During this overhaul the following changes were made: + +- Generalized Arnold Standin workflow to a single loader. + +- Support multiple nodes as proxies. + +- Support proxies for `pointcache` family. + +- Generalized approach to proxies as resources, so they can be the same file format as the original.This workflow should allow further expansion to utilize operators and eventually USD. + + + + +___ + +
+ + + + ## [3.15.0](https://github.com/ynput/OpenPype/tree/3.15.0) [Full Changelog](https://github.com/ynput/OpenPype/compare/3.14.10...3.15.0) diff --git a/pyproject.toml b/pyproject.toml index d1d5c8e2d3..2fc4f6fe39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -114,15 +114,15 @@ build-backend = "poetry.core.masonry.api" # https://pip.pypa.io/en/stable/cli/pip_install/#requirement-specifiers [openpype.qtbinding.windows] package = "PySide2" -version = "3.15.1" +version = "5.15.2" [openpype.qtbinding.darwin] package = "PySide6" -version = "3.15.1" +version = "6.4.1" [openpype.qtbinding.linux] package = "PySide2" -version = "3.15.1" +version = "5.15.2" # TODO: we will need to handle different linux flavours here and # also different macos versions too. From 7a2c94f9d511c2d15ca554709beded5fe3055515 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 20 Feb 2023 11:06:37 +0100 Subject: [PATCH 273/912] limit groups query to 26 max --- openpype/hosts/tvpaint/api/lib.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/tvpaint/api/lib.py b/openpype/hosts/tvpaint/api/lib.py index 5e64773b8e..312a211d49 100644 --- a/openpype/hosts/tvpaint/api/lib.py +++ b/openpype/hosts/tvpaint/api/lib.py @@ -202,8 +202,9 @@ def get_groups_data(communicator=None): # Variable containing full path to output file "output_path = \"{}\"".format(output_filepath), "empty = 0", - # Loop over 100 groups - "FOR idx = 1 TO 100", + # Loop over 26 groups which is ATM maximum possible (in 11.7) + # - ref: https://www.tvpaint.com/forum/viewtopic.php?t=13880 + "FOR idx = 1 TO 26", # Receive information about groups "tv_layercolor \"getcolor\" 0 idx", "PARSE result clip_id group_index c_red c_green c_blue group_name", From c3c850f0348de62126689e887cc99b20cdbd538c Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 20 Feb 2023 11:06:53 +0100 Subject: [PATCH 274/912] change how groups are filtered for render passes --- .../tvpaint/plugins/create/create_render.py | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 41288e5968..d9355c42fd 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -219,15 +219,30 @@ class CreateRenderlayer(TVPaintCreator): f" was changed to \"{new_group_name}\"." )) - def get_pre_create_attr_defs(self): - groups_enum = [ - { - "label": group["name"], + def _get_groups_enum(self): + groups_enum = [] + empty_groups = [] + for group in get_groups_data(): + group_name = group["name"] + item = { + "label": group_name, "value": group["group_id"] } - for group in get_groups_data() - if group["name"] - ] + # TVPaint have defined how many color groups is available, but + # the count is not consistent across versions. It is not possible + # to know how many groups there is. + # + if group_name and group_name != "0": + if empty_groups: + groups_enum.extend(empty_groups) + empty_groups = [] + groups_enum.append(item) + else: + empty_groups.append(item) + return groups_enum + + def get_pre_create_attr_defs(self): + groups_enum = self._get_groups_enum() groups_enum.insert(0, {"label": "", "value": -1}) return [ @@ -249,14 +264,7 @@ class CreateRenderlayer(TVPaintCreator): ] def get_instance_attr_defs(self): - groups_enum = [ - { - "label": group["name"], - "value": group["group_id"] - } - for group in get_groups_data() - if group["name"] - ] + groups_enum = self._get_groups_enum() return [ EnumDef( "group_id", From 1b69c5e3409d3c67e384eef8c4c1c12054bed2cd Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 20 Feb 2023 11:09:24 +0100 Subject: [PATCH 275/912] fix used key --- .../hosts/tvpaint/plugins/publish/validate_scene_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_scene_settings.py b/openpype/hosts/tvpaint/plugins/publish/validate_scene_settings.py index d235215ac9..4473e4b1b7 100644 --- a/openpype/hosts/tvpaint/plugins/publish/validate_scene_settings.py +++ b/openpype/hosts/tvpaint/plugins/publish/validate_scene_settings.py @@ -42,7 +42,7 @@ class ValidateProjectSettings(pyblish.api.ContextPlugin): "expected_width": expected_data["resolutionWidth"], "expected_height": expected_data["resolutionHeight"], "current_width": scene_data["resolutionWidth"], - "current_height": scene_data["resolutionWidth"], + "current_height": scene_data["resolutionHeight"], "expected_pixel_ratio": expected_data["pixelAspect"], "current_pixel_ratio": scene_data["pixelAspect"] } From a189a8df8a1aed35e7b393c4ec8027911d38d47f Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 20 Feb 2023 13:23:25 +0100 Subject: [PATCH 276/912] OP-3026 - enhanced log with host info --- openpype/settings/handlers.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/openpype/settings/handlers.py b/openpype/settings/handlers.py index 3fa5737b6f..a1f3331ccc 100644 --- a/openpype/settings/handlers.py +++ b/openpype/settings/handlers.py @@ -9,6 +9,7 @@ import six import openpype.version from openpype.client.mongo import OpenPypeMongoConnection from openpype.client.entities import get_project_connection, get_project +from openpype.lib.pype_info import get_workstation_info from .constants import ( GLOBAL_SETTINGS_KEY, @@ -930,13 +931,17 @@ class MongoSettingsHandler(SettingsHandler): if not changes: return - from openpype.lib import get_local_site_id - if settings_type == "project" and not project_name: project_name = "default" + host_info = get_workstation_info() + document = { - "user": get_local_site_id(), + "local_id": host_info["local_id"], + "username": host_info["username"], + "hostname": host_info["hostname"], + "hostip": host_info["hostip"], + "system_name": host_info["system_name"], "date_created": datetime.datetime.now(), "project": project_name, "settings_type": settings_type, From ea1f10b9db63f21161cb97c6ac984d07d361e7ed Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Mon, 20 Feb 2023 12:52:08 +0000 Subject: [PATCH 277/912] Removed references to openpype.api --- openpype/hosts/blender/plugins/publish/extract_playblast.py | 5 ++--- openpype/hosts/blender/plugins/publish/extract_thumbnail.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/blender/plugins/publish/extract_playblast.py b/openpype/hosts/blender/plugins/publish/extract_playblast.py index 1114b633be..8dc2f66c22 100644 --- a/openpype/hosts/blender/plugins/publish/extract_playblast.py +++ b/openpype/hosts/blender/plugins/publish/extract_playblast.py @@ -4,12 +4,12 @@ import clique import bpy import pyblish.api -import openpype.api +from openpype.pipeline import publish from openpype.hosts.blender.api import capture from openpype.hosts.blender.api.lib import maintained_time -class ExtractPlayblast(openpype.api.Extractor): +class ExtractPlayblast(publish.Extractor): """ Extract viewport playblast. @@ -27,7 +27,6 @@ class ExtractPlayblast(openpype.api.Extractor): self.log.info("Extracting capture..") self.log.info(instance.data) - print(instance.context.data) # get scene fps fps = instance.data.get("fps") diff --git a/openpype/hosts/blender/plugins/publish/extract_thumbnail.py b/openpype/hosts/blender/plugins/publish/extract_thumbnail.py index ba455cf450..65c3627375 100644 --- a/openpype/hosts/blender/plugins/publish/extract_thumbnail.py +++ b/openpype/hosts/blender/plugins/publish/extract_thumbnail.py @@ -2,14 +2,14 @@ import os import glob import pyblish.api -import openpype.api +from openpype.pipeline import publish from openpype.hosts.blender.api import capture from openpype.hosts.blender.api.lib import maintained_time import bpy -class ExtractThumbnail(openpype.api.Extractor): +class ExtractThumbnail(publish.Extractor): """Extract viewport thumbnail. Takes review camera and creates a thumbnail based on viewport From 407068610afc447df075d555aa7b5e9068734f8a Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 20 Feb 2023 13:58:20 +0100 Subject: [PATCH 278/912] return created instance in creators --- openpype/hosts/tvpaint/plugins/create/create_render.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index d9355c42fd..71224927d1 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -195,13 +195,13 @@ class CreateRenderlayer(TVPaintCreator): new_group_name = pre_create_data.get("group_name") if not new_group_name or not group_id: - return + return new_instance self.log.debug("Changing name of the group.") new_group_name = pre_create_data.get("group_name") if not new_group_name or group_item["name"] == new_group_name: - return + return new_instance # Rename TVPaint group (keep color same) # - groups can't contain spaces rename_script = self.rename_script_template.format( @@ -218,6 +218,7 @@ class CreateRenderlayer(TVPaintCreator): f"Name of group with index {group_id}" f" was changed to \"{new_group_name}\"." )) + return new_instance def _get_groups_enum(self): groups_enum = [] @@ -497,6 +498,8 @@ class CreateRenderPass(TVPaintCreator): self._add_instance_to_context(new_instance) self._change_layers_group(selected_layers, group_id) + return new_instance + def _change_layers_group(self, layers, group_id): filtered_layers = [ layer From 7486591fab5e9ec0413262c5fdd80be774c6abab Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 20 Feb 2023 13:58:46 +0100 Subject: [PATCH 279/912] it is possible to pass layer names to create pass --- .../tvpaint/plugins/create/create_render.py | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 71224927d1..b324beb8f6 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -431,25 +431,40 @@ class CreateRenderPass(TVPaintCreator): self.log.debug("Checking selection.") # Get all selected layers and their group ids - selected_layers = [ - layer - for layer in layers_data - if layer["selected"] - ] + marked_layer_names = pre_create_data.get("layer_names") + if marked_layer_names is not None: + layers_by_name = {layer["name"]: layer for layer in layers_data} + marked_layers = [] + for layer_name in marked_layer_names: + layer = layers_by_name.get(layer_name) + if layer is None: + raise CreatorError( + f"Layer with name \"{layer_name}\" was not found") + marked_layers.append(layer) - # Raise if nothing is selected - if not selected_layers: - raise CreatorError("Nothing is selected. Please select layers.") + else: + marked_layers = [ + layer + for layer in layers_data + if layer["selected"] + ] + + # Raise if nothing is selected + if not marked_layers: + raise CreatorError("Nothing is selected. Please select layers.") + + marked_layer_names = {layer["name"] for layer in marked_layers} + + marked_layer_names = set(marked_layer_names) - selected_layer_names = {layer["name"] for layer in selected_layers} instances_to_remove = [] for instance in self.create_context.instances: if instance.creator_identifier != self.identifier: continue - layer_names = set(instance["layer_names"]) - if not layer_names.intersection(selected_layer_names): + cur_layer_names = set(instance["layer_names"]) + if not cur_layer_names.intersection(marked_layer_names): continue - new_layer_names = layer_names - selected_layer_names + new_layer_names = cur_layer_names - marked_layer_names if new_layer_names: instance["layer_names"] = list(new_layer_names) else: @@ -470,7 +485,7 @@ class CreateRenderPass(TVPaintCreator): self.log.info(f"New subset name is \"{label}\".") instance_data["label"] = label instance_data["group"] = f"{self.get_group_label()} ({render_layer})" - instance_data["layer_names"] = list(selected_layer_names) + instance_data["layer_names"] = list(marked_layer_names) if "creator_attributes" not in instance_data: instance_data["creator_attribtues"] = {} @@ -496,7 +511,7 @@ class CreateRenderPass(TVPaintCreator): self.host.write_instances(instances_data) self._add_instance_to_context(new_instance) - self._change_layers_group(selected_layers, group_id) + self._change_layers_group(marked_layers, group_id) return new_instance From 80a9c3e65ee6bd781f9906e115e58fa3fe46ff7f Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 20 Feb 2023 14:05:49 +0100 Subject: [PATCH 280/912] fix formatting --- openpype/hosts/tvpaint/plugins/create/create_render.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index b324beb8f6..cae894035a 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -451,7 +451,8 @@ class CreateRenderPass(TVPaintCreator): # Raise if nothing is selected if not marked_layers: - raise CreatorError("Nothing is selected. Please select layers.") + raise CreatorError( + "Nothing is selected. Please select layers.") marked_layer_names = {layer["name"] for layer in marked_layers} From 8002dc4f4fb937edb07336232285e48bfec59989 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Mon, 20 Feb 2023 21:29:11 +0800 Subject: [PATCH 281/912] style fix --- openpype/hosts/max/api/lib.py | 38 ++- openpype/hosts/max/api/lib_renderproducts.py | 70 ++---- openpype/hosts/max/api/lib_rendersettings.py | 5 +- .../hosts/max/plugins/create/create_render.py | 2 +- .../max/plugins/publish/collect_render.py | 6 +- .../plugins/publish/submit_3dmax_deadline.py | 237 ------------------ .../plugins/publish/submit_max_deadline.py | 217 ++++++++++++++++ .../defaults/project_settings/deadline.json | 4 +- .../schema_project_deadline.json | 2 +- 9 files changed, 275 insertions(+), 306 deletions(-) delete mode 100644 openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py create mode 100644 openpype/modules/deadline/plugins/publish/submit_max_deadline.py diff --git a/openpype/hosts/max/api/lib.py b/openpype/hosts/max/api/lib.py index ecea8b5541..14aa4d750a 100644 --- a/openpype/hosts/max/api/lib.py +++ b/openpype/hosts/max/api/lib.py @@ -134,19 +134,21 @@ def get_default_render_folder(project_setting=None): def set_framerange(startFrame, endFrame): - """Get/set the type of time range to be rendered. - - Possible values are: - - 1 -Single frame. - - 2 -Active time segment ( animationRange ). - - 3 -User specified Range. - - 4 -User specified Frame pickup string (for example "1,3,5-12"). """ - # hard-code, there should be a custom setting for this + Args: + start_frame (int): Start frame number. + end_frame (int): End frame number. + Note: + Frame range can be specified in different types. Possible values are: + + * `1` - Single frame. + * `2` - Active time segment ( animationRange ). + * `3` - User specified Range. + * `4` - User specified Frame pickup string (for example `1,3,5-12`). + + Todo: + Current type is hard-coded, there should be a custom setting for this. + """ rt.rendTimeType = 4 if startFrame is not None and endFrame is not None: frameRange = "{0}-{1}".format(startFrame, endFrame) @@ -157,3 +159,15 @@ def get_multipass_setting(project_setting=None): return (project_setting["max"] ["RenderSettings"] ["multipass"]) + +def get_max_version(): + """ + Args: + get max version date for deadline + + Returns: + #(25000, 62, 0, 25, 0, 0, 997, 2023, "") + max_info[7] = max version date + """ + max_info = rt.maxversion() + return max_info[7] diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index e09934e5de..00e0978bc8 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -15,7 +15,6 @@ from openpype.pipeline import legacy_io class RenderProducts(object): - @classmethod def __init__(self, project_settings=None): self._project_settings = project_settings if not self._project_settings: @@ -36,15 +35,11 @@ class RenderProducts(object): filename, container) - context = get_current_project_asset() - startFrame = context["data"].get("frameStart") - endFrame = context["data"].get("frameEnd") + 1 - img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"] # noqa - full_render_list = self.beauty_render_product(output_file, - startFrame, - endFrame, - img_fmt) + full_render_list = [] + beauty = self.beauty_render_product(output_file, img_fmt) + full_render_list.append(beauty) + renderer_class = get_current_renderer() renderer = str(renderer_class).split(":")[0] @@ -60,41 +55,29 @@ class RenderProducts(object): renderer == "Quicksilver_Hardware_Renderer" ): render_elem_list = self.render_elements_product(output_file, - startFrame, - endFrame, img_fmt) - for render_elem in render_elem_list: - full_render_list.append(render_elem) + if render_elem_list: + for render_elem in render_elem_list: + full_render_list.append(render_elem) return full_render_list if renderer == "Arnold": aov_list = self.arnold_render_product(output_file, - startFrame, - endFrame, img_fmt) if aov_list: for aov in aov_list: full_render_list.append(aov) return full_render_list - def beauty_render_product(self, folder, startFrame, endFrame, fmt): - # get the beauty - beauty_frame_range = list() - - for f in range(startFrame, endFrame): - beauty = "{0}.{1}.{2}".format(folder, - str(f), - fmt) - beauty = beauty.replace("\\", "/") - beauty_frame_range.append(beauty) - - return beauty_frame_range - + def beauty_render_product(self, folder, fmt): + beauty_output = f"{folder}.####.{fmt}" + beauty_output = beauty_output.replace("\\", "/") + return beauty_output # TODO: Get the arnold render product - def arnold_render_product(self, folder, startFrame, endFrame, fmt): + def arnold_render_product(self, folder, fmt): """Get all the Arnold AOVs""" - aovs = list() + aovs = [] amw = rt.MaxtoAOps.AOVsManagerWindow() aov_mgr = rt.renderers.current.AOVManager @@ -105,21 +88,17 @@ class RenderProducts(object): for i in range(aov_group_num): # get the specific AOV group for aov in aov_mgr.drivers[i].aov_list: - for f in range(startFrame, endFrame): - render_element = "{0}_{1}.{2}.{3}".format(folder, - str(aov.name), - str(f), - fmt) - render_element = render_element.replace("\\", "/") - aovs.append(render_element) + render_element = f"{folder}_{aov.name}.####.{fmt}" + render_element = render_element.replace("\\", "/") + aovs.append(render_element) # close the AOVs manager window amw.close() return aovs - def render_elements_product(self, folder, startFrame, endFrame, fmt): + def render_elements_product(self, folder, fmt): """Get all the render element output files. """ - render_dirname = list() + render_dirname = [] render_elem = rt.maxOps.GetCurRenderElementMgr() render_elem_num = render_elem.NumRenderElements() @@ -128,16 +107,11 @@ class RenderProducts(object): renderlayer_name = render_elem.GetRenderElement(i) target, renderpass = str(renderlayer_name).split(":") if renderlayer_name.enabled: - for f in range(startFrame, endFrame): - render_element = "{0}_{1}.{2}.{3}".format(folder, - renderpass, - str(f), - fmt) - render_element = render_element.replace("\\", "/") - render_dirname.append(render_element) + render_element = f"{folder}_{renderpass}.####.{fmt}" + render_element = render_element.replace("\\", "/") + render_dirname.append(render_element) return render_dirname def image_format(self): - img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"] # noqa - return img_fmt + return self._project_settings["max"]["RenderSettings"]["image_format"] # noqa diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index 92f716ba54..212c08846b 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -22,7 +22,6 @@ class RenderSettings(object): "underscore": "_" } - @classmethod def __init__(self, project_settings=None): self._project_settings = project_settings if not self._project_settings: @@ -41,7 +40,7 @@ class RenderSettings(object): if not found: raise RuntimeError("Camera not found") - def set_renderoutput(self, container): + def render_output(self, container): folder = rt.maxFilePath # hard-coded, should be customized in the setting file = rt.maxFileName @@ -144,7 +143,7 @@ class RenderSettings(object): aov_name = "{0}_{1}..{2}".format(dir, renderpass, ext) render_elem.SetRenderElementFileName(i, aov_name) - def get_renderoutput(self, container, output_dir): + def get_render_output(self, container, output_dir): output = os.path.join(output_dir, container) img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"] # noqa outputFilename = "{0}..{1}".format(output, img_fmt) diff --git a/openpype/hosts/max/plugins/create/create_render.py b/openpype/hosts/max/plugins/create/create_render.py index 76c10ca4a9..269fff2e32 100644 --- a/openpype/hosts/max/plugins/create/create_render.py +++ b/openpype/hosts/max/plugins/create/create_render.py @@ -30,4 +30,4 @@ class CreateRender(plugin.MaxCreator): # set viewport camera for rendering(mandatory for deadline) RenderSettings().set_render_camera(sel_obj) # set output paths for rendering(mandatory for deadline) - RenderSettings().set_renderoutput(container_name) + RenderSettings().render_output(container_name) diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py index 55391d40e8..16f8821986 100644 --- a/openpype/hosts/max/plugins/publish/collect_render.py +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -4,7 +4,8 @@ import os import pyblish.api from pymxs import runtime as rt -from openpype.pipeline import legacy_io +from openpype.pipeline import get_current_asset_name +from openpype.hosts.max.api.lib import get_max_version from openpype.hosts.max.api.lib_renderproducts import RenderProducts from openpype.client import get_last_version_by_subset_name @@ -25,7 +26,7 @@ class CollectRender(pyblish.api.InstancePlugin): filepath = current_file.replace("\\", "/") context.data['currentFile'] = current_file - asset = legacy_io.Session["AVALON_ASSET"] + asset = get_current_asset_name() render_layer_files = RenderProducts().render_product(instance.name) folder = folder.replace("\\", "/") @@ -51,6 +52,7 @@ class CollectRender(pyblish.api.InstancePlugin): "subset": instance.name, "asset": asset, "publish": True, + "maxversion": str(get_max_version()), "imageFormat": imgFormat, "family": 'maxrender', "families": ['maxrender'], diff --git a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py b/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py deleted file mode 100644 index ed448abe1f..0000000000 --- a/openpype/modules/deadline/plugins/publish/submit_3dmax_deadline.py +++ /dev/null @@ -1,237 +0,0 @@ -import os -import json -import getpass - -import requests -import pyblish.api - -from openpype.pipeline import legacy_io -from openpype.settings import get_project_settings -from openpype.hosts.max.api.lib import ( - get_current_renderer, - get_multipass_setting -) -from openpype.hosts.max.api.lib_rendersettings import RenderSettings - - -class MaxSubmitRenderDeadline(pyblish.api.InstancePlugin): - """ - 3DMax File Submit Render Deadline - - """ - - label = "Submit 3DsMax Render to Deadline" - order = pyblish.api.IntegratorOrder - hosts = ["max"] - families = ["maxrender"] - targets = ["local"] - use_published = True - priority = 50 - chunk_size = 1 - group = None - deadline_pool = None - deadline_pool_secondary = None - framePerTask = 1 - - def process(self, instance): - context = instance.context - filepath = context.data["currentFile"] - filename = os.path.basename(filepath) - comment = context.data.get("comment", "") - deadline_user = context.data.get("deadlineUser", getpass.getuser()) - jobname = "{0} - {1}".format(filename, instance.name) - - # StartFrame to EndFrame - frames = "{start}-{end}".format( - start=int(instance.data["frameStart"]), - end=int(instance.data["frameEnd"]) - ) - if self.use_published: - for item in context: - if "workfile" in item.data["families"]: - msg = "Workfile (scene) must be published along" - assert item.data["publish"] is True, msg - - template_data = item.data.get("anatomyData") - rep = item.data.get("representations")[0].get("name") - template_data["representation"] = rep - template_data["ext"] = rep - template_data["comment"] = None - anatomy_data = context.data["anatomy"] - anatomy_filled = anatomy_data.format(template_data) - template_filled = anatomy_filled["publish"]["path"] - filepath = os.path.normpath(template_filled) - filepath = filepath.replace("\\", "/") - self.log.info( - "Using published scene for render {}".format(filepath) - ) - if not os.path.exists(filepath): - self.log.error("published scene does not exist!") - - new_scene = self._clean_name(filepath) - # use the anatomy data for setting up the path of the files - orig_scene = self._clean_name(instance.context.data["currentFile"]) - expected_files = instance.data.get("expectedFiles") - - new_exp = [] - for file in expected_files: - new_file = str(file).replace(orig_scene, new_scene) - new_exp.append(new_file) - - instance.data["expectedFiles"] = new_exp - - metadata_folder = instance.data.get("publishRenderMetadataFolder") - if metadata_folder: - metadata_folder = metadata_folder.replace(orig_scene, - new_scene) - instance.data["publishRenderMetadataFolder"] = metadata_folder - - payload = { - "JobInfo": { - # Top-level group name - "BatchName": filename, - - # Job name, as seen in Monitor - "Name": jobname, - - # Arbitrary username, for visualisation in Monitor - "UserName": deadline_user, - - "Plugin": instance.data["plugin"], - "Group": self.group, - "Pool": self.deadline_pool, - "secondaryPool": self.deadline_pool_secondary, - "Frames": frames, - "ChunkSize": self.chunk_size, - "Priority": instance.data.get("priority", self.priority), - "Comment": comment, - "FramesPerTask": self.framePerTask - }, - "PluginInfo": { - # Input - "SceneFile": filepath, - "Version": "2023", - "SaveFile": True, - # Mandatory for Deadline - # Houdini version without patch number - - "IgnoreInputs": True - }, - - # Mandatory for Deadline, may be empty - "AuxFiles": [] - } - # Include critical environment variables with submission + api.Session - keys = [ - # Submit along the current Avalon tool setup that we launched - # this application with so the Render Slave can build its own - # similar environment using it, e.g. "maya2018;vray4.x;yeti3.1.9" - "AVALON_TOOLS", - "OPENPYPE_VERSION" - ] - # Add mongo url if it's enabled - if context.data.get("deadlinePassMongoUrl"): - keys.append("OPENPYPE_MONGO") - - environment = dict({key: os.environ[key] for key in keys - if key in os.environ}, **legacy_io.Session) - - payload["JobInfo"].update({ - "EnvironmentKeyValue%d" % index: "{key}={value}".format( - key=key, - value=environment[key] - ) for index, key in enumerate(environment) - }) - - # Include OutputFilename entries - # The first entry also enables double-click to preview rendered - # frames from Deadline Monitor - output_data = {} - # need to be fixed - for i, filepath in enumerate(instance.data["expectedFiles"]): - dirname = os.path.dirname(filepath) - fname = os.path.basename(filepath) - output_data["OutputDirectory%d" % i] = dirname.replace("\\", "/") - output_data["OutputFilename%d" % i] = fname - - if not os.path.exists(dirname): - self.log.info("Ensuring output directory exists: %s" % - dirname) - os.makedirs(dirname) - - plugin_data = {} - project_setting = get_project_settings( - legacy_io.Session["AVALON_PROJECT"] - ) - - multipass = get_multipass_setting(project_setting) - if multipass: - plugin_data["DisableMultipass"] = 0 - else: - plugin_data["DisableMultipass"] = 1 - - if self.use_published: - old_output_dir = os.path.dirname(expected_files[0]) - output_beauty = RenderSettings().get_renderoutput(instance.name, - old_output_dir) - output_beauty = output_beauty.replace(orig_scene, new_scene) - output_beauty = output_beauty.replace("\\", "/") - plugin_data["RenderOutput"] = output_beauty - - renderer_class = get_current_renderer() - renderer = str(renderer_class).split(":")[0] - if ( - renderer == "ART_Renderer" or - renderer == "Redshift_Renderer" or - renderer == "V_Ray_6_Hotfix_3" or - renderer == "V_Ray_GPU_6_Hotfix_3" or - renderer == "Default_Scanline_Renderer" or - renderer == "Quicksilver_Hardware_Renderer" - ): - render_elem_list = RenderSettings().get_render_element() - for i, element in enumerate(render_elem_list): - element = element.replace(orig_scene, new_scene) - plugin_data["RenderElementOutputFilename%d" % i] = element # noqa - - self.log.debug("plugin data:{}".format(plugin_data)) - self.log.info("Scene name was switched {} -> {}".format( - orig_scene, new_scene - )) - - payload["JobInfo"].update(output_data) - payload["PluginInfo"].update(plugin_data) - - self.submit(instance, payload) - - def submit(self, instance, payload): - - context = instance.context - deadline_url = context.data.get("defaultDeadline") - deadline_url = instance.data.get( - "deadlineUrl", deadline_url) - - assert deadline_url, "Requires Deadline Webservice URL" - - plugin = payload["JobInfo"]["Plugin"] - self.log.info("Using Render Plugin : {}".format(plugin)) - - self.log.info("Submitting..") - self.log.debug(json.dumps(payload, indent=4, sort_keys=True)) - - # E.g. http://192.168.0.1:8082/api/jobs - url = "{}/api/jobs".format(deadline_url) - response = requests.post(url, json=payload) - if not response.ok: - raise Exception(response.text) - # Store output dir for unified publisher (expectedFilesequence) - expected_files = instance.data["expectedFiles"] - output_dir = os.path.dirname(expected_files[0]) - instance.data["toBeRenderedOn"] = "deadline" - instance.data["outputDir"] = output_dir - instance.data["deadlineSubmissionJob"] = response.json() - - def rename_render_element(self): - pass - - def _clean_name(self, path): - return os.path.splitext(os.path.basename(path))[0] diff --git a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py new file mode 100644 index 0000000000..3e00f8fd15 --- /dev/null +++ b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py @@ -0,0 +1,217 @@ +import os +import getpass +import copy + +import attr +from openpype.pipeline import legacy_io +from openpype.settings import get_project_settings +from openpype.hosts.max.api.lib import ( + get_current_renderer, + get_multipass_setting +) +from openpype.hosts.max.api.lib_rendersettings import RenderSettings +from openpype_modules.deadline import abstract_submit_deadline +from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo + + +@attr.s +class MaxPluginInfo(object): + SceneFile = attr.ib(default=None) # Input + Version = attr.ib(default=None) # Mandatory for Deadline + SaveFile = attr.ib(default=True) + IgnoreInputs = attr.ib(default=True) + + +class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline): + + label = "Submit Render to Deadline" + hosts = ["max"] + families = ["maxrender"] + targets = ["local"] + + use_published = True + priority = 50 + tile_priority = 50 + chunk_size = 1 + jobInfo = {} + pluginInfo = {} + group = None + deadline_pool = None + deadline_pool_secondary = None + framePerTask = 1 + + def get_job_info(self): + job_info = DeadlineJobInfo(Plugin="3dsmax") + + # todo: test whether this works for existing production cases + # where custom jobInfo was stored in the project settings + job_info.update(self.jobInfo) + + instance = self._instance + context = instance.context + + # Always use the original work file name for the Job name even when + # rendering is done from the published Work File. The original work + # file name is clearer because it can also have subversion strings, + # etc. which are stripped for the published file. + src_filepath = context.data["currentFile"] + src_filename = os.path.basename(src_filepath) + + job_info.Name = "%s - %s" % (src_filename, instance.name) + job_info.BatchName = src_filename + job_info.Plugin = instance.data["plugin"] + job_info.UserName = context.data.get("deadlineUser", getpass.getuser()) + + # Deadline requires integers in frame range + frames = "{start}-{end}".format( + start=int(instance.data["frameStart"]), + end=int(instance.data["frameEnd"]) + ) + job_info.Frames = frames + + job_info.Pool = instance.data.get("primaryPool") + job_info.SecondaryPool = instance.data.get("secondaryPool") + job_info.ChunkSize = instance.data.get("chunkSize", 1) + job_info.Comment = context.data.get("comment") + job_info.Priority = instance.data.get("priority", self.priority) + job_info.FramesPerTask = instance.data.get("framesPerTask", 1) + + if self.group: + job_info.Group = self.group + + # Add options from RenderGlobals + render_globals = instance.data.get("renderGlobals", {}) + job_info.update(render_globals) + + keys = [ + "FTRACK_API_KEY", + "FTRACK_API_USER", + "FTRACK_SERVER", + "OPENPYPE_SG_USER", + "AVALON_PROJECT", + "AVALON_ASSET", + "AVALON_TASK", + "AVALON_APP_NAME", + "OPENPYPE_DEV", + "OPENPYPE_VERSION", + "IS_TEST" + ] + # Add mongo url if it's enabled + if self._instance.context.data.get("deadlinePassMongoUrl"): + keys.append("OPENPYPE_MONGO") + + environment = dict({key: os.environ[key] for key in keys + if key in os.environ}, **legacy_io.Session) + + for key in keys: + value = environment.get(key) + if not value: + continue + job_info.EnvironmentKeyValue[key] = value + + # to recognize job from PYPE for turning Event On/Off + job_info.EnvironmentKeyValue["OPENPYPE_RENDER_JOB"] = "1" + job_info.EnvironmentKeyValue["OPENPYPE_LOG_NO_COLORS"] = "1" + + # Add list of expected files to job + # --------------------------------- + exp = instance.data.get("expectedFiles") + for filepath in exp: + job_info.OutputDirectory += os.path.dirname(filepath) + job_info.OutputFilename += os.path.basename(filepath) + + return job_info + + def get_plugin_info(self): + instance = self._instance + + plugin_info = MaxPluginInfo( + SceneFile=self.scene_path, + Version=instance.data["maxversion"], + SaveFile = True, + IgnoreInputs = True + ) + + plugin_payload = attr.asdict(plugin_info) + + # Patching with pluginInfo from settings + for key, value in self.pluginInfo.items(): + plugin_payload[key] = value + + return plugin_payload + + def process_submission(self): + + instance = self._instance + context = instance.context + filepath = self.scene_path + + expected_files = instance.data["expectedFiles"] + if not expected_files: + raise RuntimeError("No Render Elements found!") + output_dir = os.path.dirname(expected_files[0]) + instance.data["outputDir"] = output_dir + instance.data["toBeRenderedOn"] = "deadline" + + filename = os.path.basename(filepath) + + payload_data = { + "filename": filename, + "dirname": output_dir + } + + self.log.debug("Submitting 3dsMax render..") + payload = self._use_puhlished_name(payload_data) + job_info, plugin_info = payload + self.submit(self.assemble_payload(job_info, plugin_info)) + + def _use_puhlished_name(self, data): + instance = self._instance + job_info = copy.deepcopy(self.job_info) + plugin_info = copy.deepcopy(self.plugin_info) + plugin_data = {} + project_setting = get_project_settings( + legacy_io.Session["AVALON_PROJECT"] + ) + + multipass = get_multipass_setting(project_setting) + if multipass: + plugin_data["DisableMultipass"] = 0 + else: + plugin_data["DisableMultipass"] = 1 + + expected_files = instance.data.get("expectedFiles") + if not expected_files: + raise RuntimeError("No render elements found") + old_output_dir = os.path.dirname(expected_files[0]) + output_beauty = RenderSettings().get_render_output(instance.name, + old_output_dir) + filepath = self.from_published_scene() + def _clean_name(path): + return os.path.splitext(os.path.basename(path))[0] + new_scene = _clean_name(filepath) + orig_scene = _clean_name(instance.context.data["currentFile"]) + + output_beauty = output_beauty.replace(orig_scene, new_scene) + output_beauty = output_beauty.replace("\\", "/") + plugin_data["RenderOutput"] = output_beauty + + renderer_class = get_current_renderer() + renderer = str(renderer_class).split(":")[0] + if ( + renderer == "ART_Renderer" or + renderer == "Redshift_Renderer" or + renderer == "V_Ray_6_Hotfix_3" or + renderer == "V_Ray_GPU_6_Hotfix_3" or + renderer == "Default_Scanline_Renderer" or + renderer == "Quicksilver_Hardware_Renderer" + ): + render_elem_list = RenderSettings().get_render_element() + for i, element in enumerate(render_elem_list): + element = element.replace(orig_scene, new_scene) + plugin_data["RenderElementOutputFilename%d" % i] = element # noqa + + self.log.debug("plugin data:{}".format(plugin_data)) + plugin_info.update(plugin_data) + + return job_info, plugin_info diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json index 7a5903d8e0..7183603c4b 100644 --- a/openpype/settings/defaults/project_settings/deadline.json +++ b/openpype/settings/defaults/project_settings/deadline.json @@ -36,7 +36,7 @@ "scene_patches": [], "strict_error_checking": true }, - "MaxSubmitRenderDeadline": { + "MaxSubmitDeadline": { "enabled": true, "optional": false, "active": true, @@ -122,4 +122,4 @@ } } } -} \ No newline at end of file +} diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json index 3d1b413d6c..a320dfca4f 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json @@ -207,7 +207,7 @@ { "type": "dict", "collapsible": true, - "key": "MaxSubmitRenderDeadline", + "key": "MaxSubmitDeadline", "label": "3dsMax Submit to Deadline", "checkbox_key": "enabled", "children": [ From 3aa6e9ac9d78ce3404c39bb91ca8e367014cb6c8 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Mon, 20 Feb 2023 21:36:37 +0800 Subject: [PATCH 282/912] hound fix --- openpype/hosts/max/api/lib.py | 20 +++++++++---------- openpype/hosts/max/api/lib_renderproducts.py | 2 +- .../plugins/publish/submit_max_deadline.py | 7 ++++--- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/openpype/hosts/max/api/lib.py b/openpype/hosts/max/api/lib.py index 14aa4d750a..67e34c0a30 100644 --- a/openpype/hosts/max/api/lib.py +++ b/openpype/hosts/max/api/lib.py @@ -136,18 +136,17 @@ def get_default_render_folder(project_setting=None): def set_framerange(startFrame, endFrame): """ Args: - start_frame (int): Start frame number. - end_frame (int): End frame number. + start_frame (int): Start frame number. + end_frame (int): End frame number. Note: - Frame range can be specified in different types. Possible values are: + Frame range can be specified in different types. Possible values are: - * `1` - Single frame. - * `2` - Active time segment ( animationRange ). - * `3` - User specified Range. - * `4` - User specified Frame pickup string (for example `1,3,5-12`). - - Todo: - Current type is hard-coded, there should be a custom setting for this. + * `1` - Single frame. + * `2` - Active time segment ( animationRange ). + * `3` - User specified Range. + * `4`-User specified Frame pickup string (for example `1,3,5-12`). + TODO: + Current type is hard-coded, there should be a custom setting for this. """ rt.rendTimeType = 4 if startFrame is not None and endFrame is not None: @@ -160,6 +159,7 @@ def get_multipass_setting(project_setting=None): ["RenderSettings"] ["multipass"]) + def get_max_version(): """ Args: diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index 00e0978bc8..6d476c9139 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -8,7 +8,6 @@ from openpype.hosts.max.api.lib import ( get_current_renderer, get_default_render_folder ) -from openpype.pipeline.context_tools import get_current_project_asset from openpype.settings import get_project_settings from openpype.pipeline import legacy_io @@ -74,6 +73,7 @@ class RenderProducts(object): beauty_output = f"{folder}.####.{fmt}" beauty_output = beauty_output.replace("\\", "/") return beauty_output + # TODO: Get the arnold render product def arnold_render_product(self, folder, fmt): """Get all the Arnold AOVs""" diff --git a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py index 3e00f8fd15..b53cc928d6 100644 --- a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py @@ -128,8 +128,8 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline): plugin_info = MaxPluginInfo( SceneFile=self.scene_path, Version=instance.data["maxversion"], - SaveFile = True, - IgnoreInputs = True + SaveFile=True, + IgnoreInputs=True ) plugin_payload = attr.asdict(plugin_info) @@ -143,7 +143,6 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline): def process_submission(self): instance = self._instance - context = instance.context filepath = self.scene_path expected_files = instance.data["expectedFiles"] @@ -187,8 +186,10 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline): output_beauty = RenderSettings().get_render_output(instance.name, old_output_dir) filepath = self.from_published_scene() + def _clean_name(path): return os.path.splitext(os.path.basename(path))[0] + new_scene = _clean_name(filepath) orig_scene = _clean_name(instance.context.data["currentFile"]) From db75941e00dfd9f503b0690cda7334ab71b0892d Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Mon, 20 Feb 2023 21:39:31 +0800 Subject: [PATCH 283/912] hound fix --- openpype/hosts/max/api/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/max/api/lib.py b/openpype/hosts/max/api/lib.py index 67e34c0a30..53e66c219e 100644 --- a/openpype/hosts/max/api/lib.py +++ b/openpype/hosts/max/api/lib.py @@ -144,7 +144,7 @@ def set_framerange(startFrame, endFrame): * `1` - Single frame. * `2` - Active time segment ( animationRange ). * `3` - User specified Range. - * `4`-User specified Frame pickup string (for example `1,3,5-12`). + * `4` - User specified Frame pickup string (for example `1,3,5-12`). TODO: Current type is hard-coded, there should be a custom setting for this. """ From 7b6fb46cd191ab39ae43b9664365a0422203ad58 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Mon, 20 Feb 2023 16:05:24 +0000 Subject: [PATCH 284/912] Fix colorspaceTemplate --- openpype/modules/deadline/plugins/publish/submit_publish_job.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 89a4e5d377..bd5933926c 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -922,7 +922,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): "display": instance.data["colorspaceDisplay"], "view": instance.data["colorspaceView"], "colorspaceTemplate": instance.data["colorspaceConfig"].replace( - context.data["anatomy"].roots["work"], "{root[work]}" + str(context.data["anatomy"].roots["work"]), "{root[work]}" ) } From 5e203ec6306da50cabca6efab09c4a679b451228 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Mon, 20 Feb 2023 16:06:48 +0000 Subject: [PATCH 285/912] Only submit version when running from build. --- .../plugins/publish/submit_aftereffects_deadline.py | 7 ++++++- .../deadline/plugins/publish/submit_harmony_deadline.py | 9 +++++++-- .../plugins/publish/submit_houdini_remote_publish.py | 9 +++++++-- .../plugins/publish/submit_houdini_render_deadline.py | 9 +++++++-- .../deadline/plugins/publish/submit_maya_deadline.py | 9 +++++++-- .../publish/submit_maya_remote_publish_deadline.py | 9 +++++++-- .../deadline/plugins/publish/submit_nuke_deadline.py | 9 +++++++-- .../deadline/plugins/publish/submit_publish_job.py | 8 ++++++-- 8 files changed, 54 insertions(+), 15 deletions(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py b/openpype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py index f26047bb9d..83dd5b49e2 100644 --- a/openpype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_aftereffects_deadline.py @@ -12,6 +12,7 @@ from openpype.pipeline import legacy_io from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo from openpype.tests.lib import is_in_tests +from openpype.lib import is_running_from_build @attr.s @@ -87,9 +88,13 @@ class AfterEffectsSubmitDeadline( "AVALON_APP_NAME", "OPENPYPE_DEV", "OPENPYPE_LOG_NO_COLORS", - "OPENPYPE_VERSION", "IS_TEST" ] + + # Add OpenPype version if we are running from build. + if is_running_from_build(): + keys.append("OPENPYPE_VERSION") + # Add mongo url if it's enabled if self._instance.context.data.get("deadlinePassMongoUrl"): keys.append("OPENPYPE_MONGO") diff --git a/openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py b/openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py index 425883393f..84fca11d9d 100644 --- a/openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py @@ -14,6 +14,7 @@ from openpype.pipeline import legacy_io from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo from openpype.tests.lib import is_in_tests +from openpype.lib import is_running_from_build class _ZipFile(ZipFile): @@ -279,10 +280,14 @@ class HarmonySubmitDeadline( "AVALON_TASK", "AVALON_APP_NAME", "OPENPYPE_DEV", - "OPENPYPE_LOG_NO_COLORS", - "OPENPYPE_VERSION", + "OPENPYPE_LOG_NO_COLORS" "IS_TEST" ] + + # Add OpenPype version if we are running from build. + if is_running_from_build(): + keys.append("OPENPYPE_VERSION") + # Add mongo url if it's enabled if self._instance.context.data.get("deadlinePassMongoUrl"): keys.append("OPENPYPE_MONGO") diff --git a/openpype/modules/deadline/plugins/publish/submit_houdini_remote_publish.py b/openpype/modules/deadline/plugins/publish/submit_houdini_remote_publish.py index 6a62f83cae..68aa653804 100644 --- a/openpype/modules/deadline/plugins/publish/submit_houdini_remote_publish.py +++ b/openpype/modules/deadline/plugins/publish/submit_houdini_remote_publish.py @@ -9,6 +9,7 @@ import pyblish.api from openpype.pipeline import legacy_io from openpype.tests.lib import is_in_tests +from openpype.lib import is_running_from_build class HoudiniSubmitPublishDeadline(pyblish.api.ContextPlugin): @@ -133,9 +134,13 @@ class HoudiniSubmitPublishDeadline(pyblish.api.ContextPlugin): # Submit along the current Avalon tool setup that we launched # this application with so the Render Slave can build its own # similar environment using it, e.g. "houdini17.5;pluginx2.3" - "AVALON_TOOLS", - "OPENPYPE_VERSION" + "AVALON_TOOLS" ] + + # Add OpenPype version if we are running from build. + if is_running_from_build(): + keys.append("OPENPYPE_VERSION") + # Add mongo url if it's enabled if context.data.get("deadlinePassMongoUrl"): keys.append("OPENPYPE_MONGO") diff --git a/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py b/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py index 2b17b644b8..73ab689c9a 100644 --- a/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py @@ -10,6 +10,7 @@ import pyblish.api from openpype.pipeline import legacy_io from openpype.tests.lib import is_in_tests +from openpype.lib import is_running_from_build class HoudiniSubmitRenderDeadline(pyblish.api.InstancePlugin): @@ -105,9 +106,13 @@ class HoudiniSubmitRenderDeadline(pyblish.api.InstancePlugin): # Submit along the current Avalon tool setup that we launched # this application with so the Render Slave can build its own # similar environment using it, e.g. "maya2018;vray4.x;yeti3.1.9" - "AVALON_TOOLS", - "OPENPYPE_VERSION" + "AVALON_TOOLS" ] + + # Add OpenPype version if we are running from build. + if is_running_from_build(): + keys.append("OPENPYPE_VERSION") + # Add mongo url if it's enabled if context.data.get("deadlinePassMongoUrl"): keys.append("OPENPYPE_MONGO") diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py index ed37ff1897..22b5c02296 100644 --- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py @@ -38,6 +38,7 @@ from openpype.hosts.maya.api.lib import get_attr_in_layer from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo from openpype.tests.lib import is_in_tests +from openpype.lib import is_running_from_build def _validate_deadline_bool_value(instance, attribute, value): @@ -165,10 +166,14 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline): "AVALON_ASSET", "AVALON_TASK", "AVALON_APP_NAME", - "OPENPYPE_DEV", - "OPENPYPE_VERSION", + "OPENPYPE_DEV" "IS_TEST" ] + + # Add OpenPype version if we are running from build. + if is_running_from_build(): + keys.append("OPENPYPE_VERSION") + # Add mongo url if it's enabled if self._instance.context.data.get("deadlinePassMongoUrl"): keys.append("OPENPYPE_MONGO") diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py index bab6591c7f..25f859554f 100644 --- a/openpype/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py @@ -7,6 +7,7 @@ from maya import cmds from openpype.pipeline import legacy_io, PublishXmlValidationError from openpype.settings import get_project_settings from openpype.tests.lib import is_in_tests +from openpype.lib import is_running_from_build import pyblish.api @@ -104,9 +105,13 @@ class MayaSubmitRemotePublishDeadline(pyblish.api.InstancePlugin): keys = [ "FTRACK_API_USER", "FTRACK_API_KEY", - "FTRACK_SERVER", - "OPENPYPE_VERSION" + "FTRACK_SERVER" ] + + # Add OpenPype version if we are running from build. + if is_running_from_build(): + keys.append("OPENPYPE_VERSION") + environment = dict({key: os.environ[key] for key in keys if key in os.environ}, **legacy_io.Session) diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py index d1948d8d50..cca2a4d896 100644 --- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py @@ -10,6 +10,7 @@ import pyblish.api import nuke from openpype.pipeline import legacy_io from openpype.tests.lib import is_in_tests +from openpype.lib import is_running_from_build class NukeSubmitDeadline(pyblish.api.InstancePlugin): @@ -265,9 +266,13 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): "PYBLISHPLUGINPATH", "NUKE_PATH", "TOOL_ENV", - "FOUNDRY_LICENSE", - "OPENPYPE_VERSION" + "FOUNDRY_LICENSE" ] + + # Add OpenPype version if we are running from build. + if is_running_from_build(): + keys.append("OPENPYPE_VERSION") + # Add mongo url if it's enabled if instance.context.data.get("deadlinePassMongoUrl"): keys.append("OPENPYPE_MONGO") diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 8f8f4246dd..e132d7323b 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -20,6 +20,7 @@ from openpype.pipeline import ( ) from openpype.tests.lib import is_in_tests from openpype.pipeline.farm.patterning import match_aov_pattern +from openpype.lib import is_running_from_build def get_resources(project_name, version, extension=None): @@ -136,10 +137,13 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): "FTRACK_API_KEY", "FTRACK_SERVER", "AVALON_APP_NAME", - "OPENPYPE_USERNAME", - "OPENPYPE_VERSION" + "OPENPYPE_USERNAME" ] + # Add OpenPype version if we are running from build. + if is_running_from_build(): + environ_keys.append("OPENPYPE_VERSION") + # custom deadline attributes deadline_department = "" deadline_pool = "" From 72134d4a211ee325799c439a31fded53c41b04a9 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 20 Feb 2023 18:33:15 +0100 Subject: [PATCH 286/912] Fix changed location of reset_frame_range Location in commands caused cyclic import --- openpype/hosts/maya/api/commands.py | 49 ------------------- openpype/hosts/maya/api/lib.py | 49 ++++++++++++++++++- openpype/hosts/maya/api/lib_rendersettings.py | 2 +- openpype/hosts/maya/api/menu.py | 3 +- 4 files changed, 50 insertions(+), 53 deletions(-) diff --git a/openpype/hosts/maya/api/commands.py b/openpype/hosts/maya/api/commands.py index 19ad18d824..018340d86c 100644 --- a/openpype/hosts/maya/api/commands.py +++ b/openpype/hosts/maya/api/commands.py @@ -4,7 +4,6 @@ from maya import cmds from openpype.client import get_asset_by_name, get_project from openpype.pipeline import legacy_io -from . import lib class ToolWindows: @@ -58,54 +57,6 @@ def edit_shader_definitions(): window.show() -def reset_frame_range(): - """Set frame range to current asset""" - - fps = lib.convert_to_maya_fps( - float(legacy_io.Session.get("AVALON_FPS", 25)) - ) - lib.set_scene_fps(fps) - - # Set frame start/end - project_name = legacy_io.active_project() - asset_name = legacy_io.Session["AVALON_ASSET"] - asset = get_asset_by_name(project_name, asset_name) - - frame_start = asset["data"].get("frameStart") - frame_end = asset["data"].get("frameEnd") - # Backwards compatibility - if frame_start is None or frame_end is None: - frame_start = asset["data"].get("edit_in") - frame_end = asset["data"].get("edit_out") - - if frame_start is None or frame_end is None: - cmds.warning("No edit information found for %s" % asset_name) - return - - handles = asset["data"].get("handles") or 0 - handle_start = asset["data"].get("handleStart") - if handle_start is None: - handle_start = handles - - handle_end = asset["data"].get("handleEnd") - if handle_end is None: - handle_end = handles - - frame_start -= int(handle_start) - frame_end += int(handle_end) - - cmds.playbackOptions(minTime=frame_start) - cmds.playbackOptions(maxTime=frame_end) - cmds.playbackOptions(animationStartTime=frame_start) - cmds.playbackOptions(animationEndTime=frame_end) - cmds.playbackOptions(minTime=frame_start) - cmds.playbackOptions(maxTime=frame_end) - cmds.currentTime(frame_start) - - cmds.setAttr("defaultRenderGlobals.startFrame", frame_start) - cmds.setAttr("defaultRenderGlobals.endFrame", frame_end) - - def _resolution_from_document(doc): if not doc or "data" not in doc: print("Entered document is not valid. \"{}\"".format(str(doc))) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index b920428b20..84c6e6929d 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -34,7 +34,6 @@ from openpype.pipeline import ( registered_host, ) from openpype.pipeline.context_tools import get_current_project_asset -from .commands import reset_frame_range self = sys.modules[__name__] @@ -2065,6 +2064,54 @@ def set_scene_resolution(width, height, pixelAspect): cmds.setAttr("%s.pixelAspect" % control_node, pixelAspect) +def reset_frame_range(): + """Set frame range to current asset""" + + fps = convert_to_maya_fps( + float(legacy_io.Session.get("AVALON_FPS", 25)) + ) + set_scene_fps(fps) + + # Set frame start/end + project_name = legacy_io.active_project() + asset_name = legacy_io.Session["AVALON_ASSET"] + asset = get_asset_by_name(project_name, asset_name) + + frame_start = asset["data"].get("frameStart") + frame_end = asset["data"].get("frameEnd") + # Backwards compatibility + if frame_start is None or frame_end is None: + frame_start = asset["data"].get("edit_in") + frame_end = asset["data"].get("edit_out") + + if frame_start is None or frame_end is None: + cmds.warning("No edit information found for %s" % asset_name) + return + + handles = asset["data"].get("handles") or 0 + handle_start = asset["data"].get("handleStart") + if handle_start is None: + handle_start = handles + + handle_end = asset["data"].get("handleEnd") + if handle_end is None: + handle_end = handles + + frame_start -= int(handle_start) + frame_end += int(handle_end) + + cmds.playbackOptions(minTime=frame_start) + cmds.playbackOptions(maxTime=frame_end) + cmds.playbackOptions(animationStartTime=frame_start) + cmds.playbackOptions(animationEndTime=frame_end) + cmds.playbackOptions(minTime=frame_start) + cmds.playbackOptions(maxTime=frame_end) + cmds.currentTime(frame_start) + + cmds.setAttr("defaultRenderGlobals.startFrame", frame_start) + cmds.setAttr("defaultRenderGlobals.endFrame", frame_end) + + def reset_scene_resolution(): """Apply the scene resolution from the project definition diff --git a/openpype/hosts/maya/api/lib_rendersettings.py b/openpype/hosts/maya/api/lib_rendersettings.py index 6190a49401..2a730100de 100644 --- a/openpype/hosts/maya/api/lib_rendersettings.py +++ b/openpype/hosts/maya/api/lib_rendersettings.py @@ -14,7 +14,7 @@ from openpype.settings import ( from openpype.pipeline import legacy_io from openpype.pipeline import CreatorError from openpype.pipeline.context_tools import get_current_project_asset -from openpype.hosts.maya.api.commands import reset_frame_range +from openpype.hosts.maya.api.lib import reset_frame_range class RenderSettings(object): diff --git a/openpype/hosts/maya/api/menu.py b/openpype/hosts/maya/api/menu.py index 791475173f..0f48a133a6 100644 --- a/openpype/hosts/maya/api/menu.py +++ b/openpype/hosts/maya/api/menu.py @@ -12,7 +12,6 @@ from openpype.pipeline.workfile import BuildWorkfile from openpype.tools.utils import host_tools from openpype.hosts.maya.api import lib, lib_rendersettings from .lib import get_main_window, IS_HEADLESS -from .commands import reset_frame_range from .workfile_template_builder import ( create_placeholder, @@ -113,7 +112,7 @@ def install(): cmds.menuItem( "Reset Frame Range", - command=lambda *args: reset_frame_range() + command=lambda *args: lib.reset_frame_range() ) cmds.menuItem( From 7fe1473dde672e83dc62236d697cc70bd0feebc9 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Tue, 21 Feb 2023 00:13:53 +0300 Subject: [PATCH 287/912] disable root toggle, rename settings --- .../defaults/project_settings/fusion.json | 2 +- .../projects_schema/schema_project_fusion.json | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/openpype/settings/defaults/project_settings/fusion.json b/openpype/settings/defaults/project_settings/fusion.json index 74863ece43..97c1c52579 100644 --- a/openpype/settings/defaults/project_settings/fusion.json +++ b/openpype/settings/defaults/project_settings/fusion.json @@ -18,8 +18,8 @@ } }, "copy_fusion_settings": { + "copy_path": "~/.openpype/hosts/fusion/profiles", "copy_status": false, - "copy_path": "~/.openpype/hosts/fusion/prefs", "force_sync": false } } \ No newline at end of file diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_fusion.json b/openpype/settings/entities/schemas/projects_schema/schema_project_fusion.json index 540f840aad..464cf2c06d 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_fusion.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_fusion.json @@ -50,23 +50,22 @@ "type": "dict", "key": "copy_fusion_settings", "collapsible": true, - "checkbox_key": "copy_status", - "label": "Copy Fusion settings on launch", + "label": "Local Fusion profile settings", "children": [ - { - "type": "boolean", - "key": "copy_status", - "label": "Enabled" - }, { "key": "copy_path", "type": "path", - "label": "Local prefs directory" + "label": "Local Fusion profile directory" + }, + { + "type": "boolean", + "key": "copy_status", + "label": "Copy profile on first launch" }, { "key":"force_sync", "type": "boolean", - "label": "Force sync preferences" + "label": "Resync profile on each launch" } ] } From 7466f576ba9d8c1ca37b272320ae47c251018ca5 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Tue, 21 Feb 2023 00:14:17 +0300 Subject: [PATCH 288/912] remove redundant import --- openpype/hosts/fusion/api/workio.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/api/workio.py b/openpype/hosts/fusion/api/workio.py index f51c4fa9c1..fbb5a588f4 100644 --- a/openpype/hosts/fusion/api/workio.py +++ b/openpype/hosts/fusion/api/workio.py @@ -2,7 +2,7 @@ import sys import os -from .lib import get_fusion_module, get_current_comp, get_comp_filename +from .lib import get_fusion_module, get_current_comp def file_extensions(): From 1235894970870e0317a3c275c4acbea52504c762 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Tue, 21 Feb 2023 02:41:32 +0300 Subject: [PATCH 289/912] copy all fusion pref files, update docs --- .../hosts/fusion/hooks/pre_fusion_setup.py | 47 ++++++++++++------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index ad2ec7eb2d..949f86d981 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -17,35 +17,40 @@ class FusionPrelaunch(PreLaunchHook): as set in openpype/hosts/fusion/deploy/fusion_shared.prefs to enable the OpenPype menu and force Python 3 over Python 2. + PROFILE_NUMBER is used because from the Fusion v16 the profile folder + is project-specific, but then it was abandoned by devs, + and despite it is already Fusion version 18, still FUSION16_PROFILE_DIR is used. + The variable is added in case the version number will be updated or deleted + so we could easily change the version or disable it. """ app_groups = ["fusion"] PROFILE_NUMBER = 16 + def get_fusion_profile_name(self) -> str: """usually set to 'Default', unless FUSION16_PROFILE is set""" return os.getenv(f"FUSION{self.PROFILE_NUMBER}_PROFILE", "Default") def get_profile_source(self) -> Path: """Get the Fusion preferences (profile) location. - Check https://www.steakunderwater.com/VFXPedia/96.0.243.189/indexad6a.html?title=Per-User_Preferences_and_Paths for reference. + Check Per-User_Preferences_and_Paths on VFXpedia for reference. """ fusion_profile = self.get_fusion_profile_name() fusion_var_prefs_dir = os.getenv(f"FUSION{self.PROFILE_NUMBER}_PROFILE_DIR") - # if FUSION16_PROFILE_DIR variable exists, return the profile filepath + # if FUSION16_PROFILE_DIR variable exists if fusion_var_prefs_dir and Path(fusion_var_prefs_dir).is_dir(): fusion_prefs_dir = Path(fusion_var_prefs_dir, fusion_profile) self.log.info(f"Local Fusion prefs environment is set to {fusion_prefs_dir}") - fusion_prefs_filepath = fusion_prefs_dir / "Fusion.prefs" - return fusion_prefs_filepath - # otherwise get the profile from default prefs location - fusion_prefs_path = f"Blackmagic Design/Fusion/Profiles/{fusion_profile}/Fusion.prefs" + return fusion_prefs_dir + # otherwise get the profile folder from default location + fusion_prefs_dir = f"Blackmagic Design/Fusion/Profiles/{fusion_profile}" if platform.system() == "Windows": - prefs_source = Path(os.getenv("AppData"), fusion_prefs_path) + prefs_source = Path(os.getenv("AppData"), fusion_prefs_dir) elif platform.system() == "Darwin": - prefs_source = Path("~/Library/Application Support/", fusion_prefs_path).expanduser() + prefs_source = Path("~/Library/Application Support/", fusion_prefs_dir).expanduser() elif platform.system() == "Linux": - prefs_source = Path("~/.fusion", fusion_prefs_path).expanduser() + prefs_source = Path("~/.fusion", fusion_prefs_dir).expanduser() self.log.info(f"Got Fusion prefs file: {prefs_source}") return prefs_source @@ -67,10 +72,11 @@ class FusionPrelaunch(PreLaunchHook): return copy_status, copy_path, force_sync def copy_existing_prefs(self, copy_from: Path, copy_to: Path, force_sync: bool) -> None: - """On the first Fusion launch copy the Fusion profile to the working directory. - If the Openpype profile folder exists, skip copying, unless Force sync is checked. - If the prefs were not copied on the first launch, clean Fusion profile - will be created in fusion_profile_dir. + """On the first Fusion launch copy the contents of Fusion profile directory + to the working predefined location. If the Openpype profile folder exists, + skip copying, unless re-sync is checked. + If the prefs were not copied on the first launch, + clean Fusion profile will be created in fusion_profile_dir. """ if copy_to.exists() and not force_sync: self.log.info("Local Fusion preferences folder exists, skipping profile copy") @@ -82,7 +88,10 @@ class FusionPrelaunch(PreLaunchHook): if not copy_from.exists(): self.log.warning(f"Fusion preferences file not found in {copy_from}") return - shutil.copy(str(copy_from), str(dest_folder)) # compatible with Python >= 3.6 + for file in copy_from.iterdir(): + if file.suffix in (".prefs", ".def", ".blocklist", "fu"): + # convert Path to str to be compatible with Python 3.6 and above + shutil.copy(str(file), str(dest_folder)) self.log.info(f"successfully copied preferences:\n {copy_from} to {dest_folder}") def execute(self): @@ -93,8 +102,9 @@ class FusionPrelaunch(PreLaunchHook): fusion_python3_home = self.launch_context.env.get(py3_var, "") for path in fusion_python3_home.split(os.pathsep): - # Allow defining multiple paths, separated by os.pathsep, to allow "fallback" to other - # path. But make to set only a single path as final variable. + # Allow defining multiple paths, separated by os.pathsep, + # to allow "fallback" to other path. + # But make to set only a single path as final variable. py3_dir = os.path.normpath(path) if os.path.isdir(py3_dir): self.log.info(f"Looking for Python 3 in: {py3_dir}") @@ -119,8 +129,9 @@ class FusionPrelaunch(PreLaunchHook): # TODO: Detect Fusion version to only set for specific Fusion build self.launch_context.env[f"FUSION{self.PROFILE_NUMBER}_PYTHON36_HOME"] = py3_dir - # Add custom Fusion Master Prefs and the temporary profile directory variables - # to customize Fusion to define where it can read custom scripts and tools from + # Add custom Fusion Master Prefs and the temporary + # profile directory variables to customize Fusion + # to define where it can read custom scripts and tools from self.log.info(f"Setting OPENPYPE_FUSION: {FUSION_HOST_DIR}") self.launch_context.env["OPENPYPE_FUSION"] = FUSION_HOST_DIR From 2d6cc7788199c26e338ab6e960aef1fc25caca9b Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Tue, 21 Feb 2023 02:42:36 +0300 Subject: [PATCH 290/912] fle formatting --- .../hosts/fusion/hooks/pre_fusion_setup.py | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index 949f86d981..3f521bb60d 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -17,16 +17,16 @@ class FusionPrelaunch(PreLaunchHook): as set in openpype/hosts/fusion/deploy/fusion_shared.prefs to enable the OpenPype menu and force Python 3 over Python 2. - PROFILE_NUMBER is used because from the Fusion v16 the profile folder + PROFILE_NUMBER is used because from the Fusion v16 the profile folder is project-specific, but then it was abandoned by devs, and despite it is already Fusion version 18, still FUSION16_PROFILE_DIR is used. The variable is added in case the version number will be updated or deleted so we could easily change the version or disable it. """ + app_groups = ["fusion"] PROFILE_NUMBER = 16 - def get_fusion_profile_name(self) -> str: """usually set to 'Default', unless FUSION16_PROFILE is set""" return os.getenv(f"FUSION{self.PROFILE_NUMBER}_PROFILE", "Default") @@ -41,14 +41,18 @@ class FusionPrelaunch(PreLaunchHook): # if FUSION16_PROFILE_DIR variable exists if fusion_var_prefs_dir and Path(fusion_var_prefs_dir).is_dir(): fusion_prefs_dir = Path(fusion_var_prefs_dir, fusion_profile) - self.log.info(f"Local Fusion prefs environment is set to {fusion_prefs_dir}") + self.log.info( + f"Local Fusion prefs environment is set to {fusion_prefs_dir}" + ) return fusion_prefs_dir # otherwise get the profile folder from default location fusion_prefs_dir = f"Blackmagic Design/Fusion/Profiles/{fusion_profile}" if platform.system() == "Windows": prefs_source = Path(os.getenv("AppData"), fusion_prefs_dir) elif platform.system() == "Darwin": - prefs_source = Path("~/Library/Application Support/", fusion_prefs_dir).expanduser() + prefs_source = Path( + "~/Library/Application Support/", fusion_prefs_dir + ).expanduser() elif platform.system() == "Linux": prefs_source = Path("~/.fusion", fusion_prefs_dir).expanduser() self.log.info(f"Got Fusion prefs file: {prefs_source}") @@ -56,11 +60,8 @@ class FusionPrelaunch(PreLaunchHook): def get_copy_fusion_prefs_settings(self): """Get copy prefserences options from the global application settings""" - copy_fusion_settings = ( - self.data - ["project_settings"] - ["fusion"] - .get("copy_fusion_settings", {}) + copy_fusion_settings = self.data["project_settings"]["fusion"].get( + "copy_fusion_settings", {} ) if not copy_fusion_settings: self.log.error("Copy prefs settings not found") @@ -71,7 +72,9 @@ class FusionPrelaunch(PreLaunchHook): copy_path = Path(copy_path).expanduser() return copy_status, copy_path, force_sync - def copy_existing_prefs(self, copy_from: Path, copy_to: Path, force_sync: bool) -> None: + def copy_existing_prefs( + self, copy_from: Path, copy_to: Path, force_sync: bool + ) -> None: """On the first Fusion launch copy the contents of Fusion profile directory to the working predefined location. If the Openpype profile folder exists, skip copying, unless re-sync is checked. @@ -79,21 +82,25 @@ class FusionPrelaunch(PreLaunchHook): clean Fusion profile will be created in fusion_profile_dir. """ if copy_to.exists() and not force_sync: - self.log.info("Local Fusion preferences folder exists, skipping profile copy") + self.log.info( + "Local Fusion preferences folder exists, skipping profile copy" + ) return self.log.info(f"Starting copying Fusion preferences") self.log.info(f"force_sync option is set to {force_sync}") dest_folder = copy_to / self.get_fusion_profile_name() - dest_folder.mkdir(exist_ok=True, parents=True) + dest_folder.mkdir(exist_ok=True, parents=True) if not copy_from.exists(): self.log.warning(f"Fusion preferences file not found in {copy_from}") return for file in copy_from.iterdir(): if file.suffix in (".prefs", ".def", ".blocklist", "fu"): # convert Path to str to be compatible with Python 3.6 and above - shutil.copy(str(file), str(dest_folder)) - self.log.info(f"successfully copied preferences:\n {copy_from} to {dest_folder}") - + shutil.copy(str(file), str(dest_folder)) + self.log.info( + f"successfully copied preferences:\n {copy_from} to {dest_folder}" + ) + def execute(self): # making sure python 3 is installed at provided path # Py 3.3-3.10 for Fusion 18+ or Py 3.6 for Fu 16-17 @@ -102,7 +109,7 @@ class FusionPrelaunch(PreLaunchHook): fusion_python3_home = self.launch_context.env.get(py3_var, "") for path in fusion_python3_home.split(os.pathsep): - # Allow defining multiple paths, separated by os.pathsep, + # Allow defining multiple paths, separated by os.pathsep, # to allow "fallback" to other path. # But make to set only a single path as final variable. py3_dir = os.path.normpath(path) @@ -135,7 +142,11 @@ class FusionPrelaunch(PreLaunchHook): self.log.info(f"Setting OPENPYPE_FUSION: {FUSION_HOST_DIR}") self.launch_context.env["OPENPYPE_FUSION"] = FUSION_HOST_DIR - copy_status, fusion_profile_dir, force_sync = self.get_copy_fusion_prefs_settings() + ( + copy_status, + fusion_profile_dir, + force_sync, + ) = self.get_copy_fusion_prefs_settings() if copy_status: prefs_source = self.get_profile_source() self.copy_existing_prefs(prefs_source, fusion_profile_dir, force_sync) From ffcc1656d2a4641bf9ae36e4a28a0c831f8d8a4f Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Tue, 21 Feb 2023 11:08:07 +0800 Subject: [PATCH 291/912] cosmetic issue fix --- openpype/hosts/max/api/lib.py | 13 +++---- openpype/hosts/max/api/lib_renderproducts.py | 23 +++++------ openpype/hosts/max/api/lib_rendersettings.py | 39 +++++++++++-------- .../max/plugins/publish/collect_render.py | 2 +- .../plugins/publish/submit_max_deadline.py | 20 +++++----- 5 files changed, 48 insertions(+), 49 deletions(-) diff --git a/openpype/hosts/max/api/lib.py b/openpype/hosts/max/api/lib.py index 53e66c219e..6ee934d3da 100644 --- a/openpype/hosts/max/api/lib.py +++ b/openpype/hosts/max/api/lib.py @@ -135,17 +135,14 @@ def get_default_render_folder(project_setting=None): def set_framerange(startFrame, endFrame): """ - Args: - start_frame (int): Start frame number. - end_frame (int): End frame number. Note: Frame range can be specified in different types. Possible values are: + * `1` - Single frame. + * `2` - Active time segment ( animationRange ). + * `3` - User specified Range. + * `4` - User specified Frame pickup string (for example `1,3,5-12`). - * `1` - Single frame. - * `2` - Active time segment ( animationRange ). - * `3` - User specified Range. - * `4` - User specified Frame pickup string (for example `1,3,5-12`). - TODO: + Todo: Current type is hard-coded, there should be a custom setting for this. """ rt.rendTimeType = 4 diff --git a/openpype/hosts/max/api/lib_renderproducts.py b/openpype/hosts/max/api/lib_renderproducts.py index 6d476c9139..a74a6a7426 100644 --- a/openpype/hosts/max/api/lib_renderproducts.py +++ b/openpype/hosts/max/api/lib_renderproducts.py @@ -45,28 +45,25 @@ class RenderProducts(object): if renderer == "VUE_File_Renderer": return full_render_list - if ( - renderer == "ART_Renderer" or - renderer == "Redshift_Renderer" or - renderer == "V_Ray_6_Hotfix_3" or - renderer == "V_Ray_GPU_6_Hotfix_3" or - renderer == "Default_Scanline_Renderer" or - renderer == "Quicksilver_Hardware_Renderer" - ): + if renderer in [ + "ART_Renderer", + "Redshift_Renderer", + "V_Ray_6_Hotfix_3", + "V_Ray_GPU_6_Hotfix_3", + "Default_Scanline_Renderer", + "Quicksilver_Hardware_Renderer", + ]: render_elem_list = self.render_elements_product(output_file, img_fmt) if render_elem_list: - for render_elem in render_elem_list: - full_render_list.append(render_elem) - + full_render_list.extend(iter(render_elem_list)) return full_render_list if renderer == "Arnold": aov_list = self.arnold_render_product(output_file, img_fmt) if aov_list: - for aov in aov_list: - full_render_list.append(aov) + full_render_list.extend(iter(aov_list)) return full_render_list def beauty_render_product(self, folder, fmt): diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index 212c08846b..94c6ee775b 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -23,6 +23,11 @@ class RenderSettings(object): } def __init__(self, project_settings=None): + """ + Set up the naming convention for the render + elements for the deadline submission + """ + self._project_settings = project_settings if not self._project_settings: self._project_settings = get_project_settings( @@ -61,9 +66,9 @@ class RenderSettings(object): width = context["data"].get("resolutionWidth") height = context["data"].get("resolutionHeight") # Set Frame Range - startFrame = context["data"].get("frameStart") - endFrame = context["data"].get("frameEnd") - set_framerange(startFrame, endFrame) + frame_start = context["data"].get("frame_start") + frame_end = context["data"].get("frame_end") + set_framerange(frame_start, frame_end) # get the production render renderer_class = get_current_renderer() renderer = str(renderer_class).split(":")[0] @@ -78,24 +83,24 @@ class RenderSettings(object): )] except KeyError: aov_separator = "." - outputFilename = "{0}..{1}".format(output, img_fmt) - outputFilename = outputFilename.replace("{aov_separator}", + output_filename = "{0}..{1}".format(output, img_fmt) + output_filename = output_filename.replace("{aov_separator}", aov_separator) - rt.rendOutputFilename = outputFilename + rt.rendOutputFilename = output_filename if renderer == "VUE_File_Renderer": return # TODO: Finish the arnold render setup if renderer == "Arnold": self.arnold_setup() - if ( - renderer == "ART_Renderer" or - renderer == "Redshift_Renderer" or - renderer == "V_Ray_6_Hotfix_3" or - renderer == "V_Ray_GPU_6_Hotfix_3" or - renderer == "Default_Scanline_Renderer" or - renderer == "Quicksilver_Hardware_Renderer" - ): + if renderer in [ + "ART_Renderer", + "Redshift_Renderer", + "V_Ray_6_Hotfix_3", + "V_Ray_GPU_6_Hotfix_3", + "Default_Scanline_Renderer", + "Quicksilver_Hardware_Renderer", + ]: self.render_element_layer(output, width, height, img_fmt) rt.rendSaveFile = True @@ -146,11 +151,11 @@ class RenderSettings(object): def get_render_output(self, container, output_dir): output = os.path.join(output_dir, container) img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"] # noqa - outputFilename = "{0}..{1}".format(output, img_fmt) - return outputFilename + output_filename = "{0}..{1}".format(output, img_fmt) + return output_filename def get_render_element(self): - orig_render_elem = list() + orig_render_elem = [] render_elem = rt.maxOps.GetCurRenderElementMgr() render_elem_num = render_elem.NumRenderElements() if render_elem_num < 0: diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py index 16f8821986..7656c641ed 100644 --- a/openpype/hosts/max/plugins/publish/collect_render.py +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -14,7 +14,7 @@ class CollectRender(pyblish.api.InstancePlugin): """Collect Render for Deadline""" order = pyblish.api.CollectorOrder + 0.01 - label = "Collect 3dmax Render Layers" + label = "Collect 3dsmax Render Layers" hosts = ['max'] families = ["maxrender"] diff --git a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py index b53cc928d6..417a03de74 100644 --- a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py @@ -160,11 +160,11 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline): } self.log.debug("Submitting 3dsMax render..") - payload = self._use_puhlished_name(payload_data) + payload = self._use_published_name(payload_data) job_info, plugin_info = payload self.submit(self.assemble_payload(job_info, plugin_info)) - def _use_puhlished_name(self, data): + def _use_published_name(self, data): instance = self._instance job_info = copy.deepcopy(self.job_info) plugin_info = copy.deepcopy(self.plugin_info) @@ -199,14 +199,14 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline): renderer_class = get_current_renderer() renderer = str(renderer_class).split(":")[0] - if ( - renderer == "ART_Renderer" or - renderer == "Redshift_Renderer" or - renderer == "V_Ray_6_Hotfix_3" or - renderer == "V_Ray_GPU_6_Hotfix_3" or - renderer == "Default_Scanline_Renderer" or - renderer == "Quicksilver_Hardware_Renderer" - ): + if renderer in [ + "ART_Renderer", + "Redshift_Renderer", + "V_Ray_6_Hotfix_3", + "V_Ray_GPU_6_Hotfix_3", + "Default_Scanline_Renderer", + "Quicksilver_Hardware_Renderer", + ]: render_elem_list = RenderSettings().get_render_element() for i, element in enumerate(render_elem_list): element = element.replace(orig_scene, new_scene) From 8ca7a719046bc2ceb2075db20a959ccc88797447 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Tue, 21 Feb 2023 11:10:02 +0800 Subject: [PATCH 292/912] hound fix --- openpype/hosts/max/api/lib.py | 6 +++--- openpype/hosts/max/api/lib_rendersettings.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/max/api/lib.py b/openpype/hosts/max/api/lib.py index 6ee934d3da..3383330792 100644 --- a/openpype/hosts/max/api/lib.py +++ b/openpype/hosts/max/api/lib.py @@ -137,9 +137,9 @@ def set_framerange(startFrame, endFrame): """ Note: Frame range can be specified in different types. Possible values are: - * `1` - Single frame. - * `2` - Active time segment ( animationRange ). - * `3` - User specified Range. + * `1` - Single frame. + * `2` - Active time segment ( animationRange ). + * `3` - User specified Range. * `4` - User specified Frame pickup string (for example `1,3,5-12`). Todo: diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index 94c6ee775b..b07d19f176 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -85,7 +85,7 @@ class RenderSettings(object): aov_separator = "." output_filename = "{0}..{1}".format(output, img_fmt) output_filename = output_filename.replace("{aov_separator}", - aov_separator) + aov_separator) rt.rendOutputFilename = output_filename if renderer == "VUE_File_Renderer": return From 373b1abffc44a2be38643d28131ee0abefe3c52c Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 21 Feb 2023 07:21:30 +0000 Subject: [PATCH 293/912] Ensure viewport options work ahead of playblasting. --- .../maya/plugins/publish/extract_playblast.py | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/openpype/hosts/maya/plugins/publish/extract_playblast.py b/openpype/hosts/maya/plugins/publish/extract_playblast.py index 1f9f9db99a..fe7e83a84b 100644 --- a/openpype/hosts/maya/plugins/publish/extract_playblast.py +++ b/openpype/hosts/maya/plugins/publish/extract_playblast.py @@ -119,6 +119,24 @@ class ExtractPlayblast(publish.Extractor): pan_zoom = cmds.getAttr("{}.panZoomEnabled".format(preset["camera"])) cmds.setAttr("{}.panZoomEnabled".format(preset["camera"]), False) + # Need to explicitly enable some viewport changes so the viewport is + # refreshed ahead of playblasting. + panel = cmds.getPanel(withFocus=True) + keys = [ + "useDefaultMaterial", + "wireframeOnShaded", + "xray", + "jointXray", + "backfaceCulling" + ] + viewport_defaults = {} + for key in keys: + viewport_defaults[key] = cmds.modelEditor( + panel, query=True, **{key: True} + ) + if preset["viewport_options"][key]: + cmds.modelEditor(panel, edit=True, **{key: True}) + with lib.maintained_time(): filename = preset.get("filename", "%TEMP%") @@ -139,6 +157,10 @@ class ExtractPlayblast(publish.Extractor): path = capture.capture(log=self.log, **preset) + # Restoring viewport options. + for key, value in viewport_defaults.items(): + cmds.modelEditor(panel, edit=True, **{key: value}) + cmds.setAttr("{}.panZoomEnabled".format(preset["camera"]), pan_zoom) self.log.debug("playblast path {}".format(path)) From 38c9330caef225e4ab632f5834c92fff5a3ea8b9 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 21 Feb 2023 10:41:48 +0100 Subject: [PATCH 294/912] returning nightly builds --- .github/workflows/nightly_merge.yml | 29 +++++++++++++ .github/workflows/prerelease.yml | 67 +++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 .github/workflows/nightly_merge.yml create mode 100644 .github/workflows/prerelease.yml diff --git a/.github/workflows/nightly_merge.yml b/.github/workflows/nightly_merge.yml new file mode 100644 index 0000000000..1776d7a464 --- /dev/null +++ b/.github/workflows/nightly_merge.yml @@ -0,0 +1,29 @@ +name: Dev -> Main + +on: + schedule: + - cron: '21 3 * * 3,6' + workflow_dispatch: + +jobs: + develop-to-main: + + runs-on: ubuntu-latest + + steps: + - name: 🚛 Checkout Code + uses: actions/checkout@v2 + + - name: 🔨 Merge develop to main + uses: everlytic/branch-merge@1.1.0 + with: + github_token: ${{ secrets.YNPUT_BOT_TOKEN }} + source_ref: 'develop' + target_branch: 'main' + commit_message_template: '[Automated] Merged {source_ref} into {target_branch}' + + - name: Invoke pre-release workflow + uses: benc-uk/workflow-dispatch@v1 + with: + workflow: Nightly Prerelease + token: ${{ secrets.YNPUT_BOT_TOKEN }} diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml new file mode 100644 index 0000000000..571b0339e1 --- /dev/null +++ b/.github/workflows/prerelease.yml @@ -0,0 +1,67 @@ +name: Nightly Prerelease + +on: + workflow_dispatch: + + +jobs: + create_nightly: + runs-on: ubuntu-latest + + steps: + - name: 🚛 Checkout Code + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.9 + + - name: Install Python requirements + run: pip install gitpython semver PyGithub + + - name: 🔎 Determine next version type + id: version_type + run: | + TYPE=$(python ./tools/ci_tools.py --bump --github_token ${{ secrets.YNPUT_BOT_TOKEN }}) + echo "type=${TYPE}" >> $GITHUB_OUTPUT + + - name: 💉 Inject new version into files + id: version + if: steps.version_type.outputs.type != 'skip' + run: | + NEW_VERSION_TAG=$(python ./tools/ci_tools.py --nightly --github_token ${{ secrets.YNPUT_BOT_TOKEN }}) + echo "next_tag=${NEW_VERSION_TAG}" >> $GITHUB_OUTPUT + + - name: 💾 Commit and Tag + id: git_commit + if: steps.version_type.outputs.type != 'skip' + run: | + git config user.email ${{ secrets.CI_EMAIL }} + git config user.name ${{ secrets.CI_USER }} + git checkout main + git pull + git add . + git commit -m "[Automated] Bump version" + tag_name="CI/${{ steps.version.outputs.next_tag }}" + echo $tag_name + git tag -a $tag_name -m "nightly build" + + - name: Push to protected main branch + uses: CasperWA/push-protected@v2.10.0 + with: + token: ${{ secrets.YNPUT_BOT_TOKEN }} + branch: main + tags: true + unprotect_reviews: true + + - name: 🔨 Merge main back to develop + uses: everlytic/branch-merge@1.1.0 + if: steps.version_type.outputs.type != 'skip' + with: + github_token: ${{ secrets.YNPUT_BOT_TOKEN }} + source_ref: 'main' + target_branch: 'develop' + commit_message_template: '[Automated] Merged {source_ref} into {target_branch}' From 78933eb56259045a27c1c56f06a31dfb39f38e37 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 10:44:10 +0100 Subject: [PATCH 295/912] OP-4643 - fixed subset filtering Co-authored-by: Toke Jepsen --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index de36ea7d5f..71124b527a 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -273,7 +273,7 @@ class ExtractOIIOTranscode(publish.Extractor): "families": family, "task_names": task_name, "task_types": task_type, - "subset": subset + "subsets": subset } profile = filter_profiles(self.profiles, filtering_criteria, logger=self.log) From deaad39437501f18fc3ba4be8b1fc5f0ee3be65d Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 12:12:35 +0100 Subject: [PATCH 296/912] OP-4643 - split command line arguments to separate items Reuse existing method from ExtractReview, put it into transcoding.py --- openpype/lib/transcoding.py | 29 +++++++++++++++++++++- openpype/plugins/publish/extract_review.py | 27 +++----------------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 95042fb74c..a87300c280 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1092,7 +1092,7 @@ def convert_colorspace( raise ValueError("Both screen and display must be set.") if additional_command_args: - oiio_cmd.extend(additional_command_args) + oiio_cmd.extend(split_cmd_args(additional_command_args)) if target_colorspace: oiio_cmd.extend(["--colorconvert", @@ -1106,3 +1106,30 @@ def convert_colorspace( logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) + + +def split_cmd_args(in_args): + """Makes sure all entered arguments are separated in individual items. + + Split each argument string with " -" to identify if string contains + one or more arguments. + Args: + in_args (list): of arguments ['-n', '-d uint10'] + Returns + (list): ['-n', '-d', 'unint10'] + """ + splitted_args = [] + for arg in in_args: + sub_args = arg.split(" -") + if len(sub_args) == 1: + if arg and arg not in splitted_args: + splitted_args.append(arg) + continue + + for idx, arg in enumerate(sub_args): + if idx != 0: + arg = "-" + arg + + if arg and arg not in splitted_args: + splitted_args.append(arg) + return splitted_args diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py index 0f6dacba18..e80141fc4a 100644 --- a/openpype/plugins/publish/extract_review.py +++ b/openpype/plugins/publish/extract_review.py @@ -22,6 +22,7 @@ from openpype.lib.transcoding import ( should_convert_for_ffmpeg, convert_input_paths_for_ffmpeg, get_transcode_temp_directory, + split_cmd_args ) @@ -670,7 +671,7 @@ class ExtractReview(pyblish.api.InstancePlugin): res_filters = self.rescaling_filters(temp_data, output_def, new_repre) ffmpeg_video_filters.extend(res_filters) - ffmpeg_input_args = self.split_ffmpeg_args(ffmpeg_input_args) + ffmpeg_input_args = split_cmd_args(ffmpeg_input_args) lut_filters = self.lut_filters(new_repre, instance, ffmpeg_input_args) ffmpeg_video_filters.extend(lut_filters) @@ -723,28 +724,6 @@ class ExtractReview(pyblish.api.InstancePlugin): ffmpeg_output_args ) - def split_ffmpeg_args(self, in_args): - """Makes sure all entered arguments are separated in individual items. - - Split each argument string with " -" to identify if string contains - one or more arguments. - """ - splitted_args = [] - for arg in in_args: - sub_args = arg.split(" -") - if len(sub_args) == 1: - if arg and arg not in splitted_args: - splitted_args.append(arg) - continue - - for idx, arg in enumerate(sub_args): - if idx != 0: - arg = "-" + arg - - if arg and arg not in splitted_args: - splitted_args.append(arg) - return splitted_args - def ffmpeg_full_args( self, input_args, video_filters, audio_filters, output_args ): @@ -764,7 +743,7 @@ class ExtractReview(pyblish.api.InstancePlugin): Returns: list: Containing all arguments ready to run in subprocess. """ - output_args = self.split_ffmpeg_args(output_args) + output_args = split_cmd_args(output_args) video_args_dentifiers = ["-vf", "-filter:v"] audio_args_dentifiers = ["-af", "-filter:a"] From 83cb0b0b04a59a5f4acffb05659a893f2318c91c Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 13:02:41 +0100 Subject: [PATCH 297/912] OP-4643 - refactor - changed existence check --- openpype/plugins/publish/extract_color_transcode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 71124b527a..456e40008d 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -161,12 +161,12 @@ class ExtractOIIOTranscode(publish.Extractor): custom_tags = output_def.get("custom_tags") if custom_tags: - if not new_repre.get("custom_tags"): + if new_repre.get("custom_tags") is None: new_repre["custom_tags"] = [] new_repre["custom_tags"].extend(custom_tags) # Add additional tags from output definition to representation - if not new_repre.get("tags"): + if new_repre.get("tags") is None: new_repre["tags"] = [] for tag in output_def["tags"]: if tag not in new_repre["tags"]: From 909f51b702825be0fe23fd946023279787d28e1c Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 13:10:11 +0100 Subject: [PATCH 298/912] OP-4643 - changed label MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jakub Ježek --- .../schemas/projects_schema/schemas/schema_global_publish.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 5333d514b5..3e9467af61 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -294,7 +294,7 @@ "children": [ { "key": "additional_command_args", - "label": "Additional command line arguments", + "label": "Arguments", "type": "list", "object_type": "text" } From 71013e45052bb0775cc80e799cf4556a935372ef Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 13:11:11 +0100 Subject: [PATCH 299/912] Revert "Fix - added missed scopes for Slack bot" This reverts commit 5e0c4a3ab1432e120b8f0c324f899070f1a5f831. --- openpype/modules/slack/manifest.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/openpype/modules/slack/manifest.yml b/openpype/modules/slack/manifest.yml index 233c39fbaf..7a65cc5915 100644 --- a/openpype/modules/slack/manifest.yml +++ b/openpype/modules/slack/manifest.yml @@ -19,8 +19,6 @@ oauth_config: - chat:write.public - files:write - channels:read - - users:read - - usergroups:read settings: org_deploy_enabled: false socket_mode_enabled: false From 12ba88e9573a3c33184264e2b6c86468a26b3a3b Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 15:06:16 +0100 Subject: [PATCH 300/912] OP-4643 - added documentation --- .../assets/global_oiio_transcode.png | Bin 0 -> 29010 bytes .../project_settings/settings_project_global.md | 15 +++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 website/docs/project_settings/assets/global_oiio_transcode.png diff --git a/website/docs/project_settings/assets/global_oiio_transcode.png b/website/docs/project_settings/assets/global_oiio_transcode.png new file mode 100644 index 0000000000000000000000000000000000000000..99396d5bb3f16d434a92c6079515128488b82489 GIT binary patch literal 29010 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 literal 0 HcmV?d00001 diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 37fed93e69..52671d2db6 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -45,6 +45,21 @@ The _input pattern_ matching uses REGEX expression syntax (try [regexr.com](http The **colorspace name** value is a raw string input and no validation is run after saving project settings. We recommend to open the specified `config.ocio` file and copy pasting the exact colorspace names. ::: +### Extract OIIO Transcode +There is profile configurable (see lower) plugin which allows to transcode any incoming representation to one or multiple new representations (configured in `Output Definitions`) with different target colorspaces. +Plugin expects instances with filled dictionary `colorspaceData` on a representation. This data contains information about source colorspace and must be collected for transcoding. +`oiiotool` is used for transcoding, eg. `oiiotool` must be present in `vendor/bin/oiio` or environment variable `OPENPYPE_OIIO_PATHS` must be provided for custom oiio installation. + +Notable parameters: +- **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. +- **`Extension`** - target extension, could be empty - original extension is used +- **`Colorspace`** - target colorspace - must be available in used color config +- **`Display & View`** - transcoding into colorspace OR into display and viewer space could be used. (It is disjunctive: Colorspace & nothing in Display and View or opposite) +- **`Arguments`** - special additional command line arguments for `oiiotool` + + +Example here describes use case for creation of new color coded review of png image sequence. Original representation's files are kept intact, review is created from transcoded files, but these files are removed in cleanup process. +![global_oiio_transcode](assets/global_oiio_transcode.png) ## Profile filters From 2894cef94c15b35f0ffff4676278a422d80a0ff6 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 21 Feb 2023 15:11:48 +0100 Subject: [PATCH 301/912] rename color group by render layer variant --- .../tvpaint/plugins/create/create_render.py | 51 ++++++++++++++----- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index cae894035a..841489e14b 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -145,6 +145,7 @@ class CreateRenderlayer(TVPaintCreator): def create(self, subset_name, instance_data, pre_create_data): self.log.debug("Query data from workfile.") + group_name = instance_data["variant"] group_id = pre_create_data.get("group_id") # This creator should run only on one group if group_id is None or group_id == -1: @@ -193,15 +194,10 @@ class CreateRenderlayer(TVPaintCreator): ) self._store_new_instance(new_instance) - new_group_name = pre_create_data.get("group_name") - if not new_group_name or not group_id: + if not group_id or group_item["name"] == group_name: return new_instance self.log.debug("Changing name of the group.") - - new_group_name = pre_create_data.get("group_name") - if not new_group_name or group_item["name"] == new_group_name: - return new_instance # Rename TVPaint group (keep color same) # - groups can't contain spaces rename_script = self.rename_script_template.format( @@ -210,13 +206,13 @@ class CreateRenderlayer(TVPaintCreator): r=group_item["red"], g=group_item["green"], b=group_item["blue"], - name=new_group_name + name=group_name ) execute_george_through_file(rename_script) self.log.info(( f"Name of group with index {group_id}" - f" was changed to \"{new_group_name}\"." + f" was changed to \"{group_name}\"." )) return new_instance @@ -252,11 +248,6 @@ class CreateRenderlayer(TVPaintCreator): label="Group", items=groups_enum ), - TextDef( - "group_name", - label="New group name", - placeholder="< Keep unchanged >" - ), BoolDef( "mark_for_review", label="Review", @@ -280,10 +271,44 @@ class CreateRenderlayer(TVPaintCreator): ] def update_instances(self, update_list): + self._update_color_groups() self._update_renderpass_groups() super().update_instances(update_list) + def _update_color_groups(self): + render_layer_instances = [] + for instance in self.create_context.instances: + if instance.creator_identifier == self.identifier: + render_layer_instances.append(instance) + + if not render_layer_instances: + return + + groups_by_id = { + group["group_id"]: group + for group in get_groups_data() + } + grg_script_lines = [] + for instance in render_layer_instances: + group_id = instance["creator_attributes"]["group_id"] + variant = instance["variant"] + group = groups_by_id[group_id] + if group["name"] == variant: + continue + + grg_script_lines.append(self.rename_script_template.format( + clip_id=group["clip_id"], + group_id=group["group_id"], + r=group["red"], + g=group["green"], + b=group["blue"], + name=variant + )) + + if grg_script_lines: + execute_george_through_file("\n".join(grg_script_lines)) + def _update_renderpass_groups(self): render_layer_instances = {} render_pass_instances = collections.defaultdict(list) From 1d0952014314217b022dffea7340db8776041a54 Mon Sep 17 00:00:00 2001 From: Toke Jepsen Date: Tue, 21 Feb 2023 15:18:07 +0000 Subject: [PATCH 302/912] Update openpype/hosts/maya/plugins/publish/extract_playblast.py Co-authored-by: Kayla Man <64118225+moonyuet@users.noreply.github.com> --- openpype/hosts/maya/plugins/publish/extract_playblast.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/extract_playblast.py b/openpype/hosts/maya/plugins/publish/extract_playblast.py index f85772886b..1966ad7b66 100644 --- a/openpype/hosts/maya/plugins/publish/extract_playblast.py +++ b/openpype/hosts/maya/plugins/publish/extract_playblast.py @@ -163,8 +163,7 @@ class ExtractPlayblast(publish.Extractor): path = capture.capture(log=self.log, **preset) # Restoring viewport options. - for key, value in viewport_defaults.items(): - cmds.modelEditor(panel, edit=True, **{key: value}) + cmds.modelEditor(panel, edit=True, **viewport_defaults) cmds.setAttr("{}.panZoomEnabled".format(preset["camera"]), pan_zoom) From f26b44a2aadebc60ac92ae1a6de81e9442dab429 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 21 Feb 2023 16:19:30 +0100 Subject: [PATCH 303/912] fix 'creator_attributes' key --- openpype/hosts/tvpaint/plugins/create/create_render.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 841489e14b..6a857676a5 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -513,9 +513,9 @@ class CreateRenderPass(TVPaintCreator): instance_data["group"] = f"{self.get_group_label()} ({render_layer})" instance_data["layer_names"] = list(marked_layer_names) if "creator_attributes" not in instance_data: - instance_data["creator_attribtues"] = {} + instance_data["creator_attributes"] = {} - creator_attributes = instance_data["creator_attribtues"] + creator_attributes = instance_data["creator_attributes"] mark_for_review = pre_create_data.get("mark_for_review") if mark_for_review is None: mark_for_review = self.mark_for_review From 08e2d36f199b617a35120b73fd9f0de2b429fa60 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 21 Feb 2023 16:29:25 +0100 Subject: [PATCH 304/912] ignore missing layers in unrelated validators --- .../plugins/publish/validate_duplicated_layer_names.py | 3 +++ .../tvpaint/plugins/publish/validate_layers_visibility.py | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py b/openpype/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py index 9f61bdbcd0..722d76b4d2 100644 --- a/openpype/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py +++ b/openpype/hosts/tvpaint/plugins/publish/validate_duplicated_layer_names.py @@ -20,6 +20,9 @@ class ValidateLayersGroup(pyblish.api.InstancePlugin): duplicated_layer_names = [] for layer_name in layer_names: layers = layers_by_name.get(layer_name) + # It is not job of this validator to handle missing layers + if layers is None: + continue if len(layers) > 1: duplicated_layer_names.append(layer_name) diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_layers_visibility.py b/openpype/hosts/tvpaint/plugins/publish/validate_layers_visibility.py index 47632453fc..6a496a2e49 100644 --- a/openpype/hosts/tvpaint/plugins/publish/validate_layers_visibility.py +++ b/openpype/hosts/tvpaint/plugins/publish/validate_layers_visibility.py @@ -11,8 +11,13 @@ class ValidateLayersVisiblity(pyblish.api.InstancePlugin): families = ["review", "render"] def process(self, instance): + layers = instance.data["layers"] + # Instance have empty layers + # - it is not job of this validator to check that + if not layers: + return layer_names = set() - for layer in instance.data["layers"]: + for layer in layers: layer_names.add(layer["name"]) if layer["visible"]: return From f1718284f9245dd24160d8975061d90cc6f8c11e Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 16:41:42 +0100 Subject: [PATCH 305/912] OP-4643 - updates to documentation Co-authored-by: Toke Jepsen --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 52671d2db6..cc661a21fa 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -46,7 +46,7 @@ The **colorspace name** value is a raw string input and no validation is run aft ::: ### Extract OIIO Transcode -There is profile configurable (see lower) plugin which allows to transcode any incoming representation to one or multiple new representations (configured in `Output Definitions`) with different target colorspaces. +There is profile configurable plugin which allows to transcode any incoming representation to one or multiple new representations (configured in `Output Definitions`) with different target colorspaces. Plugin expects instances with filled dictionary `colorspaceData` on a representation. This data contains information about source colorspace and must be collected for transcoding. `oiiotool` is used for transcoding, eg. `oiiotool` must be present in `vendor/bin/oiio` or environment variable `OPENPYPE_OIIO_PATHS` must be provided for custom oiio installation. From 337e695c17d1d5314ffac99a83330f875053703a Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 16:42:06 +0100 Subject: [PATCH 306/912] OP-4643 - updates to documentation Co-authored-by: Toke Jepsen --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index cc661a21fa..8e557a381c 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -52,7 +52,7 @@ Plugin expects instances with filled dictionary `colorspaceData` on a representa Notable parameters: - **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. -- **`Extension`** - target extension, could be empty - original extension is used +- **`Extension`** - target extension. If left empty, original extension is used. - **`Colorspace`** - target colorspace - must be available in used color config - **`Display & View`** - transcoding into colorspace OR into display and viewer space could be used. (It is disjunctive: Colorspace & nothing in Display and View or opposite) - **`Arguments`** - special additional command line arguments for `oiiotool` From 931d0002ec80b0cabd1bbc0b1d74cbdb06ab2d88 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 16:42:29 +0100 Subject: [PATCH 307/912] OP-4643 - updates to documentation Co-authored-by: Toke Jepsen --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 8e557a381c..166400cb7f 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -53,7 +53,7 @@ Plugin expects instances with filled dictionary `colorspaceData` on a representa Notable parameters: - **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. - **`Extension`** - target extension. If left empty, original extension is used. -- **`Colorspace`** - target colorspace - must be available in used color config +- **`Colorspace`** - target colorspace, which must be available in used color config. - **`Display & View`** - transcoding into colorspace OR into display and viewer space could be used. (It is disjunctive: Colorspace & nothing in Display and View or opposite) - **`Arguments`** - special additional command line arguments for `oiiotool` From 14a8a1449a6e46d82192dece2fb08c8aa807a032 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 16:42:48 +0100 Subject: [PATCH 308/912] OP-4643 - updates to documentation Co-authored-by: Toke Jepsen --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 166400cb7f..908191f122 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -54,7 +54,7 @@ Notable parameters: - **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. - **`Extension`** - target extension. If left empty, original extension is used. - **`Colorspace`** - target colorspace, which must be available in used color config. -- **`Display & View`** - transcoding into colorspace OR into display and viewer space could be used. (It is disjunctive: Colorspace & nothing in Display and View or opposite) +- **`Display & View`** - transcoding into colorspace or into display and viewer space could be used. Cannot use both `Colorspace` and `Display & View` at the same time. - **`Arguments`** - special additional command line arguments for `oiiotool` From cb7b8d423e1591a9d0995dfba9d3cb697c551a57 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 16:43:06 +0100 Subject: [PATCH 309/912] OP-4643 - updates to documentation Co-authored-by: Toke Jepsen --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 908191f122..0a73868d2d 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -55,7 +55,7 @@ Notable parameters: - **`Extension`** - target extension. If left empty, original extension is used. - **`Colorspace`** - target colorspace, which must be available in used color config. - **`Display & View`** - transcoding into colorspace or into display and viewer space could be used. Cannot use both `Colorspace` and `Display & View` at the same time. -- **`Arguments`** - special additional command line arguments for `oiiotool` +- **`Arguments`** - special additional command line arguments for `oiiotool`. Example here describes use case for creation of new color coded review of png image sequence. Original representation's files are kept intact, review is created from transcoded files, but these files are removed in cleanup process. From 748d8989496d6cbd4a5348fb9a78e75617a69cab Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 17:21:20 +0100 Subject: [PATCH 310/912] OP-4643 - updates to documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jakub Ježek --- website/docs/project_settings/settings_project_global.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 0a73868d2d..9e2ee187cc 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -46,8 +46,8 @@ The **colorspace name** value is a raw string input and no validation is run aft ::: ### Extract OIIO Transcode -There is profile configurable plugin which allows to transcode any incoming representation to one or multiple new representations (configured in `Output Definitions`) with different target colorspaces. -Plugin expects instances with filled dictionary `colorspaceData` on a representation. This data contains information about source colorspace and must be collected for transcoding. +OIIOTools transcoder plugin with configurable output presets. Any incoming representation with `colorspaceData` is convertable to single or multiple representations with different target colorspaces or display and viewer names found in linked **config.ocio** file. + `oiiotool` is used for transcoding, eg. `oiiotool` must be present in `vendor/bin/oiio` or environment variable `OPENPYPE_OIIO_PATHS` must be provided for custom oiio installation. Notable parameters: From bd3207f2b6a317e0d77e6eaaa19dc60390f76220 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 21 Feb 2023 17:50:47 +0100 Subject: [PATCH 311/912] Modify artist docstrings to contain Publisher related information and images --- website/docs/artist_hosts_tvpaint.md | 154 ++++++++++------------- website/docs/assets/tvp_create_layer.png | Bin 29058 -> 174149 bytes website/docs/assets/tvp_create_pass.png | Bin 36545 -> 132716 bytes 3 files changed, 68 insertions(+), 86 deletions(-) diff --git a/website/docs/artist_hosts_tvpaint.md b/website/docs/artist_hosts_tvpaint.md index a0ce5d5ff8..baa8c0a09d 100644 --- a/website/docs/artist_hosts_tvpaint.md +++ b/website/docs/artist_hosts_tvpaint.md @@ -43,13 +43,55 @@ You can start your work. ## Usage In TVPaint you can find the Tools in OpenPype menu extension. The OpenPype Tools menu should be available in your work area. However, sometimes it happens that the Tools menu is hidden. You can display the extension panel by going to `Windows -> Plugins -> OpenPype`. +## Create & Publish +As you might already know, to be able to publish, you have to mark what should be published. The marking part is called **Create**. In TVPaint you can create and publish **[Reviews](#review)**, **[Workfile](#workfile)**, **[Render Layers](#render-layer)** and **[Render Passes](#render-pass)**. -## Create -In TVPaint you can create and publish **[Reviews](#review)**, **[Workfile](#workfile)**, **[Render Passes](#render-pass)** and **[Render Layers](#render-layer)**. +:::important +TVPaint integration tries to not guess what you want to publish from the scene. Therefore, you should tell what you want to publish. +::: -You have the possibility to organize your layers by using `Color group`. +![createlayer](assets/tvp_publisher.png) -On the bottom left corner of your timeline, you will note a `Color group` button. +### Review +`Review` will render all visible layers and create a reviewable output. +- Is automatically created without any manual work. +- You can disable the created instance if you want to skip review. + +### Workfile +`Workfile` integrate the source TVPaint file during publishing. Publishing of workfile is useful for backups. +- Is automatically created without any manual work. +- You can disable the created instance if you want to skip review. + +### Render Layer + +
+
+ +Render Layer bakes all the animation layers of one particular color group together. + +- In the **Create** tab, pick `Render Layer` +- Fill `variant`, type in the name that the final published RenderLayer should have according to the naming convention in your studio. *(L10, BG, Hero, etc.)* + - Color group will be renamed to the **variant** value +- Choose color group from combobox + - or select a layer of a particular color and set combobox to **<Use selection>** +- Hit `Create` button + +You have just created Render Layer. Now choose any amount of animation layers that need to be rendered together and assign them the color group. + +You can change `variant` later in **Publish** tab. + +
+
+ +![createlayer](assets/tvp_create_layer.png) + +
+
+
+ +**How to mark TVPaint layer to a group** + +In the bottom left corner of your timeline, you will note a **Color group** button. ![colorgroups](assets/tvp_color_groups.png) @@ -61,63 +103,29 @@ The timeline's animation layer can be marked by the color you pick from your Col ![timeline](assets/tvp_timeline_color.png) -:::important -OpenPype specifically never tries to guess what you want to publish from the scene. Therefore, you have to tell OpenPype what you want to publish. There are three ways how to publish render from the scene. -::: - -When you want to publish `review` or `render layer` or `render pass`, open the `Creator` through the Tools menu `Create` button. - -### Review -`Review` renders the whole file as is and sends the resulting QuickTime to Ftrack. -- Is automatically created during publishing. - -### Workfile -`Workfile` stores the source workfile as is during publishing (e.g. for backup). -- Is automatically created during publishing. - -### Render Layer - -
-
- - -Render Layer bakes all the animation layers of one particular color group together. - -- Choose any amount of animation layers that need to be rendered together and assign them a color group. -- Select any layer of a particular color -- Go to `Creator` and choose `RenderLayer`. -- In the `Subset`, type in the name that the final published RenderLayer should have according to the naming convention in your studio. *(L10, BG, Hero, etc.)* -- Press `Create` -- When you run [publish](#publish), the whole color group will be rendered together and published as a single `RenderLayer` - -
-
- -![createlayer](assets/tvp_create_layer.png) - -
-
- - - - ### Render Pass -Render Passes are smaller individual elements of a Render Layer. A `character` render layer might +Render Passes are smaller individual elements of a [Render Layer](artist_hosts_tvpaint.md#render-layer). A `character` render layer might consist of multiple render passes such as `Line`, `Color` and `Shadow`. +Render Passes are specific because they have to belong to a particular Render Layer. You have to select to which Render Layer the pass belongs. Try to refresh if you don't see demanded Render Layer in the options.
-Render Passes are specific because they have to belong to a particular layer. If you try to create a render pass and did not create any render layers before, an error message will pop up. -When you want to create `RenderPass` -- choose one or several animation layers within one color group that you want to publish -- In the Creator, pick `RenderPass` -- Fill the `Subset` with the name of your pass, e.g. `Color`. +When you want to create Render Pass +- choose one or several TVPaint layers +- In the **Create** tab, pick `Render Pass` +- Fill the `variant` with desired name of pass, e.g. `Color`. +- Select Render Layer to which belongs in Render Layer combobox + - If you don't see new Render Layer try refresh first - Press `Create` +You have just created Render Pass. Selected TVPaint layers should be marked with color group of Render Layer. + +You can change `variant` or Render Layer later in **Publish** tab. +
@@ -126,48 +134,22 @@ When you want to create `RenderPass`
+:::warning +You cannot change TVPaint layer name once you mark it as part of Render Pass. You would have to remove created Render Pass and create it again with new TVPaint layer name. +::: +

In this example, OpenPype will render selected animation layers within the given color group. E.i. the layers *L020_colour_fx*, *L020_colour_mouth*, and *L020_colour_eye* will be rendered as one pass belonging to the yellow RenderLayer. ![renderpass](assets/tvp_timeline_color2.png) - -:::note -You can check your RendrePasses and RenderLayers in [Subset Manager](#subset-manager) or you can start publishing. The publisher will show you a collection of all instances on the left side. -::: - - ---- - -## Publish - -
-
- -Now that you have created the required instances, you can publish them via `Publish` tool. -- Click on `Publish` in OpenPype Tools menu. -- wait until all instances are collected. -- You can check on the left side whether all your instances have been created and are ready for publishing. -- Fill the comment on the bottom of the window. -- Press the `Play` button to publish - -
-
- -![pyblish](assets/tvp_pyblish_render.png) - -
-
- -Once the `Publisher` turns gets green your renders have been published. - ---- - -## Subset Manager -All created instances (render layers, passes, and reviews) will be shown as a simple list. If you don't want to publish some, right click on the item in the list and select `Remove instance`. - -![subsetmanager](assets/tvp_subset_manager.png) +Now that you have created the required instances, you can publish them. +- Fill the comment on the bottom of the window +- Double check enabled instance and their context +- Press `Publish` +- Wait to finish +- Once the `Publisher` turns gets green your renders have been published. --- diff --git a/website/docs/assets/tvp_create_layer.png b/website/docs/assets/tvp_create_layer.png index 9d243da17a099cae576552193711c2898e76f8e9..25081bdf46ace8070b001c9b87dddd6314e26f41 100644 GIT binary patch literal 174149 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 LU9L#R)c1b?NI*?J literal 29058 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

gVQ+e}lCEN997 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 PpcSf0YWMQ*J`MaAgSm76 literal 36545 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 Date: Tue, 21 Feb 2023 17:51:05 +0100 Subject: [PATCH 312/912] update plugin menu --- website/docs/artist_hosts_tvpaint.md | 34 ++++++++++------------ website/docs/assets/tvp_openpype_menu.png | Bin 3565 -> 6704 bytes 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/website/docs/artist_hosts_tvpaint.md b/website/docs/artist_hosts_tvpaint.md index baa8c0a09d..3e1fd6339b 100644 --- a/website/docs/artist_hosts_tvpaint.md +++ b/website/docs/artist_hosts_tvpaint.md @@ -6,37 +6,35 @@ sidebar_label: TVPaint - [Work Files](artist_tools_workfiles) - [Load](artist_tools_loader) -- [Create](artist_tools_creator) -- [Subset Manager](artist_tools_subset_manager) - [Scene Inventory](artist_tools_inventory) - [Publish](artist_tools_publisher) - [Library](artist_tools_library) ## Setup -When you launch TVPaint with OpenPype for the very first time it is necessary to do some additional steps. Right after the TVPaint launching a few system windows will pop up. +When you launch TVPaint with OpenPype for the very first time it is necessary to do some additional steps. Right after the TVPaint launching a few system windows will pop up. ![permission](assets/tvp_permission.png) -Choose `Replace the file in the destination`. Then another window shows up. +Choose `Replace the file in the destination`. Then another window shows up. ![permission2](assets/tvp_permission2.png) Click on `Continue`. -After opening TVPaint go to the menu bar: `Windows → Plugins → OpenPype`. +After opening TVPaint go to the menu bar: `Windows → Plugins → OpenPype`. ![pypewindow](assets/tvp_hidden_window.gif) -Another TVPaint window pop up. Please press `Yes`. This window will be presented in every single TVPaint launching. Unfortunately, there is no other way how to workaround it. +Another TVPaint window pop up. Please press `Yes`. This window will be presented in every single TVPaint launching. Unfortunately, there is no other way how to workaround it. ![writefile](assets/tvp_write_file.png) -Now OpenPype Tools menu is in your TVPaint work area. +Now OpenPype Tools menu is in your TVPaint work area. ![openpypetools](assets/tvp_openpype_menu.png) -You can start your work. +You can start your work. --- @@ -67,7 +65,7 @@ TVPaint integration tries to not guess what you want to publish from the scene.
-Render Layer bakes all the animation layers of one particular color group together. +Render Layer bakes all the animation layers of one particular color group together. - In the **Create** tab, pick `Render Layer` - Fill `variant`, type in the name that the final published RenderLayer should have according to the naming convention in your studio. *(L10, BG, Hero, etc.)* @@ -95,11 +93,11 @@ In the bottom left corner of your timeline, you will note a **Color group** butt ![colorgroups](assets/tvp_color_groups.png) -It allows you to choose a group by checking one of the colors of the color list. +It allows you to choose a group by checking one of the colors of the color list. ![colorgroups](assets/tvp_color_groups2.png) -The timeline's animation layer can be marked by the color you pick from your Color group. Layers in the timeline with the same color are gathered into a group represents one render layer. +The timeline's animation layer can be marked by the color you pick from your Color group. Layers in the timeline with the same color are gathered into a group represents one render layer. ![timeline](assets/tvp_timeline_color.png) @@ -135,25 +133,25 @@ You can change `variant` or Render Layer later in **Publish** tab.
:::warning -You cannot change TVPaint layer name once you mark it as part of Render Pass. You would have to remove created Render Pass and create it again with new TVPaint layer name. +You cannot change TVPaint layer name once you mark it as part of Render Pass. You would have to remove created Render Pass and create it again with new TVPaint layer name. :::

-In this example, OpenPype will render selected animation layers within the given color group. E.i. the layers *L020_colour_fx*, *L020_colour_mouth*, and *L020_colour_eye* will be rendered as one pass belonging to the yellow RenderLayer. +In this example, OpenPype will render selected animation layers within the given color group. E.i. the layers *L020_colour_fx*, *L020_colour_mouth*, and *L020_colour_eye* will be rendered as one pass belonging to the yellow RenderLayer. ![renderpass](assets/tvp_timeline_color2.png) -Now that you have created the required instances, you can publish them. +Now that you have created the required instances, you can publish them. - Fill the comment on the bottom of the window -- Double check enabled instance and their context +- Double check enabled instance and their context - Press `Publish` - Wait to finish -- Once the `Publisher` turns gets green your renders have been published. +- Once the `Publisher` turns gets green your renders have been published. --- -## Load +## Load When you want to load existing published work you can reach the `Loader` through the OpenPype Tools `Load` button. The supported families for TVPaint are: @@ -174,4 +172,4 @@ Scene Inventory shows you everything that you have loaded into your scene using ![sceneinventory](assets/tvp_scene_inventory.png) -You can switch to a previous version of the file or update it to the latest or delete items. +You can switch to a previous version of the file or update it to the latest or delete items. diff --git a/website/docs/assets/tvp_openpype_menu.png b/website/docs/assets/tvp_openpype_menu.png index cb5c2d4aac02c9187d38420947c3dad25cc1eaa6..23eaf33fc3d2ba30452454eb2ffb4abf1f5337c8 100644 GIT binary patch literal 6704 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 literal 3565 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ΜdRthcI%Jgf}%x5NHEtv;k^Aby4zi}pSE zX^T;r#Y2J95#iRF!a|{Gi<^5X`mWgR4~Xv9V(e<|#ci0WrFz5hL4W@qES1gxO8zF{ zR!Zdct|L(e|BwqC+{%UXbKUhOO{)_hHsY$PE3VnF+G#UIXUO;Spkz{rRLBEghCl$130pcakJZ>XE!$F)^q{0R9-;U2E#vhNCUdul1XsSl7G- zZ^`XZa{qeD!CRPiYn;Auh{bjs&S9Hd$y8akoNClwn^2ghvzl5vl#S-o ze2-v>;jA$x^wjdBfY5A4HT@J5dDKKd7o9=0#o>rD?jLg}t`#Q_uU@#Ppm!7h5n{9T zVw%OzZ;vRmw<~RQGFm%3XF8g=`&T+Fr(FCsapB@vhEG7*YqG6I#@5m8t#ifpmPtaBVF5&;DghigBLQ{#sk#MC+Vq84C6?)Ws>|KD5=cpqH z%x87A#w0NuoFhL+6hb~#89p6AyEGwok8)&A(Gn9RC6n@?fL^^GpcISOG3%%`fx5%B zdBJknoTdz+xN-+x6)+&|x#+jt1ObkEC#5BUA6o zm>xS9lu-#4(K3UL{gR5pT za^^bfj_7GcrQ)lf5va|t@~s*!^+a#nO=C=|-p5wURu0UhLxi(GCJ+Hj3(l@%HPsK~ y997S?#{lekeon!^F!dMW+Tem`8+CxYLZ^#+FOju}V_3gv08=9~!%~AQ(f Date: Tue, 21 Feb 2023 17:56:21 +0100 Subject: [PATCH 313/912] Revert "OP-4643 - split command line arguments to separate items" This reverts commit deaad39437501f18fc3ba4be8b1fc5f0ee3be65d. --- openpype/lib/transcoding.py | 29 +--------------------- openpype/plugins/publish/extract_review.py | 27 +++++++++++++++++--- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index a87300c280..95042fb74c 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1092,7 +1092,7 @@ def convert_colorspace( raise ValueError("Both screen and display must be set.") if additional_command_args: - oiio_cmd.extend(split_cmd_args(additional_command_args)) + oiio_cmd.extend(additional_command_args) if target_colorspace: oiio_cmd.extend(["--colorconvert", @@ -1106,30 +1106,3 @@ def convert_colorspace( logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) - - -def split_cmd_args(in_args): - """Makes sure all entered arguments are separated in individual items. - - Split each argument string with " -" to identify if string contains - one or more arguments. - Args: - in_args (list): of arguments ['-n', '-d uint10'] - Returns - (list): ['-n', '-d', 'unint10'] - """ - splitted_args = [] - for arg in in_args: - sub_args = arg.split(" -") - if len(sub_args) == 1: - if arg and arg not in splitted_args: - splitted_args.append(arg) - continue - - for idx, arg in enumerate(sub_args): - if idx != 0: - arg = "-" + arg - - if arg and arg not in splitted_args: - splitted_args.append(arg) - return splitted_args diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py index e80141fc4a..0f6dacba18 100644 --- a/openpype/plugins/publish/extract_review.py +++ b/openpype/plugins/publish/extract_review.py @@ -22,7 +22,6 @@ from openpype.lib.transcoding import ( should_convert_for_ffmpeg, convert_input_paths_for_ffmpeg, get_transcode_temp_directory, - split_cmd_args ) @@ -671,7 +670,7 @@ class ExtractReview(pyblish.api.InstancePlugin): res_filters = self.rescaling_filters(temp_data, output_def, new_repre) ffmpeg_video_filters.extend(res_filters) - ffmpeg_input_args = split_cmd_args(ffmpeg_input_args) + ffmpeg_input_args = self.split_ffmpeg_args(ffmpeg_input_args) lut_filters = self.lut_filters(new_repre, instance, ffmpeg_input_args) ffmpeg_video_filters.extend(lut_filters) @@ -724,6 +723,28 @@ class ExtractReview(pyblish.api.InstancePlugin): ffmpeg_output_args ) + def split_ffmpeg_args(self, in_args): + """Makes sure all entered arguments are separated in individual items. + + Split each argument string with " -" to identify if string contains + one or more arguments. + """ + splitted_args = [] + for arg in in_args: + sub_args = arg.split(" -") + if len(sub_args) == 1: + if arg and arg not in splitted_args: + splitted_args.append(arg) + continue + + for idx, arg in enumerate(sub_args): + if idx != 0: + arg = "-" + arg + + if arg and arg not in splitted_args: + splitted_args.append(arg) + return splitted_args + def ffmpeg_full_args( self, input_args, video_filters, audio_filters, output_args ): @@ -743,7 +764,7 @@ class ExtractReview(pyblish.api.InstancePlugin): Returns: list: Containing all arguments ready to run in subprocess. """ - output_args = split_cmd_args(output_args) + output_args = self.split_ffmpeg_args(output_args) video_args_dentifiers = ["-vf", "-filter:v"] audio_args_dentifiers = ["-af", "-filter:a"] From 7e15a91217d4d74d2cddfe6d219742d5146ba52d Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 18:02:17 +0100 Subject: [PATCH 314/912] OP-4643 - different splitting for oiio It seems that logic in ExtractReview does different thing. --- openpype/lib/transcoding.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 95042fb74c..8a80e88d3a 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1092,7 +1092,7 @@ def convert_colorspace( raise ValueError("Both screen and display must be set.") if additional_command_args: - oiio_cmd.extend(additional_command_args) + oiio_cmd.extend(split_cmd_args(additional_command_args)) if target_colorspace: oiio_cmd.extend(["--colorconvert", @@ -1106,3 +1106,21 @@ def convert_colorspace( logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) + + +def split_cmd_args(in_args): + """Makes sure all entered arguments are separated in individual items. + + Split each argument string with " -" to identify if string contains + one or more arguments. + Args: + in_args (list): of arguments ['-n', '-d uint10'] + Returns + (list): ['-n', '-d', 'unint10'] + """ + splitted_args = [] + for arg in in_args: + if not arg.strip(): + continue + splitted_args.extend(arg.split(" ")) + return splitted_args From 0871625951f2054392ba74cbe6ba5ea47b36d44b Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 18:14:57 +0100 Subject: [PATCH 315/912] OP-4643 - allow colorspace to be empty and collected from DCC --- openpype/plugins/publish/extract_color_transcode.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 456e40008d..82b92ec93e 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -118,7 +118,8 @@ class ExtractOIIOTranscode(publish.Extractor): output_name, output_extension) - target_colorspace = output_def["colorspace"] + target_colorspace = (output_def["colorspace"] or + colorspace_data.get("colorspace")) view = output_def["view"] or colorspace_data.get("view") display = (output_def["display"] or colorspace_data.get("display")) From d9f9ec45a86dec05c2b5f602951c805ef2186c61 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 21 Feb 2023 18:29:37 +0100 Subject: [PATCH 316/912] add missing image --- website/docs/assets/tvp_publisher.png | Bin 0 -> 200677 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 website/docs/assets/tvp_publisher.png diff --git a/website/docs/assets/tvp_publisher.png b/website/docs/assets/tvp_publisher.png new file mode 100644 index 0000000000000000000000000000000000000000..e5b1f936dfec1ec4f35fce41a419e53a72c6468e GIT binary patch literal 200677 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

;r>#l_M$0;nH4viktX?A?B}GQ;WQaE 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�d92;(`4A*w~J*L5*xpBb*ZM1C~{kGgc3F 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 literal 0 HcmV?d00001 From c3d02ca051cbbec4bb9d81f5d68bacb66ee8fbf9 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 21 Feb 2023 18:32:09 +0100 Subject: [PATCH 317/912] Apply suggestions from code review Co-authored-by: Toke Jepsen --- website/docs/artist_hosts_tvpaint.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/website/docs/artist_hosts_tvpaint.md b/website/docs/artist_hosts_tvpaint.md index 3e1fd6339b..a8a6cee5f8 100644 --- a/website/docs/artist_hosts_tvpaint.md +++ b/website/docs/artist_hosts_tvpaint.md @@ -42,7 +42,7 @@ You can start your work. In TVPaint you can find the Tools in OpenPype menu extension. The OpenPype Tools menu should be available in your work area. However, sometimes it happens that the Tools menu is hidden. You can display the extension panel by going to `Windows -> Plugins -> OpenPype`. ## Create & Publish -As you might already know, to be able to publish, you have to mark what should be published. The marking part is called **Create**. In TVPaint you can create and publish **[Reviews](#review)**, **[Workfile](#workfile)**, **[Render Layers](#render-layer)** and **[Render Passes](#render-pass)**. +To be able to publish, you have to mark what should be published. The marking part is called **Create**. In TVPaint you can create and publish **[Reviews](#review)**, **[Workfile](#workfile)**, **[Render Layers](#render-layer)** and **[Render Passes](#render-pass)**. :::important TVPaint integration tries to not guess what you want to publish from the scene. Therefore, you should tell what you want to publish. @@ -74,7 +74,7 @@ Render Layer bakes all the animation layers of one particular color group togeth - or select a layer of a particular color and set combobox to **<Use selection>** - Hit `Create` button -You have just created Render Layer. Now choose any amount of animation layers that need to be rendered together and assign them the color group. +After creating a RenderLayer, choose any amount of animation layers that need to be rendered together and assign them the color group. You can change `variant` later in **Publish** tab. @@ -107,20 +107,20 @@ The timeline's animation layer can be marked by the color you pick from your Col Render Passes are smaller individual elements of a [Render Layer](artist_hosts_tvpaint.md#render-layer). A `character` render layer might consist of multiple render passes such as `Line`, `Color` and `Shadow`. -Render Passes are specific because they have to belong to a particular Render Layer. You have to select to which Render Layer the pass belongs. Try to refresh if you don't see demanded Render Layer in the options. +Render Passes are specific because they have to belong to a particular Render Layer. You have to select to which Render Layer the pass belongs. Try to refresh if you don't see a specific Render Layer in the options.

When you want to create Render Pass -- choose one or several TVPaint layers -- In the **Create** tab, pick `Render Pass` -- Fill the `variant` with desired name of pass, e.g. `Color`. -- Select Render Layer to which belongs in Render Layer combobox - - If you don't see new Render Layer try refresh first +- choose one or several TVPaint layers. +- in the **Create** tab, pick `Render Pass`. +- fill the `variant` with desired name of pass, e.g. `Color`. +- select the Render Layer you want the Render Pass to belong to from the combobox. + - if you don't see new Render Layer try refresh first. - Press `Create` -You have just created Render Pass. Selected TVPaint layers should be marked with color group of Render Layer. +After creating a Render Pass, selected the TVPaint layers that should be marked with color group of Render Layer. You can change `variant` or Render Layer later in **Publish** tab. @@ -143,11 +143,11 @@ In this example, OpenPype will render selected animation layers within the given ![renderpass](assets/tvp_timeline_color2.png) Now that you have created the required instances, you can publish them. -- Fill the comment on the bottom of the window -- Double check enabled instance and their context -- Press `Publish` -- Wait to finish -- Once the `Publisher` turns gets green your renders have been published. +- Fill the comment on the bottom of the window. +- Double check enabled instance and their context. +- Press `Publish`. +- Wait to finish. +- Once the `Publisher` turns turns green your renders have been published. --- From d08c979a2145ea46d66c52408913081d3f4486e6 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Mon, 20 Feb 2023 08:07:38 +0000 Subject: [PATCH 318/912] Fix setting scene fps with float input --- openpype/hosts/maya/api/lib.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index 84c6e6929d..509168278c 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -1997,7 +1997,7 @@ def set_scene_fps(fps, update=True): '48000': '48000fps' } - unit = fps_mapping.get(str(fps), None) + unit = fps_mapping.get(str(convert_to_maya_fps(fps)), None) if unit is None: raise ValueError("Unsupported FPS value: `%s`" % fps) @@ -3454,11 +3454,11 @@ def convert_to_maya_fps(fps): # If input fps is a whole number we'll return. if float(fps).is_integer(): # Validate fps is part of Maya's fps selection. - if fps not in int_framerates: + if int(fps) not in int_framerates: raise ValueError( "Framerate \"{}\" is not supported in Maya".format(fps) ) - return fps + return int(fps) else: # Differences to supported float frame rates. differences = [] From 17c666d2f398406afacc6e8b5b1d8c12039e5bed Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Mon, 20 Feb 2023 11:47:47 +0000 Subject: [PATCH 319/912] Code cosmetics. --- openpype/hosts/maya/plugins/publish/validate_maya_units.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/publish/validate_maya_units.py b/openpype/hosts/maya/plugins/publish/validate_maya_units.py index ad256b6a72..357dde692c 100644 --- a/openpype/hosts/maya/plugins/publish/validate_maya_units.py +++ b/openpype/hosts/maya/plugins/publish/validate_maya_units.py @@ -4,7 +4,6 @@ import pyblish.api import openpype.hosts.maya.api.lib as mayalib from openpype.pipeline.context_tools import get_current_project_asset -from math import ceil from openpype.pipeline.publish import ( RepairContextAction, ValidateSceneOrder, From 540a4977014914f4c453031522519d16d7342f34 Mon Sep 17 00:00:00 2001 From: Ynbot Date: Wed, 22 Feb 2023 03:28:50 +0000 Subject: [PATCH 320/912] [Automated] Bump version --- openpype/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/version.py b/openpype/version.py index 72d6b64c60..bb5171764c 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.15.1" +__version__ = "3.15.2-nightly.1" From 8f7b6c6a0e9f8b708e618fb5fec9277305786859 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 22 Feb 2023 06:58:20 +0000 Subject: [PATCH 321/912] Hound. --- openpype/modules/deadline/plugins/publish/submit_publish_job.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 425c236b7f..c651782392 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -962,7 +962,6 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): "s" if len(instances) > 1 else "")) else: - #Need to inject colorspace here. representations = self._get_representations( instance_skeleton_data, data.get("expectedFiles") From 03d01430e60f5d4ec37c1d5e1e8df2868b7f6b1e Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Wed, 22 Feb 2023 10:27:31 +0100 Subject: [PATCH 322/912] :rotating_light: few style fixes --- openpype/hosts/max/api/lib.py | 8 ++++---- openpype/hosts/max/api/lib_rendersettings.py | 2 +- openpype/hosts/max/plugins/publish/collect_render.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openpype/hosts/max/api/lib.py b/openpype/hosts/max/api/lib.py index 3383330792..4fb750d91b 100644 --- a/openpype/hosts/max/api/lib.py +++ b/openpype/hosts/max/api/lib.py @@ -133,7 +133,7 @@ def get_default_render_folder(project_setting=None): ["default_render_image_folder"]) -def set_framerange(startFrame, endFrame): +def set_framerange(start_frame, end_frame): """ Note: Frame range can be specified in different types. Possible values are: @@ -146,9 +146,9 @@ def set_framerange(startFrame, endFrame): Current type is hard-coded, there should be a custom setting for this. """ rt.rendTimeType = 4 - if startFrame is not None and endFrame is not None: - frameRange = "{0}-{1}".format(startFrame, endFrame) - rt.rendPickupFrames = frameRange + if start_frame is not None and end_frame is not None: + frame_range = "{0}-{1}".format(start_frame, end_frame) + rt.rendPickupFrames = frame_range def get_multipass_setting(project_setting=None): diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py index b07d19f176..4940265a23 100644 --- a/openpype/hosts/max/api/lib_rendersettings.py +++ b/openpype/hosts/max/api/lib_rendersettings.py @@ -62,7 +62,7 @@ class RenderSettings(object): # hard-coded, should be customized in the setting context = get_current_project_asset() - # get project reoslution + # get project resolution width = context["data"].get("resolutionWidth") height = context["data"].get("resolutionHeight") # Set Frame Range diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py index 7656c641ed..7c9e311c2f 100644 --- a/openpype/hosts/max/plugins/publish/collect_render.py +++ b/openpype/hosts/max/plugins/publish/collect_render.py @@ -31,7 +31,7 @@ class CollectRender(pyblish.api.InstancePlugin): render_layer_files = RenderProducts().render_product(instance.name) folder = folder.replace("\\", "/") - imgFormat = RenderProducts().image_format() + img_format = RenderProducts().image_format() project_name = context.data["projectName"] asset_doc = context.data["assetEntity"] asset_id = asset_doc["_id"] @@ -53,7 +53,7 @@ class CollectRender(pyblish.api.InstancePlugin): "asset": asset, "publish": True, "maxversion": str(get_max_version()), - "imageFormat": imgFormat, + "imageFormat": img_format, "family": 'maxrender', "families": ['maxrender'], "source": filepath, From 3b432690ace63aa1d69baff80de3ff3d86c9c8c8 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 11:00:20 +0100 Subject: [PATCH 323/912] removed settings for plugin 'CollectRenderScene' The plugin is not available anymore --- .../defaults/project_settings/tvpaint.json | 4 ---- .../schema_project_tvpaint.json | 24 ------------------- 2 files changed, 28 deletions(-) diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json index 74a5af403c..340181b3a4 100644 --- a/openpype/settings/defaults/project_settings/tvpaint.json +++ b/openpype/settings/defaults/project_settings/tvpaint.json @@ -43,10 +43,6 @@ } }, "publish": { - "CollectRenderScene": { - "enabled": false, - "render_layer": "Main" - }, "ExtractSequence": { "review_bg": [ 255, diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json index d09c666d50..55e60357e5 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json @@ -204,30 +204,6 @@ "key": "publish", "label": "Publish plugins", "children": [ - { - "type": "dict", - "collapsible": true, - "key": "CollectRenderScene", - "label": "Collect Render Scene", - "is_group": true, - "checkbox_key": "enabled", - "children": [ - { - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "label", - "label": "It is possible to fill 'render_layer' or 'variant' in subset name template with custom value.
- value of 'render_pass' is always \"beauty\"." - }, - { - "type": "text", - "key": "render_layer", - "label": "Render Layer" - } - ] - }, { "type": "dict", "collapsible": true, From 7692ff252f21af427062e1edef1852589e904d6f Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Tue, 31 Jan 2023 16:56:01 +0100 Subject: [PATCH 324/912] use .get() to not throw error handle_start/end is optional and keys isn't created on Kitsu sync if data doesn't exists on Kitsus side --- openpype/hosts/fusion/api/lib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/api/lib.py b/openpype/hosts/fusion/api/lib.py index a33e5cf289..088f597208 100644 --- a/openpype/hosts/fusion/api/lib.py +++ b/openpype/hosts/fusion/api/lib.py @@ -68,8 +68,8 @@ def set_asset_framerange(): asset_doc = get_current_project_asset() start = asset_doc["data"]["frameStart"] end = asset_doc["data"]["frameEnd"] - handle_start = asset_doc["data"]["handleStart"] - handle_end = asset_doc["data"]["handleEnd"] + handle_start = asset_doc["data"].get("handleStart") + handle_end = asset_doc["data"].get("handleEnd") update_frame_range(start, end, set_render_range=True, handle_start=handle_start, handle_end=handle_end) From 9eadff95ed3dcfcb214b22c1e77a3ec15d4fa82f Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Wed, 1 Feb 2023 19:41:00 +0100 Subject: [PATCH 325/912] Generate the file list using metadata instead of files in render folder This solves the problem with the preview file generated from a previous render is still in the render folder --- .../fusion/plugins/publish/render_local.py | 62 +++++++++++-------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index 79e458b40a..d1d32fbf91 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -1,5 +1,5 @@ import os -from pprint import pformat +import copy import pyblish.api from openpype.hosts.fusion.api import comp_lock_and_undo_chunk @@ -19,10 +19,43 @@ class Fusionlocal(pyblish.api.InstancePlugin): families = ["render.local"] def process(self, instance): - + # This plug-in runs only once and thus assumes all instances # currently will render the same frame range context = instance.context + self.render_once(context) + + frame_start = context.data["frameStartHandle"] + frame_end = context.data["frameEndHandle"] + path = instance.data["path"] + output_dir = instance.data["outputDir"] + + basename = os.path.basename(path) + head, ext = os.path.splitext(basename) + files = [ + f"{head}{frame}{ext}" for frame in range(frame_start, frame_end+1) + ] + repre = { + 'name': ext[1:], + 'ext': ext[1:], + 'frameStart': "%0{}d".format(len(str(frame_end))) % frame_start, + 'files': files, + "stagingDir": output_dir, + } + + if "representations" not in instance.data: + instance.data["representations"] = [] + instance.data["representations"].append(repre) + + # review representation + repre_preview = repre.copy() + repre_preview["name"] = repre_preview["ext"] = "mp4" + repre_preview["tags"] = ["review", "preview", "ftrackreview", "delete"] + instance.data["representations"].append(repre_preview) + + def render_once(self, context): + """Render context comp only once, even with more render instances""" + key = "__hasRun{}".format(self.__class__.__name__) if context.data.get(key, False): return @@ -32,10 +65,6 @@ class Fusionlocal(pyblish.api.InstancePlugin): current_comp = context.data["currentComp"] frame_start = context.data["frameStartHandle"] frame_end = context.data["frameEndHandle"] - path = instance.data["path"] - output_dir = instance.data["outputDir"] - - ext = os.path.splitext(os.path.basename(path))[-1] self.log.info("Starting render") self.log.info("Start frame: {}".format(frame_start)) @@ -48,26 +77,5 @@ class Fusionlocal(pyblish.api.InstancePlugin): "Wait": True }) - if "representations" not in instance.data: - instance.data["representations"] = [] - - collected_frames = os.listdir(output_dir) - repre = { - 'name': ext[1:], - 'ext': ext[1:], - 'frameStart': "%0{}d".format(len(str(frame_end))) % frame_start, - 'files': collected_frames, - "stagingDir": output_dir, - } - instance.data["representations"].append(repre) - - # review representation - repre_preview = repre.copy() - repre_preview["name"] = repre_preview["ext"] = "mp4" - repre_preview["tags"] = ["review", "preview", "ftrackreview", "delete"] - instance.data["representations"].append(repre_preview) - - self.log.debug(f"_ instance.data: {pformat(instance.data)}") - if not result: raise RuntimeError("Comp render failed") From 723778c3ad92b4a2609996b4c0d6d357335c3830 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 2 Feb 2023 11:46:03 +0100 Subject: [PATCH 326/912] zfill 4 for frame value Fusion defaults with 4 numbers for the frame number so if shot doesn't start at 1000 we should zfill to match. --- openpype/hosts/fusion/plugins/publish/render_local.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index d1d32fbf91..5a0b068e8c 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -33,7 +33,7 @@ class Fusionlocal(pyblish.api.InstancePlugin): basename = os.path.basename(path) head, ext = os.path.splitext(basename) files = [ - f"{head}{frame}{ext}" for frame in range(frame_start, frame_end+1) + f"{head}{str(frame).zfill(4)}{ext}" for frame in range(frame_start, frame_end+1) ] repre = { 'name': ext[1:], From 4ad830ffdb9b48ff3455f8c11fd7a681d603c7cf Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 3 Feb 2023 00:21:37 +0100 Subject: [PATCH 327/912] Fixed hound-bots comments --- .../fusion/plugins/publish/render_local.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index 5a0b068e8c..b02fa55d20 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -1,6 +1,4 @@ import os -import copy - import pyblish.api from openpype.hosts.fusion.api import comp_lock_and_undo_chunk @@ -19,7 +17,7 @@ class Fusionlocal(pyblish.api.InstancePlugin): families = ["render.local"] def process(self, instance): - + # This plug-in runs only once and thus assumes all instances # currently will render the same frame range context = instance.context @@ -33,12 +31,12 @@ class Fusionlocal(pyblish.api.InstancePlugin): basename = os.path.basename(path) head, ext = os.path.splitext(basename) files = [ - f"{head}{str(frame).zfill(4)}{ext}" for frame in range(frame_start, frame_end+1) + f"{head}{str(frame).zfill(4)}{ext}" for frame in range(frame_start, frame_end + 1) ] repre = { 'name': ext[1:], 'ext': ext[1:], - 'frameStart': "%0{}d".format(len(str(frame_end))) % frame_start, + 'frameStart': f"%0{len(str(frame_end))}d" % frame_start, 'files': files, "stagingDir": output_dir, } @@ -56,19 +54,19 @@ class Fusionlocal(pyblish.api.InstancePlugin): def render_once(self, context): """Render context comp only once, even with more render instances""" - key = "__hasRun{}".format(self.__class__.__name__) + key = f'__hasRun{self.__class__.__name__}' if context.data.get(key, False): return - else: - context.data[key] = True + + context.data[key] = True current_comp = context.data["currentComp"] frame_start = context.data["frameStartHandle"] frame_end = context.data["frameEndHandle"] self.log.info("Starting render") - self.log.info("Start frame: {}".format(frame_start)) - self.log.info("End frame: {}".format(frame_end)) + self.log.info(f"Start frame: {frame_start}") + self.log.info(f"End frame: {frame_end}") with comp_lock_and_undo_chunk(current_comp): result = current_comp.Render({ From f7175511f044745f88acb9c927a6f7ea51da705f Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 3 Feb 2023 12:11:04 +0100 Subject: [PATCH 328/912] Move hasRun check back to process function --- .../hosts/fusion/plugins/publish/render_local.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index b02fa55d20..b49c11e366 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -21,6 +21,12 @@ class Fusionlocal(pyblish.api.InstancePlugin): # This plug-in runs only once and thus assumes all instances # currently will render the same frame range context = instance.context + key = f"__hasRun{self.__class__.__name__}" + if context.data.get(key, False): + return + + context.data[key] = True + self.render_once(context) frame_start = context.data["frameStartHandle"] @@ -54,12 +60,6 @@ class Fusionlocal(pyblish.api.InstancePlugin): def render_once(self, context): """Render context comp only once, even with more render instances""" - key = f'__hasRun{self.__class__.__name__}' - if context.data.get(key, False): - return - - context.data[key] = True - current_comp = context.data["currentComp"] frame_start = context.data["frameStartHandle"] frame_end = context.data["frameEndHandle"] From fa526b3e4b2fe40a24dc7f34492c5864b818d9a3 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 3 Feb 2023 12:14:45 +0100 Subject: [PATCH 329/912] Made line 40 shorter --- openpype/hosts/fusion/plugins/publish/render_local.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index b49c11e366..6f8cd66bd6 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -37,7 +37,8 @@ class Fusionlocal(pyblish.api.InstancePlugin): basename = os.path.basename(path) head, ext = os.path.splitext(basename) files = [ - f"{head}{str(frame).zfill(4)}{ext}" for frame in range(frame_start, frame_end + 1) + f"{head}{str(frame).zfill(4)}{ext}" + for frame in range(frame_start, frame_end + 1) ] repre = { 'name': ext[1:], From eb3dd357e3a5406bae2f6ddb856412d44a78a815 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 10 Feb 2023 14:11:15 +0100 Subject: [PATCH 330/912] Changed LaunchFailed message from PYTHON36 to PYTHON PATH --- openpype/hosts/fusion/hooks/pre_fusion_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index d043d54322..323b8b0029 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -36,7 +36,7 @@ class FusionPrelaunch(PreLaunchHook): "Make sure the environment in fusion settings has " "'FUSION_PYTHON3_HOME' set correctly and make sure " "Python 3 is installed in the given path." - f"\n\nPYTHON36: {fusion_python3_home}" + f"\n\nPYTHON PATH: {fusion_python3_home}" ) self.log.info(f"Setting {py3_var}: '{py3_dir}'...") From 6482481cf55089420b479f16ab4fa579ec76676e Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 10 Feb 2023 14:13:59 +0100 Subject: [PATCH 331/912] handleStart/End is now required --- openpype/hosts/fusion/api/lib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/api/lib.py b/openpype/hosts/fusion/api/lib.py index 088f597208..a33e5cf289 100644 --- a/openpype/hosts/fusion/api/lib.py +++ b/openpype/hosts/fusion/api/lib.py @@ -68,8 +68,8 @@ def set_asset_framerange(): asset_doc = get_current_project_asset() start = asset_doc["data"]["frameStart"] end = asset_doc["data"]["frameEnd"] - handle_start = asset_doc["data"].get("handleStart") - handle_end = asset_doc["data"].get("handleEnd") + handle_start = asset_doc["data"]["handleStart"] + handle_end = asset_doc["data"]["handleEnd"] update_frame_range(start, end, set_render_range=True, handle_start=handle_start, handle_end=handle_end) From a9e1140ec9a5c4c0f347e4a8e5afa7da4a89f781 Mon Sep 17 00:00:00 2001 From: Ember Light <49758407+EmberLightVFX@users.noreply.github.com> Date: Fri, 10 Feb 2023 14:14:30 +0100 Subject: [PATCH 332/912] Update openpype/hosts/fusion/plugins/publish/render_local.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jakub Ježek --- openpype/hosts/fusion/plugins/publish/render_local.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index 6f8cd66bd6..9bd867a55a 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -55,7 +55,7 @@ class Fusionlocal(pyblish.api.InstancePlugin): # review representation repre_preview = repre.copy() repre_preview["name"] = repre_preview["ext"] = "mp4" - repre_preview["tags"] = ["review", "preview", "ftrackreview", "delete"] + repre_preview["tags"] = ["review", "ftrackreview", "delete"] instance.data["representations"].append(repre_preview) def render_once(self, context): From aa1dd161a5c9add531d53733b77b8cbc5f651e48 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 10 Feb 2023 14:17:59 +0100 Subject: [PATCH 333/912] Removed double space after "," in repre_preview["tags"] --- openpype/hosts/fusion/plugins/publish/render_local.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index 9bd867a55a..53d8eb64e1 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -55,7 +55,7 @@ class Fusionlocal(pyblish.api.InstancePlugin): # review representation repre_preview = repre.copy() repre_preview["name"] = repre_preview["ext"] = "mp4" - repre_preview["tags"] = ["review", "ftrackreview", "delete"] + repre_preview["tags"] = ["review", "ftrackreview", "delete"] instance.data["representations"].append(repre_preview) def render_once(self, context): From 0124bba40cd55c30517e9a89fc89405dc86c6081 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 16 Feb 2023 13:24:50 +0100 Subject: [PATCH 334/912] get_representation_parents() missed project_name --- openpype/hosts/fusion/api/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/api/lib.py b/openpype/hosts/fusion/api/lib.py index a33e5cf289..ac04efa6a0 100644 --- a/openpype/hosts/fusion/api/lib.py +++ b/openpype/hosts/fusion/api/lib.py @@ -210,7 +210,7 @@ def switch_item(container, if any(not x for x in [asset_name, subset_name, representation_name]): repre_id = container["representation"] representation = get_representation_by_id(project_name, repre_id) - repre_parent_docs = get_representation_parents(representation) + repre_parent_docs = get_representation_parents(project_name, representation) if repre_parent_docs: version, subset, asset, _ = repre_parent_docs else: From 7e4457b241347b39fb1606751ba723e1be774632 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 16 Feb 2023 13:25:57 +0100 Subject: [PATCH 335/912] Fixed hound's max-length note --- openpype/hosts/fusion/api/lib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/api/lib.py b/openpype/hosts/fusion/api/lib.py index ac04efa6a0..88a3f0b49b 100644 --- a/openpype/hosts/fusion/api/lib.py +++ b/openpype/hosts/fusion/api/lib.py @@ -210,7 +210,8 @@ def switch_item(container, if any(not x for x in [asset_name, subset_name, representation_name]): repre_id = container["representation"] representation = get_representation_by_id(project_name, repre_id) - repre_parent_docs = get_representation_parents(project_name, representation) + repre_parent_docs = get_representation_parents( + project_name, representation) if repre_parent_docs: version, subset, asset, _ = repre_parent_docs else: From 44672f3f827517575119d541a1d3c76a3c7fcc2b Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 16 Feb 2023 17:29:18 +0100 Subject: [PATCH 336/912] add task to instance --- openpype/hosts/fusion/plugins/publish/collect_instances.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/fusion/plugins/publish/collect_instances.py b/openpype/hosts/fusion/plugins/publish/collect_instances.py index fe60b83827..7b0a1b6369 100644 --- a/openpype/hosts/fusion/plugins/publish/collect_instances.py +++ b/openpype/hosts/fusion/plugins/publish/collect_instances.py @@ -80,6 +80,7 @@ class CollectInstances(pyblish.api.ContextPlugin): "outputDir": os.path.dirname(path), "ext": ext, # todo: should be redundant "label": label, + "task": context.data["task"], "frameStart": context.data["frameStart"], "frameEnd": context.data["frameEnd"], "frameStartHandle": context.data["frameStartHandle"], From c26f86f08c8517c081e35292973b0713f2346e15 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 10 Feb 2023 17:12:19 +0100 Subject: [PATCH 337/912] Nuke: adding solution for originalBasename frame temlate formating https://github.com/ynput/OpenPype/pull/4452#issuecomment-1426020567 --- openpype/hosts/nuke/plugins/load/load_clip.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/nuke/plugins/load/load_clip.py b/openpype/hosts/nuke/plugins/load/load_clip.py index 565d777811..f9364172ea 100644 --- a/openpype/hosts/nuke/plugins/load/load_clip.py +++ b/openpype/hosts/nuke/plugins/load/load_clip.py @@ -220,8 +220,21 @@ class LoadClip(plugin.NukeLoader): dict: altered representation data """ representation = deepcopy(representation) - frame = representation["context"]["frame"] - representation["context"]["frame"] = "#" * len(str(frame)) + context = representation["context"] + template = representation["data"]["template"] + frame = context["frame"] + hashed_frame = "#" * len(str(frame)) + + if ( + "{originalBasename}" in template + and "frame" in context + ): + origin_basename = context["originalBasename"] + context["originalBasename"] = origin_basename.replace( + frame, hashed_frame + ) + + representation["context"]["frame"] = hashed_frame return representation def update(self, container, representation): From ebb477e068b19289963aab53a99a2da503d5f52b Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 10 Feb 2023 17:51:29 +0100 Subject: [PATCH 338/912] publishing files with fixed versionData to fit originalBasename tempate --- .../publish/collect_otio_subset_resources.py | 43 ++++++++++++++++--- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/openpype/plugins/publish/collect_otio_subset_resources.py b/openpype/plugins/publish/collect_otio_subset_resources.py index e72c12d9a9..537aef683c 100644 --- a/openpype/plugins/publish/collect_otio_subset_resources.py +++ b/openpype/plugins/publish/collect_otio_subset_resources.py @@ -14,16 +14,41 @@ from openpype.pipeline.editorial import ( range_from_frames, make_sequence_collection ) - +from openpype.pipeline.publish import ( + get_publish_template_name +) class CollectOtioSubsetResources(pyblish.api.InstancePlugin): """Get Resources for a subset version""" label = "Collect OTIO Subset Resources" - order = pyblish.api.CollectorOrder - 0.077 + order = pyblish.api.CollectorOrder + 0.0021 families = ["clip"] hosts = ["resolve", "hiero", "flame"] + def get_template_name(self, instance): + """Return anatomy template name to use for integration""" + + # Anatomy data is pre-filled by Collectors + context = instance.context + project_name = context.data["projectName"] + + # Task can be optional in anatomy data + host_name = context.data["hostName"] + family = instance.data["family"] + anatomy_data = instance.context.data["anatomyData"] + task_info = anatomy_data.get("task") or {} + + return get_publish_template_name( + project_name, + host_name, + family, + task_name=task_info.get("name"), + task_type=task_info.get("type"), + project_settings=context.data["project_settings"], + logger=self.log + ) + def process(self, instance): if "audio" in instance.data["family"]: @@ -35,6 +60,13 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): if not instance.data.get("versionData"): instance.data["versionData"] = {} + template_name = self.get_template_name(instance) + anatomy = instance.context.data["anatomy"] + publish_template_category = anatomy.templates[template_name] + template = os.path.normpath(publish_template_category["path"]) + self.log.debug( + ">> template: {}".format(template)) + handle_start = instance.data["handleStart"] handle_end = instance.data["handleEnd"] @@ -84,6 +116,10 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): frame_start = instance.data["frameStart"] frame_end = frame_start + (media_out - media_in) + if "{originalDirname}" in template: + frame_start = media_in + frame_end = media_out + # add to version data start and end range data # for loader plugins to be correctly displayed and loaded instance.data["versionData"].update({ @@ -153,7 +189,6 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): repre = self._create_representation( frame_start, frame_end, collection=collection) - instance.data["originalBasename"] = collection.format("{head}") else: _trim = False dirname, filename = os.path.split(media_ref.target_url) @@ -168,8 +203,6 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): repre = self._create_representation( frame_start, frame_end, file=filename, trim=_trim) - instance.data["originalBasename"] = os.path.splitext(filename)[0] - instance.data["originalDirname"] = self.staging_dir if repre: From 8eae684f01da394e18407692d89062b3385a3bd0 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 10 Feb 2023 17:53:36 +0100 Subject: [PATCH 339/912] polishing fixes --- .../publish/collect_otio_subset_resources.py | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/openpype/plugins/publish/collect_otio_subset_resources.py b/openpype/plugins/publish/collect_otio_subset_resources.py index 537aef683c..5daa1b40fe 100644 --- a/openpype/plugins/publish/collect_otio_subset_resources.py +++ b/openpype/plugins/publish/collect_otio_subset_resources.py @@ -26,28 +26,6 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): families = ["clip"] hosts = ["resolve", "hiero", "flame"] - def get_template_name(self, instance): - """Return anatomy template name to use for integration""" - - # Anatomy data is pre-filled by Collectors - context = instance.context - project_name = context.data["projectName"] - - # Task can be optional in anatomy data - host_name = context.data["hostName"] - family = instance.data["family"] - anatomy_data = instance.context.data["anatomyData"] - task_info = anatomy_data.get("task") or {} - - return get_publish_template_name( - project_name, - host_name, - family, - task_name=task_info.get("name"), - task_type=task_info.get("type"), - project_settings=context.data["project_settings"], - logger=self.log - ) def process(self, instance): @@ -116,6 +94,7 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): frame_start = instance.data["frameStart"] frame_end = frame_start + (media_out - media_in) + # Fit start /end frame to media in /out if "{originalDirname}" in template: frame_start = media_in frame_end = media_out @@ -258,3 +237,26 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): if kwargs.get("trim") is True: representation_data["tags"] = ["trim"] return representation_data + + def get_template_name(self, instance): + """Return anatomy template name to use for integration""" + + # Anatomy data is pre-filled by Collectors + context = instance.context + project_name = context.data["projectName"] + + # Task can be optional in anatomy data + host_name = context.data["hostName"] + family = instance.data["family"] + anatomy_data = instance.context.data["anatomyData"] + task_info = anatomy_data.get("task") or {} + + return get_publish_template_name( + project_name, + host_name, + family, + task_name=task_info.get("name"), + task_type=task_info.get("type"), + project_settings=context.data["project_settings"], + logger=self.log + ) \ No newline at end of file From c103ac19076736ded0755c54737c2f9af2b408ab Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 10 Feb 2023 17:54:54 +0100 Subject: [PATCH 340/912] wrong template key name --- openpype/plugins/publish/collect_otio_subset_resources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/collect_otio_subset_resources.py b/openpype/plugins/publish/collect_otio_subset_resources.py index 5daa1b40fe..dab52986da 100644 --- a/openpype/plugins/publish/collect_otio_subset_resources.py +++ b/openpype/plugins/publish/collect_otio_subset_resources.py @@ -95,7 +95,7 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): frame_end = frame_start + (media_out - media_in) # Fit start /end frame to media in /out - if "{originalDirname}" in template: + if "{originalBasename}" in template: frame_start = media_in frame_end = media_out From 80ac19d4c9af3e24f72738f820b64b546fc9b764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Je=C5=BEek?= Date: Tue, 14 Feb 2023 12:18:00 +0100 Subject: [PATCH 341/912] Update openpype/hosts/nuke/plugins/load/load_clip.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- openpype/hosts/nuke/plugins/load/load_clip.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/nuke/plugins/load/load_clip.py b/openpype/hosts/nuke/plugins/load/load_clip.py index f9364172ea..8f9b463037 100644 --- a/openpype/hosts/nuke/plugins/load/load_clip.py +++ b/openpype/hosts/nuke/plugins/load/load_clip.py @@ -222,13 +222,12 @@ class LoadClip(plugin.NukeLoader): representation = deepcopy(representation) context = representation["context"] template = representation["data"]["template"] - frame = context["frame"] - hashed_frame = "#" * len(str(frame)) - if ( "{originalBasename}" in template and "frame" in context ): + frame = context["frame"] + hashed_frame = "#" * len(str(frame)) origin_basename = context["originalBasename"] context["originalBasename"] = origin_basename.replace( frame, hashed_frame From 6a8f40f5bb29e8b1bd04497cffe433fc1792af3c Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 14 Feb 2023 14:27:42 +0100 Subject: [PATCH 342/912] anatomy data from instance rather then context --- .../plugins/publish/collect_otio_subset_resources.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openpype/plugins/publish/collect_otio_subset_resources.py b/openpype/plugins/publish/collect_otio_subset_resources.py index dab52986da..f659791d95 100644 --- a/openpype/plugins/publish/collect_otio_subset_resources.py +++ b/openpype/plugins/publish/collect_otio_subset_resources.py @@ -22,7 +22,7 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): """Get Resources for a subset version""" label = "Collect OTIO Subset Resources" - order = pyblish.api.CollectorOrder + 0.0021 + order = pyblish.api.CollectorOrder + 0.491 families = ["clip"] hosts = ["resolve", "hiero", "flame"] @@ -50,9 +50,9 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): # get basic variables otio_clip = instance.data["otioClip"] - otio_avalable_range = otio_clip.available_range() - media_fps = otio_avalable_range.start_time.rate - available_duration = otio_avalable_range.duration.value + otio_available_range = otio_clip.available_range() + media_fps = otio_available_range.start_time.rate + available_duration = otio_available_range.duration.value # get available range trimmed with processed retimes retimed_attributes = get_media_range_with_retimes( @@ -248,7 +248,7 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): # Task can be optional in anatomy data host_name = context.data["hostName"] family = instance.data["family"] - anatomy_data = instance.context.data["anatomyData"] + anatomy_data = instance.data["anatomyData"] task_info = anatomy_data.get("task") or {} return get_publish_template_name( @@ -259,4 +259,4 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin): task_type=task_info.get("type"), project_settings=context.data["project_settings"], logger=self.log - ) \ No newline at end of file + ) From 2563d302fa0f9b1140b226e7e992b70bae403430 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 22 Feb 2023 12:22:53 +0100 Subject: [PATCH 343/912] OP-4643 - fix colorspace from DCC representation["colorspaceData"]["colorspace"] is only input colorspace --- openpype/plugins/publish/extract_color_transcode.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 82b92ec93e..456e40008d 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -118,8 +118,7 @@ class ExtractOIIOTranscode(publish.Extractor): output_name, output_extension) - target_colorspace = (output_def["colorspace"] or - colorspace_data.get("colorspace")) + target_colorspace = output_def["colorspace"] view = output_def["view"] or colorspace_data.get("view") display = (output_def["display"] or colorspace_data.get("display")) From 24715ff2de8e8c673670643ebb9263f3bd7219e3 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 22 Feb 2023 12:34:45 +0100 Subject: [PATCH 344/912] global: template should not have frame or other optional elements in tempate, since they are already part of the `originalBasename` --- openpype/settings/defaults/project_anatomy/templates.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/defaults/project_anatomy/templates.json b/openpype/settings/defaults/project_anatomy/templates.json index 32230e0625..02c0e35377 100644 --- a/openpype/settings/defaults/project_anatomy/templates.json +++ b/openpype/settings/defaults/project_anatomy/templates.json @@ -55,7 +55,7 @@ }, "source": { "folder": "{root[work]}/{originalDirname}", - "file": "{originalBasename}<.{@frame}><_{udim}>.{ext}", + "file": "{originalBasename}.{ext}", "path": "{@folder}/{@file}" }, "__dynamic_keys_labels__": { @@ -66,4 +66,4 @@ "source": "source" } } -} \ No newline at end of file +} From 8f5e958e60bf258bb05d8ca72576c20d410f08a8 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 11:37:20 +0100 Subject: [PATCH 345/912] handle disabled creators in create context --- openpype/pipeline/create/context.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py index 7672c49eb3..acc2bb054f 100644 --- a/openpype/pipeline/create/context.py +++ b/openpype/pipeline/create/context.py @@ -1390,6 +1390,8 @@ class CreateContext: self.autocreators = {} # Manual creators self.manual_creators = {} + # Creators that are disabled + self.disabled_creators = {} self.convertors_plugins = {} self.convertor_items_by_id = {} @@ -1667,6 +1669,7 @@ class CreateContext: # Discover and prepare creators creators = {} + disabled_creators = {} autocreators = {} manual_creators = {} report = discover_creator_plugins(return_report=True) @@ -1703,6 +1706,9 @@ class CreateContext: self, self.headless ) + if not creator.enabled: + disabled_creators[creator_identifier] = creator + continue creators[creator_identifier] = creator if isinstance(creator, AutoCreator): autocreators[creator_identifier] = creator @@ -1713,6 +1719,7 @@ class CreateContext: self.manual_creators = manual_creators self.creators = creators + self.disabled_creators = disabled_creators def _reset_convertor_plugins(self): convertors_plugins = {} From 8fc144b419976675a8f3b7b43f19d5a52c84b616 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 20 Feb 2023 13:59:20 +0100 Subject: [PATCH 346/912] base of auto detect creator --- .../tvpaint/plugins/create/create_render.py | 196 ++++++++++++++++++ 1 file changed, 196 insertions(+) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 6a857676a5..2cb83b7fb7 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -35,6 +35,7 @@ Todos: """ import collections +from typing import Any from openpype.client import get_asset_by_name from openpype.lib import ( @@ -604,6 +605,201 @@ class CreateRenderPass(TVPaintCreator): return self.get_pre_create_attr_defs() +class TVPaintAutoDetectRenderCreator(TVPaintCreator): + """Create Render Layer and Render Pass instances based on scene data. + + This is auto-detection creator which can be triggered by user to create + instances based on information in scene. Each used color group in scene + will be created as Render Layer where group name is used as variant and + each TVPaint layer as Render Pass where layer name is used as variant. + """ + + family = "render" + label = "Auto detect renders" + identifier = "render.auto.detect.creator" + + # Settings + enabled = False + + def apply_settings(self, project_settings, system_settings): + plugin_settings = ( + project_settings + ["tvpaint"] + ["create"] + ["auto_detect_render_create"] + ) + self.enabled = plugin_settings["enabled"] + + def create(self, subset_name, instance_data, pre_create_data): + project_name: str = self.create_context.get_current_project_name() + asset_name: str = instance_data["asset"] + task_name: str = instance_data["task"] + asset_doc: dict[str, Any] = get_asset_by_name(project_name, asset_name) + + render_layers_by_group_id: dict[int, CreatedInstance] = {} + render_passes_by_render_layer_id: dict[int, CreatedInstance] = ( + collections.defaultdict(list) + ) + for instance in self.create_context.instances: + if instance.creator_identifier == CreateRenderlayer.identifier: + group_id = instance["creator_attributes"]["group_id"] + render_layers_by_group_id[group_id] = instance + elif instance.creator_identifier == CreateRenderPass.identifier: + render_layer_id = ( + instance + ["creator_attributes"] + ["render_layer_instance_id"] + ) + render_passes_by_render_layer_id[render_layer_id].append( + instance + ) + + layers_by_group_id: dict[int, list[dict[str, Any]]] = ( + collections.defaultdict(list) + ) + scene_layers: list[dict[str, Any]] = get_layers_data() + scene_groups: list[dict[str, Any]] = get_groups_data() + for layer in scene_layers: + group_id: int = layer["group_id"] + layers_by_group_id[group_id].append(layer) + + # Remove '0' (default) group + layers_by_group_id.pop(0, None) + + # Make sure all render layers are created + for group_id in layers_by_group_id.keys(): + render_layer_instance: CreatedInstance | None = ( + render_layers_by_group_id.get(group_id) + ) + + instance: CreatedInstance | None = self._prepare_render_layer( + project_name, + asset_doc, + task_name, + group_id, + scene_groups, + render_layer_instance + ) + if instance is not None: + render_layers_by_group_id[group_id] = instance + + for group_id, layers in layers_by_group_id.items(): + render_layer_instance: CreatedInstance | None = ( + render_layers_by_group_id.get(group_id) + ) + if render_layer_instance is not None: + continue + + self._prepare_render_passes( + project_name, + asset_doc, + task_name, + render_layer_instance, + layers, + render_passes_by_render_layer_id[render_layer_instance.id] + ) + + def _prepare_render_layer( + self, + project_name: str, + asset_doc: dict[str, Any], + task_name: str, + group_id: int, + groups: list[dict[str, Any]], + existing_instance: CreatedInstance | None=None + ) -> CreatedInstance | None: + match_group: dict[str, Any] | None = next( + ( + for group in groups + if group["group_id"] == group_id + ), + None + ) + if not match_group: + return None + + variant: str = match_group["name"] + creator: CreateRenderlayer = ( + self.create_context.creators[CreateRenderlayer.identifier] + ) + + subset_name: str = creator.get_subset_name( + variant, + task_name, + asset_doc, + project_name, + host_name=self.create_context.host_name, + ) + if existing_instance is not None: + existing_instance["asset"] = asset_doc["name"] + existing_instance["task"] = task_name + existing_instance["subset"] = subset_name + return existing_instance + + instance_data: dict[str, str] = { + "asset": asset_doc["name"], + "task": task_name, + "family": creator.family, + "variant": variant + } + pre_create_data: dict[str, str] = { + "group_id": group_id + } + return creator.create(subset_name, instance_data, pre_create_data) + + def _prepare_render_passes( + self, + project_name: str, + asset_doc: dict[str, Any], + task_name: str, + render_layer_instance: CreatedInstance, + layers: list[dict[str, Any]], + existing_render_passes: list[CreatedInstance] + ): + creator: CreateRenderPass = ( + self.create_context.creators[CreateRenderPass.identifier] + ) + render_pass_by_layer_name = {} + for render_pass in existing_render_passes: + for layer_name in render_pass["layer_names"]: + render_pass_by_layer_name[layer_name] = render_pass + + for layer in layers: + layer_name = layer["name"] + variant = layer_name + render_pass = render_pass_by_layer_name.get(layer_name) + if render_pass is not None: + if (render_pass["layer_names"]) > 1: + variant = render_pass["variant"] + + subset_name = creator.get_subset_name( + variant, + task_name, + asset_doc, + project_name, + host_name=self.create_context.host_name, + instance=render_pass + ) + + if render_pass is not None: + render_pass["asset"] = asset_doc["name"] + render_pass["task"] = task_name + render_pass["subset"] = subset_name + continue + + instance_data: dict[str, str] = { + "asset": asset_doc["name"], + "task": task_name, + "family": creator.family, + "variant": variant + } + pre_create_data: dict[str, Any] = { + "render_layer_instance_id": render_layer_instance.id, + "layer_names": [layer_name] + } + creator.create(subset_name, instance_data, pre_create_data) + + class TVPaintSceneRenderCreator(TVPaintAutoCreator): family = "render" subset_template_family_filter = "renderScene" From 2b9e40aece80efa238adf9ee0af9f6d8ea0911de Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 20 Feb 2023 14:04:50 +0100 Subject: [PATCH 347/912] added settings for auto-detect creator --- .../hosts/tvpaint/plugins/create/create_render.py | 3 ++- .../defaults/project_settings/tvpaint.json | 3 +++ .../projects_schema/schema_project_tvpaint.json | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 2cb83b7fb7..5239c7aeb9 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -617,6 +617,7 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): family = "render" label = "Auto detect renders" identifier = "render.auto.detect.creator" + order = CreateRenderPass.order + 10 # Settings enabled = False @@ -626,7 +627,7 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): project_settings ["tvpaint"] ["create"] - ["auto_detect_render_create"] + ["auto_detect_render"] ) self.enabled = plugin_settings["enabled"] diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json index 340181b3a4..1a0d0e22ab 100644 --- a/openpype/settings/defaults/project_settings/tvpaint.json +++ b/openpype/settings/defaults/project_settings/tvpaint.json @@ -40,6 +40,9 @@ "mark_for_review": true, "default_variant": "Main", "default_variants": [] + }, + "auto_detect_render": { + "enabled": false } }, "publish": { diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json index 55e60357e5..5639dee0c2 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json @@ -195,6 +195,20 @@ } } ] + }, + { + "type": "dict", + "collapsible": true, + "key": "auto_detect_render", + "label": "Auto-Detect Create Render", + "is_group": true, + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled" + } + ] } ] }, From 4a81519968796677482ccf1c8984a114ed9e9e0a Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 21 Feb 2023 10:29:37 +0100 Subject: [PATCH 348/912] add more options to create new instances --- .../tvpaint/plugins/create/create_render.py | 276 +++++++++++++----- 1 file changed, 209 insertions(+), 67 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 5239c7aeb9..cee56ab0f4 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -40,6 +40,8 @@ from typing import Any from openpype.client import get_asset_by_name from openpype.lib import ( prepare_template_data, + AbstractAttrDef, + UISeparatorDef, EnumDef, TextDef, BoolDef, @@ -612,6 +614,8 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): instances based on information in scene. Each used color group in scene will be created as Render Layer where group name is used as variant and each TVPaint layer as Render Pass where layer name is used as variant. + + Never will have any instances, all instances belong to different creators. """ family = "render" @@ -621,6 +625,10 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): # Settings enabled = False + allow_group_rename = True + group_name_template = "L{group_index}" + group_idx_offset = 10 + group_idx_padding = 3 def apply_settings(self, project_settings, system_settings): plugin_settings = ( @@ -630,75 +638,73 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): ["auto_detect_render"] ) self.enabled = plugin_settings["enabled"] + self.allow_group_rename = plugin_settings["allow_group_rename"] - def create(self, subset_name, instance_data, pre_create_data): - project_name: str = self.create_context.get_current_project_name() - asset_name: str = instance_data["asset"] - task_name: str = instance_data["task"] - asset_doc: dict[str, Any] = get_asset_by_name(project_name, asset_name) + def _rename_groups( + self, + groups_order, + scene_groups, + layers_by_group_id, + rename_only_visible, - render_layers_by_group_id: dict[int, CreatedInstance] = {} - render_passes_by_render_layer_id: dict[int, CreatedInstance] = ( - collections.defaultdict(list) - ) - for instance in self.create_context.instances: - if instance.creator_identifier == CreateRenderlayer.identifier: - group_id = instance["creator_attributes"]["group_id"] - render_layers_by_group_id[group_id] = instance - elif instance.creator_identifier == CreateRenderPass.identifier: - render_layer_id = ( - instance - ["creator_attributes"] - ["render_layer_instance_id"] - ) - render_passes_by_render_layer_id[render_layer_id].append( - instance - ) - - layers_by_group_id: dict[int, list[dict[str, Any]]] = ( - collections.defaultdict(list) - ) - scene_layers: list[dict[str, Any]] = get_layers_data() - scene_groups: list[dict[str, Any]] = get_groups_data() - for layer in scene_layers: - group_id: int = layer["group_id"] - layers_by_group_id[group_id].append(layer) - - # Remove '0' (default) group - layers_by_group_id.pop(0, None) - - # Make sure all render layers are created - for group_id in layers_by_group_id.keys(): - render_layer_instance: CreatedInstance | None = ( - render_layers_by_group_id.get(group_id) - ) - - instance: CreatedInstance | None = self._prepare_render_layer( - project_name, - asset_doc, - task_name, - group_id, - scene_groups, - render_layer_instance - ) - if instance is not None: - render_layers_by_group_id[group_id] = instance - - for group_id, layers in layers_by_group_id.items(): - render_layer_instance: CreatedInstance | None = ( - render_layers_by_group_id.get(group_id) - ) - if render_layer_instance is not None: + ): + new_group_name_by_id = {} + groups_by_id = { + group["group_id"]: group + for group in scene_groups + } + # Count only renamed groups + group_idx = 1 + for group_id in groups_order: + layers = layers_by_group_id[group_id] + if not layers: continue - self._prepare_render_passes( - project_name, - asset_doc, - task_name, - render_layer_instance, - layers, - render_passes_by_render_layer_id[render_layer_instance.id] + if ( + rename_only_visible + and not any( + layer + for layer in layers + if layer["visible"] + ) + ): + continue + group_index_value = ( + "{{:0<{}}}" + .format(self.group_idx_padding) + .format(group_idx * self.group_idx_offset) ) + group_name_fill_values = { + "groupIdx": group_index_value, + "groupidx": group_index_value, + "group_idx": group_index_value, + "group_index": group_index_value, + } + + group_name = self.group_name_template.format( + **group_name_fill_values + ) + group = groups_by_id[group_id] + if group["name"] != group_name: + new_group_name_by_id[group_id] = group_name + group_idx += 1 + + grg_lines = [] + for group_id, group_name in new_group_name_by_id.items(): + group = groups_by_id[group_id] + grg_line = "tv_layercolor \"setcolor\" {} {} {} {} {}".format( + group["clip_id"], + group_id, + group["red"], + group["green"], + group["blue"], + group_name + ) + grg_lines.append(grg_line) + group["name"] = group_name + + if grg_lines: + execute_george_through_file(grg_lines) def _prepare_render_layer( self, @@ -707,7 +713,8 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): task_name: str, group_id: int, groups: list[dict[str, Any]], - existing_instance: CreatedInstance | None=None + mark_for_review: bool, + existing_instance: CreatedInstance | None=None, ) -> CreatedInstance | None: match_group: dict[str, Any] | None = next( ( @@ -744,7 +751,8 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): "variant": variant } pre_create_data: dict[str, str] = { - "group_id": group_id + "group_id": group_id, + "mark_for_review": mark_for_review } return creator.create(subset_name, instance_data, pre_create_data) @@ -755,6 +763,7 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): task_name: str, render_layer_instance: CreatedInstance, layers: list[dict[str, Any]], + mark_for_review: bool, existing_render_passes: list[CreatedInstance] ): creator: CreateRenderPass = ( @@ -796,10 +805,143 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): } pre_create_data: dict[str, Any] = { "render_layer_instance_id": render_layer_instance.id, - "layer_names": [layer_name] + "layer_names": [layer_name], + "mark_for_review": mark_for_review } creator.create(subset_name, instance_data, pre_create_data) + def create(self, subset_name, instance_data, pre_create_data): + project_name: str = self.create_context.get_current_project_name() + asset_name: str = instance_data["asset"] + task_name: str = instance_data["task"] + asset_doc: dict[str, Any] = get_asset_by_name(project_name, asset_name) + + render_layers_by_group_id: dict[int, CreatedInstance] = {} + render_passes_by_render_layer_id: dict[int, list[CreatedInstance]] = ( + collections.defaultdict(list) + ) + for instance in self.create_context.instances: + if instance.creator_identifier == CreateRenderlayer.identifier: + group_id = instance["creator_attributes"]["group_id"] + render_layers_by_group_id[group_id] = instance + elif instance.creator_identifier == CreateRenderPass.identifier: + render_layer_id = ( + instance + ["creator_attributes"] + ["render_layer_instance_id"] + ) + render_passes_by_render_layer_id[render_layer_id].append( + instance + ) + + layers_by_group_id: dict[int, list[dict[str, Any]]] = ( + collections.defaultdict(list) + ) + scene_layers: list[dict[str, Any]] = get_layers_data() + scene_groups: list[dict[str, Any]] = get_groups_data() + groups_order: list[int] = [] + for layer in scene_layers: + group_id: int = layer["group_id"] + # Skip 'default' group + if group_id == 0: + continue + + layers_by_group_id[group_id].append(layer) + if group_id not in groups_order: + groups_order.append(group_id) + + mark_layers_for_review = pre_create_data.get( + "mark_layers_for_review", False + ) + mark_passes_for_review = pre_create_data.get( + "mark_passes_for_review", False + ) + rename_groups = pre_create_data.get("rename_groups", False) + rename_only_visible = pre_create_data.get("rename_only_visible", False) + if rename_groups: + self._rename_groups( + groups_order, + scene_groups, + layers_by_group_id, + rename_only_visible + ) + + # Make sure all render layers are created + for group_id in layers_by_group_id.keys(): + render_layer_instance: CreatedInstance | None = ( + render_layers_by_group_id.get(group_id) + ) + + instance: CreatedInstance | None = self._prepare_render_layer( + project_name, + asset_doc, + task_name, + group_id, + scene_groups, + mark_layers_for_review, + render_layer_instance, + ) + if instance is not None: + render_layers_by_group_id[group_id] = instance + + for group_id, layers in layers_by_group_id.items(): + render_layer_instance: CreatedInstance | None = ( + render_layers_by_group_id.get(group_id) + ) + if render_layer_instance is not None: + continue + + self._prepare_render_passes( + project_name, + asset_doc, + task_name, + render_layer_instance, + layers, + mark_passes_for_review, + render_passes_by_render_layer_id[render_layer_instance.id] + ) + + def get_pre_create_attr_defs(self) -> list[AbstractAttrDef]: + render_layer_creator: CreateRenderlayer = ( + self.create_context.creators[CreateRenderlayer.identifier] + ) + render_pass_creator: CreateRenderPass = ( + self.create_context.creators[CreateRenderPass.identifier] + ) + output = [] + if self.allow_group_rename: + output.extend([ + BoolDef( + "rename_groups", + label="Rename color groups", + tooltip="Will rename color groups using studio template", + default=True + ), + BoolDef( + "rename_only_visible", + label="Only visible color groups", + tooltip=( + "Rename of groups will affect only groups with visible" + " layers." + ), + default=True + ), + UISeparatorDef() + ]) + output.extend([ + BoolDef( + "mark_layers_for_review", + label="Mark RenderLayers for review", + default=render_layer_creator.mark_for_review + ), + BoolDef( + "mark_passes_for_review", + label="Mark RenderPasses for review", + default=render_pass_creator.mark_for_review + ) + ]) + return output + class TVPaintSceneRenderCreator(TVPaintAutoCreator): family = "render" From 5fdadaf454c94cd8e575b5d71a0768cb10385978 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 21 Feb 2023 10:30:55 +0100 Subject: [PATCH 349/912] added more settings --- .../tvpaint/plugins/create/create_render.py | 3 ++ .../defaults/project_settings/tvpaint.json | 6 +++- .../schema_project_tvpaint.json | 28 +++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index cee56ab0f4..129b8dc1c5 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -639,6 +639,9 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): ) self.enabled = plugin_settings["enabled"] self.allow_group_rename = plugin_settings["allow_group_rename"] + self.group_name_template = plugin_settings["group_name_template"] + self.group_idx_offset = plugin_settings["group_idx_offset"] + self.group_idx_padding = plugin_settings["group_idx_padding"] def _rename_groups( self, diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json index 1a0d0e22ab..1cae94f590 100644 --- a/openpype/settings/defaults/project_settings/tvpaint.json +++ b/openpype/settings/defaults/project_settings/tvpaint.json @@ -42,7 +42,11 @@ "default_variants": [] }, "auto_detect_render": { - "enabled": false + "enabled": false, + "allow_group_rename": true, + "group_name_template": "L{group_index}", + "group_idx_offset": 10, + "group_idx_padding": 3 } }, "publish": { diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json index 5639dee0c2..05cfd99047 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json @@ -207,6 +207,34 @@ { "type": "boolean", "key": "enabled" + }, + { + "type": "label", + "label": "The creator tries to auto-detect Render Layers and Render Passes in scene. For Render Layers is used group name as a variant and for Render Passes is used TVPaint layer name.

Group names can be renamed by their used order in scene. The renaming template where can be used {group_index} formatting key which is filled by \"used position index of group\".
- Template: L{group_index}
- Group offset: 10
- Group padding: 3
Would create group names \"L010\", \"L020\", ..." + }, + { + "type": "boolean", + "key": "allow_group_rename", + "label": "Allow group rename" + }, + { + "type": "text", + "key": "group_name_template", + "label": "Group name template" + }, + { + "key": "group_idx_offset", + "label": "Group index Offset", + "type": "number", + "decimal": 0, + "minimum": 1 + }, + { + "key": "group_idx_padding", + "type": "number", + "label": "Group index Padding", + "decimal": 0, + "minimum": 1 } ] } From 51f43076b560e858b78289ce9954d814243c6d3f Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 21 Feb 2023 15:33:08 +0100 Subject: [PATCH 350/912] fix smaller bugs in logic --- openpype/hosts/tvpaint/plugins/create/create_render.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 129b8dc1c5..7d241f93f6 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -673,7 +673,7 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): ): continue group_index_value = ( - "{{:0<{}}}" + "{{:0>{}}}" .format(self.group_idx_padding) .format(group_idx * self.group_idx_offset) ) @@ -707,7 +707,7 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): group["name"] = group_name if grg_lines: - execute_george_through_file(grg_lines) + execute_george_through_file("\n".join(grg_lines)) def _prepare_render_layer( self, @@ -853,6 +853,8 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): if group_id not in groups_order: groups_order.append(group_id) + groups_order.reverse() + mark_layers_for_review = pre_create_data.get( "mark_layers_for_review", False ) @@ -891,7 +893,7 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): render_layer_instance: CreatedInstance | None = ( render_layers_by_group_id.get(group_id) ) - if render_layer_instance is not None: + if render_layer_instance is None: continue self._prepare_render_passes( From a2074308142dbc999ac4175b01cfb7affc6ebe0b Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 21 Feb 2023 15:40:20 +0100 Subject: [PATCH 351/912] fix groups iter --- openpype/hosts/tvpaint/plugins/create/create_render.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 7d241f93f6..2d4f9f1bc1 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -35,7 +35,7 @@ Todos: """ import collections -from typing import Any +from typing import Any, Optional, Union from openpype.client import get_asset_by_name from openpype.lib import ( @@ -719,8 +719,9 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): mark_for_review: bool, existing_instance: CreatedInstance | None=None, ) -> CreatedInstance | None: - match_group: dict[str, Any] | None = next( + match_group: Union[dict[str, Any], None] = next( ( + group for group in groups if group["group_id"] == group_id ), From a44f928804f21b893bdace9b74b186b079426b4d Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 21 Feb 2023 15:41:03 +0100 Subject: [PATCH 352/912] handle valid group ids --- .../hosts/tvpaint/plugins/create/create_render.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 2d4f9f1bc1..c7b80ae256 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -653,6 +653,7 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): ): new_group_name_by_id = {} groups_by_id = { + valid_group_ids: set[int] = set() group["group_id"]: group for group in scene_groups } @@ -672,7 +673,8 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): ) ): continue - group_index_value = ( + valid_group_ids.add(group_id) + group_index_value: str = ( "{{:0>{}}}" .format(self.group_idx_padding) .format(group_idx * self.group_idx_offset) @@ -708,6 +710,7 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): if grg_lines: execute_george_through_file("\n".join(grg_lines)) + return valid_group_ids def _prepare_render_layer( self, @@ -865,16 +868,20 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): rename_groups = pre_create_data.get("rename_groups", False) rename_only_visible = pre_create_data.get("rename_only_visible", False) if rename_groups: - self._rename_groups( + valid_group_ids: set[int] = self._rename_groups( groups_order, scene_groups, layers_by_group_id, rename_only_visible ) + else: + valid_group_ids: set[int] = set(groups_order) # Make sure all render layers are created for group_id in layers_by_group_id.keys(): - render_layer_instance: CreatedInstance | None = ( + if group_id not in valid_group_ids: + continue + render_layer_instance: Union[CreatedInstance, None] = ( render_layers_by_group_id.get(group_id) ) From faaade284ab14d8cfe4dade4011981c0f0d26623 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 21 Feb 2023 15:41:44 +0100 Subject: [PATCH 353/912] added type hints --- .../tvpaint/plugins/create/create_render.py | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index c7b80ae256..883383ec76 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -645,22 +645,21 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): def _rename_groups( self, - groups_order, - scene_groups, - layers_by_group_id, - rename_only_visible, - - ): - new_group_name_by_id = {} - groups_by_id = { + groups_order: list[int], + scene_groups: list[dict[str, Any]], + layers_by_group_id: dict[int, dict[str, Any]], + rename_only_visible: bool, + ) -> set[int]: valid_group_ids: set[int] = set() + new_group_name_by_id: dict[int, str] = {} + groups_by_id: dict[int, dict[str, Any]] = { group["group_id"]: group for group in scene_groups } # Count only renamed groups - group_idx = 1 + group_idx: int = 1 for group_id in groups_order: - layers = layers_by_group_id[group_id] + layers: list[dict[str, Any]] = layers_by_group_id[group_id] if not layers: continue @@ -679,25 +678,25 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): .format(self.group_idx_padding) .format(group_idx * self.group_idx_offset) ) - group_name_fill_values = { + group_name_fill_values: dict[str, str] = { "groupIdx": group_index_value, "groupidx": group_index_value, "group_idx": group_index_value, "group_index": group_index_value, } - group_name = self.group_name_template.format( + group_name: str = self.group_name_template.format( **group_name_fill_values ) - group = groups_by_id[group_id] + group: dict[str, Any] = groups_by_id[group_id] if group["name"] != group_name: new_group_name_by_id[group_id] = group_name group_idx += 1 - grg_lines = [] + grg_lines: list[str] = [] for group_id, group_name in new_group_name_by_id.items(): - group = groups_by_id[group_id] - grg_line = "tv_layercolor \"setcolor\" {} {} {} {} {}".format( + group: dict[str, Any] = groups_by_id[group_id] + grg_line: str = "tv_layercolor \"setcolor\" {} {} {} {} {}".format( group["clip_id"], group_id, group["red"], @@ -720,8 +719,8 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): group_id: int, groups: list[dict[str, Any]], mark_for_review: bool, - existing_instance: CreatedInstance | None=None, - ) -> CreatedInstance | None: + existing_instance: Optional[CreatedInstance]=None, + ) -> Union[CreatedInstance, None]: match_group: Union[dict[str, Any], None] = next( ( group @@ -885,7 +884,7 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): render_layers_by_group_id.get(group_id) ) - instance: CreatedInstance | None = self._prepare_render_layer( + instance: Union[CreatedInstance, None] = self._prepare_render_layer( project_name, asset_doc, task_name, @@ -898,7 +897,7 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): render_layers_by_group_id[group_id] = instance for group_id, layers in layers_by_group_id.items(): - render_layer_instance: CreatedInstance | None = ( + render_layer_instance: Union[CreatedInstance, None] = ( render_layers_by_group_id.get(group_id) ) if render_layer_instance is None: From 07c87b2efd8c6eec6c1df2ec5d8110eda6d5af4b Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 21 Feb 2023 16:18:40 +0100 Subject: [PATCH 354/912] fix filtering of groups --- .../tvpaint/plugins/create/create_render.py | 108 +++++++++--------- 1 file changed, 55 insertions(+), 53 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 883383ec76..2e17995b7a 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -646,37 +646,19 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): def _rename_groups( self, groups_order: list[int], - scene_groups: list[dict[str, Any]], - layers_by_group_id: dict[int, dict[str, Any]], - rename_only_visible: bool, - ) -> set[int]: - valid_group_ids: set[int] = set() + scene_groups: list[dict[str, Any]] + ): new_group_name_by_id: dict[int, str] = {} groups_by_id: dict[int, dict[str, Any]] = { group["group_id"]: group for group in scene_groups } # Count only renamed groups - group_idx: int = 1 - for group_id in groups_order: - layers: list[dict[str, Any]] = layers_by_group_id[group_id] - if not layers: - continue - - if ( - rename_only_visible - and not any( - layer - for layer in layers - if layer["visible"] - ) - ): - continue - valid_group_ids.add(group_id) + for idx, group_id in enumerate(groups_order): group_index_value: str = ( "{{:0>{}}}" .format(self.group_idx_padding) - .format(group_idx * self.group_idx_offset) + .format((idx + 1) * self.group_idx_offset) ) group_name_fill_values: dict[str, str] = { "groupIdx": group_index_value, @@ -691,7 +673,6 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): group: dict[str, Any] = groups_by_id[group_id] if group["name"] != group_name: new_group_name_by_id[group_id] = group_name - group_idx += 1 grg_lines: list[str] = [] for group_id, group_name in new_group_name_by_id.items(): @@ -709,7 +690,6 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): if grg_lines: execute_george_through_file("\n".join(grg_lines)) - return valid_group_ids def _prepare_render_layer( self, @@ -816,6 +796,30 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): } creator.create(subset_name, instance_data, pre_create_data) + def _filter_groups( + self, + layers_by_group_id, + groups_order, + only_visible_groups + ): + new_groups_order = [] + for group_id in groups_order: + layers: list[dict[str, Any]] = layers_by_group_id[group_id] + if not layers: + continue + + if ( + only_visible_groups + and not any( + layer + for layer in layers + if layer["visible"] + ) + ): + continue + new_groups_order.append(group_id) + return new_groups_order + def create(self, subset_name, instance_data, pre_create_data): project_name: str = self.create_context.get_current_project_name() asset_name: str = instance_data["asset"] @@ -865,42 +869,40 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): "mark_passes_for_review", False ) rename_groups = pre_create_data.get("rename_groups", False) - rename_only_visible = pre_create_data.get("rename_only_visible", False) + only_visible_groups = pre_create_data.get("only_visible_groups", False) + groups_order = self._filter_groups( + layers_by_group_id, + groups_order, + only_visible_groups + ) + if not groups_order: + return + if rename_groups: - valid_group_ids: set[int] = self._rename_groups( - groups_order, - scene_groups, - layers_by_group_id, - rename_only_visible - ) - else: - valid_group_ids: set[int] = set(groups_order) + self._rename_groups(groups_order, scene_groups) # Make sure all render layers are created - for group_id in layers_by_group_id.keys(): - if group_id not in valid_group_ids: - continue - render_layer_instance: Union[CreatedInstance, None] = ( - render_layers_by_group_id.get(group_id) - ) - - instance: Union[CreatedInstance, None] = self._prepare_render_layer( - project_name, - asset_doc, - task_name, - group_id, - scene_groups, - mark_layers_for_review, - render_layer_instance, + for group_id in groups_order: + instance: Union[CreatedInstance, None] = ( + self._prepare_render_layer( + project_name, + asset_doc, + task_name, + group_id, + scene_groups, + mark_layers_for_review, + render_layers_by_group_id.get(group_id), + ) ) if instance is not None: render_layers_by_group_id[group_id] = instance - for group_id, layers in layers_by_group_id.items(): + for group_id in groups_order: + layers: list[dict[str, Any]] = layers_by_group_id[group_id] render_layer_instance: Union[CreatedInstance, None] = ( render_layers_by_group_id.get(group_id) ) - if render_layer_instance is None: + if not layers or render_layer_instance is None: continue self._prepare_render_passes( @@ -930,11 +932,11 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): default=True ), BoolDef( - "rename_only_visible", + "only_visible_groups", label="Only visible color groups", tooltip=( - "Rename of groups will affect only groups with visible" - " layers." + "Render Layers and rename will happen only on color" + " groups with visible layers." ), default=True ), From abb3134bb4c8bb7413d415e29b5a950715ab23ab Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 21 Feb 2023 18:16:33 +0100 Subject: [PATCH 355/912] fix whitespace --- openpype/hosts/tvpaint/plugins/create/create_render.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 2e17995b7a..f16c3a437b 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -699,7 +699,7 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): group_id: int, groups: list[dict[str, Any]], mark_for_review: bool, - existing_instance: Optional[CreatedInstance]=None, + existing_instance: Optional[CreatedInstance] = None, ) -> Union[CreatedInstance, None]: match_group: Union[dict[str, Any], None] = next( ( From c334a5fc221fa6650d67c38338f9c71f96f11824 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 11:43:33 +0100 Subject: [PATCH 356/912] removed 'enabled' from 'auto_detect_render' settings --- openpype/settings/defaults/project_settings/tvpaint.json | 1 - .../schemas/projects_schema/schema_project_tvpaint.json | 5 ----- 2 files changed, 6 deletions(-) diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json index 1cae94f590..40603ed874 100644 --- a/openpype/settings/defaults/project_settings/tvpaint.json +++ b/openpype/settings/defaults/project_settings/tvpaint.json @@ -42,7 +42,6 @@ "default_variants": [] }, "auto_detect_render": { - "enabled": false, "allow_group_rename": true, "group_name_template": "L{group_index}", "group_idx_offset": 10, diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json index 05cfd99047..57016a8311 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json @@ -202,12 +202,7 @@ "key": "auto_detect_render", "label": "Auto-Detect Create Render", "is_group": true, - "checkbox_key": "enabled", "children": [ - { - "type": "boolean", - "key": "enabled" - }, { "type": "label", "label": "The creator tries to auto-detect Render Layers and Render Passes in scene. For Render Layers is used group name as a variant and for Render Passes is used TVPaint layer name.

Group names can be renamed by their used order in scene. The renaming template where can be used {group_index} formatting key which is filled by \"used position index of group\".
- Template: L{group_index}
- Group offset: 10
- Group padding: 3
Would create group names \"L010\", \"L020\", ..." From 0f20ed34a2a811599dccd2ebb46a2464cd66ebad Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 12:32:16 +0100 Subject: [PATCH 357/912] change label and add description to creator --- .../tvpaint/plugins/create/create_render.py | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index f16c3a437b..40386efe91 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -89,6 +89,25 @@ to match group color of Render Layer. ) +AUTODETECT_RENDER_DETAILED_DESCRIPTION = ( + """Semi-automated Render Layer and Render Pass creation. + +Based on information in TVPaint scene will be created Render Layers and Render +Passes. All color groups used in scene will be used for Render Layer creation. +Name of the group is used as a variant. + +All TVPaint layers under the color group will be created as Render Pass where +layer name is used as variant. + +The plugin will use all used color groups and layers, or can skip those that +are not visible. + +There is option to auto-rename color groups before Render Layer creation. That +is based on settings template where is filled index of used group from bottom +to top. +""" +) + class CreateRenderlayer(TVPaintCreator): """Mark layer group as Render layer instance. @@ -619,9 +638,13 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): """ family = "render" - label = "Auto detect renders" + label = "Render Layer/Passes" identifier = "render.auto.detect.creator" order = CreateRenderPass.order + 10 + description = ( + "Create Render Layers and Render Passes based on scene setup" + ) + detailed_description = AUTODETECT_RENDER_DETAILED_DESCRIPTION # Settings enabled = False From e0879fd67d642f7e34e4e70ba43979fc1cdb6dd9 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 16 Feb 2023 17:03:04 +0100 Subject: [PATCH 358/912] Pass creation flags on windows in UI executables --- openpype/lib/execute.py | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/openpype/lib/execute.py b/openpype/lib/execute.py index 39532b7aa5..e60bffbd7a 100644 --- a/openpype/lib/execute.py +++ b/openpype/lib/execute.py @@ -74,18 +74,23 @@ def execute(args, return popen.returncode -def run_subprocess(*args, **kwargs): +def run_subprocess(*args, creationflags=None, **kwargs): """Convenience method for getting output errors for subprocess. Output logged when process finish. Entered arguments and keyword arguments are passed to subprocess Popen. + Set 'creationflags' to '0' (int) if auto-fix for creation of new window + should be ignored. + Args: - *args: Variable length arument list passed to Popen. + *args: Variable length argument list passed to Popen. + creationflags (int): Creation flags for 'subprocess.Popen'. + Differentiate on OS. **kwargs : Arbitrary keyword arguments passed to Popen. Is possible to - pass `logging.Logger` object under "logger" if want to use - different than lib's logger. + pass `logging.Logger` object under "logger" to use custom logger + for output. Returns: str: Full output of subprocess concatenated stdout and stderr. @@ -95,6 +100,21 @@ def run_subprocess(*args, **kwargs): return code. """ + # Modify creation flags on windows to hide console window if in UI mode + if ( + sys.__stdout__ is None + and platform.system().lower() == "windows" + and creationflags is None + ): + creationflags = ( + subprocess.CREATE_NEW_PROCESS_GROUP + | subprocess.DETACHED_PROCESS + ) + + # Ignore if creation flags is set to '0' or 'None' + if creationflags: + kwargs["creationflags"] = creationflags + # Get environents from kwarg or use current process environments if were # not passed. env = kwargs.get("env") or os.environ From 567b6dfb140bafe31fa4c3daef052315e65efb67 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 17 Feb 2023 09:59:47 +0100 Subject: [PATCH 359/912] on windows always autofill creation flags --- openpype/lib/execute.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openpype/lib/execute.py b/openpype/lib/execute.py index e60bffbd7a..6a3d777427 100644 --- a/openpype/lib/execute.py +++ b/openpype/lib/execute.py @@ -102,8 +102,7 @@ def run_subprocess(*args, creationflags=None, **kwargs): # Modify creation flags on windows to hide console window if in UI mode if ( - sys.__stdout__ is None - and platform.system().lower() == "windows" + platform.system().lower() == "windows" and creationflags is None ): creationflags = ( From e69ba621d1063b9c2cd72448a3f49512e83b38b5 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 17 Feb 2023 10:01:05 +0100 Subject: [PATCH 360/912] unify quotes --- openpype/lib/execute.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openpype/lib/execute.py b/openpype/lib/execute.py index 6a3d777427..47b4255e3b 100644 --- a/openpype/lib/execute.py +++ b/openpype/lib/execute.py @@ -126,10 +126,10 @@ def run_subprocess(*args, creationflags=None, **kwargs): logger = Logger.get_logger("run_subprocess") # set overrides - kwargs['stdout'] = kwargs.get('stdout', subprocess.PIPE) - kwargs['stderr'] = kwargs.get('stderr', subprocess.PIPE) - kwargs['stdin'] = kwargs.get('stdin', subprocess.PIPE) - kwargs['env'] = filtered_env + kwargs["stdout"] = kwargs.get("stdout", subprocess.PIPE) + kwargs["stderr"] = kwargs.get("stderr", subprocess.PIPE) + kwargs["stdin"] = kwargs.get("stdin", subprocess.PIPE) + kwargs["env"] = filtered_env proc = subprocess.Popen(*args, **kwargs) From 0f9e12955c1553e61eac5c9c43ddfa3b46e8cdeb Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 20 Feb 2023 10:23:24 +0100 Subject: [PATCH 361/912] look for creationflags in kwargs instead of explicit argument --- openpype/lib/execute.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/openpype/lib/execute.py b/openpype/lib/execute.py index 47b4255e3b..6c1361d7c2 100644 --- a/openpype/lib/execute.py +++ b/openpype/lib/execute.py @@ -74,20 +74,18 @@ def execute(args, return popen.returncode -def run_subprocess(*args, creationflags=None, **kwargs): +def run_subprocess(*args, **kwargs): """Convenience method for getting output errors for subprocess. Output logged when process finish. Entered arguments and keyword arguments are passed to subprocess Popen. - Set 'creationflags' to '0' (int) if auto-fix for creation of new window - should be ignored. + On windows are 'creationflags' filled with flags that should cause ignore + creation of new window. Args: *args: Variable length argument list passed to Popen. - creationflags (int): Creation flags for 'subprocess.Popen'. - Differentiate on OS. **kwargs : Arbitrary keyword arguments passed to Popen. Is possible to pass `logging.Logger` object under "logger" to use custom logger for output. @@ -103,17 +101,13 @@ def run_subprocess(*args, creationflags=None, **kwargs): # Modify creation flags on windows to hide console window if in UI mode if ( platform.system().lower() == "windows" - and creationflags is None + and "creationflags" not in kwargs ): - creationflags = ( + kwargs["creationflags"] = ( subprocess.CREATE_NEW_PROCESS_GROUP | subprocess.DETACHED_PROCESS ) - # Ignore if creation flags is set to '0' or 'None' - if creationflags: - kwargs["creationflags"] = creationflags - # Get environents from kwarg or use current process environments if were # not passed. env = kwargs.get("env") or os.environ From ed909ca5278825b1d897aaa1d975090a13ecf5b2 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 20 Feb 2023 10:23:59 +0100 Subject: [PATCH 362/912] add 'CREATE_NO_WINDOW' to flags (if is available) --- openpype/lib/execute.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openpype/lib/execute.py b/openpype/lib/execute.py index 6c1361d7c2..f5745f9fdc 100644 --- a/openpype/lib/execute.py +++ b/openpype/lib/execute.py @@ -103,9 +103,11 @@ def run_subprocess(*args, **kwargs): platform.system().lower() == "windows" and "creationflags" not in kwargs ): + no_window = getattr(subprocess, "CREATE_NO_WINDOW", 0) kwargs["creationflags"] = ( subprocess.CREATE_NEW_PROCESS_GROUP | subprocess.DETACHED_PROCESS + | no_window ) # Get environents from kwarg or use current process environments if were From c177c26c863dbfee91cb67e78d5e54f8c5f44f5d Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 20 Feb 2023 19:02:59 +0100 Subject: [PATCH 363/912] safe access to constants --- openpype/lib/execute.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openpype/lib/execute.py b/openpype/lib/execute.py index f5745f9fdc..759a4db0cb 100644 --- a/openpype/lib/execute.py +++ b/openpype/lib/execute.py @@ -103,11 +103,10 @@ def run_subprocess(*args, **kwargs): platform.system().lower() == "windows" and "creationflags" not in kwargs ): - no_window = getattr(subprocess, "CREATE_NO_WINDOW", 0) kwargs["creationflags"] = ( subprocess.CREATE_NEW_PROCESS_GROUP - | subprocess.DETACHED_PROCESS - | no_window + | getattr(subprocess, "DETACHED_PROCESS", 0) + | getattr(subprocess, "CREATE_NO_WINDOW", 0) ) # Get environents from kwarg or use current process environments if were From cf17ff50b572b0f55b9c60b9981f872cd79ef34f Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 10:41:01 +0100 Subject: [PATCH 364/912] use detached process in ffprobe --- openpype/lib/transcoding.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 57279d0380..039255d937 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -5,6 +5,7 @@ import json import collections import tempfile import subprocess +import platform import xml.etree.ElementTree @@ -745,11 +746,18 @@ def get_ffprobe_data(path_to_file, logger=None): logger.debug("FFprobe command: {}".format( subprocess.list2cmdline(args) )) - popen = subprocess.Popen( - args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE - ) + kwargs = { + "stdout": subprocess.PIPE, + "stderr": subprocess.PIPE, + } + if platform.system().lower() == "windows": + kwargs["creationflags"] = ( + subprocess.CREATE_NEW_PROCESS_GROUP + | getattr(subprocess, "DETACHED_PROCESS", 0) + | getattr(subprocess, "CREATE_NO_WINDOW", 0) + ) + + popen = subprocess.Popen(args, **kwargs) popen_stdout, popen_stderr = popen.communicate() if popen_stdout: From 79eb375c06d1dfeb6cb65c87f69c5f0476a05eb2 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 10:43:21 +0100 Subject: [PATCH 365/912] hide console in extract burnin --- openpype/scripts/otio_burnin.py | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/openpype/scripts/otio_burnin.py b/openpype/scripts/otio_burnin.py index 3e40bf0c8b..cb4646c099 100644 --- a/openpype/scripts/otio_burnin.py +++ b/openpype/scripts/otio_burnin.py @@ -52,7 +52,16 @@ def _get_ffprobe_data(source): "-show_streams", source ] - proc = subprocess.Popen(command, stdout=subprocess.PIPE) + kwargs = { + "stdout": subprocess.PIPE, + } + if platform.system().lower() == "windows": + kwargs["creationflags"] = ( + subprocess.CREATE_NEW_PROCESS_GROUP + | getattr(subprocess, "DETACHED_PROCESS", 0) + | getattr(subprocess, "CREATE_NO_WINDOW", 0) + ) + proc = subprocess.Popen(command, **kwargs) out = proc.communicate()[0] if proc.returncode != 0: raise RuntimeError("Failed to run: %s" % command) @@ -331,12 +340,18 @@ class ModifiedBurnins(ffmpeg_burnins.Burnins): ) print("Launching command: {}".format(command)) - proc = subprocess.Popen( - command, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - shell=True - ) + kwargs = { + "stdout": subprocess.PIPE, + "stderr": subprocess.PIPE, + "shell": True, + } + if platform.system().lower() == "windows": + kwargs["creationflags"] = ( + subprocess.CREATE_NEW_PROCESS_GROUP + | getattr(subprocess, "DETACHED_PROCESS", 0) + | getattr(subprocess, "CREATE_NO_WINDOW", 0) + ) + proc = subprocess.Popen(command, **kwargs) _stdout, _stderr = proc.communicate() if _stdout: From 709d663870bb703d644ab0fdd8afc08da6c260c8 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 22 Feb 2023 21:47:32 +0800 Subject: [PATCH 366/912] update docstring and style fix --- openpype/hosts/maya/api/lib.py | 58 ++++++++++++------- .../maya/plugins/publish/extract_look.py | 8 +-- .../publish/validate_look_color_space.py | 3 +- 3 files changed, 43 insertions(+), 26 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index 88d3701966..e369b46525 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -16,7 +16,15 @@ from six import string_types from maya import cmds, mel import maya.api.OpenMaya as om -from arnold import * # noqa +from arnold import ( + AiTextureGetBitDepth, + AiTextureGetFormat, + AiTextureInvalidate, + # types + AI_TYPE_BYTE, + AI_TYPE_INT, + AI_TYPE_UINT +) from openpype.client import ( get_project, @@ -3465,19 +3473,23 @@ def write_xgen_file(data, filepath): f.writelines(lines) -def imageInfo(filepath): - """Take reference from makeTx.py in Arnold - ImageInfo(filename): Get Image Information for colorspace - AiTextureGetFormat(filename): Get Texture Format - AiTextureGetBitDepth(filename): Get Texture Bit Depth +def image_info(file_path): + # type: (str) -> dict + """Based on tha texture path, get its bit depth and format information. + Take reference from makeTx.py in Arnold: + ImageInfo(filename): Get Image Information for colorspace + AiTextureGetFormat(filename): Get Texture Format + AiTextureGetBitDepth(filename): Get Texture bit depth + Args: + file_path (str): Path to the texture file. + Returns: + dict: Dictionary with the information about the texture file. """ - # Get Texture Information - img_info = {} - img_info['filename'] = filepath - if os.path.isfile(filepath): - img_info['bit_depth'] = AiTextureGetBitDepth(filepath) # noqa - img_info['format'] = AiTextureGetFormat(filepath) # noqa + img_info = {'filename': file_path} + if os.path.isfile(file_path): + img_info['bit_depth'] = AiTextureGetBitDepth(file_path) # noqa + img_info['format'] = AiTextureGetFormat(file_path) # noqa else: img_info['bit_depth'] = 8 img_info['format'] = "unknown" @@ -3485,21 +3497,25 @@ def imageInfo(filepath): def guess_colorspace(img_info): - ''' Take reference from makeTx.py - Guess the colorspace of the input image filename. - @return: a string suitable for the --colorconvert - option of maketx (linear, sRGB, Rec709) - ''' + # type: (dict) -> str + """Guess the colorspace of the input image filename. + Note: + Reference from makeTx.py + Args: + img_info (dict): Image info generated by :func:`image_info` + Returns: + str: color space name use in the `--colorconvert` + option of maketx. + """ try: if img_info['bit_depth'] <= 16: if img_info['format'] in (AI_TYPE_BYTE, AI_TYPE_INT, AI_TYPE_UINT): # noqa return 'sRGB' else: return 'linear' - # now discard the image file as AiTextureGetFormat has loaded it AiTextureInvalidate(img_info['filename']) # noqa except ValueError: - print('[maketx] Error: Could not guess' - 'colorspace for "%s"' % img_info['filename']) - return 'linear' + print(("[maketx] Error: Could not guess" + "colorspace for {}").format(img_info["filename"])) + return "linear" diff --git a/openpype/hosts/maya/plugins/publish/extract_look.py b/openpype/hosts/maya/plugins/publish/extract_look.py index 46f7b0e03d..d9c19c9139 100644 --- a/openpype/hosts/maya/plugins/publish/extract_look.py +++ b/openpype/hosts/maya/plugins/publish/extract_look.py @@ -16,7 +16,7 @@ import pyblish.api from openpype.lib import source_hash, run_subprocess from openpype.pipeline import legacy_io, publish from openpype.hosts.maya.api import lib -from openpype.hosts.maya.api.lib import imageInfo, guess_colorspace +from openpype.hosts.maya.api.lib import image_info, guess_colorspace # Modes for transfer COPY = 1 @@ -369,7 +369,7 @@ class ExtractLook(publish.Extractor): linearize = False # if OCIO color management enabled - # it wont take the condition of the files_metadata + # it won't take the condition of the files_metadata ocio_maya = cmds.colorManagementPrefs(q=True, cmConfigFileEnabled=True, @@ -542,14 +542,14 @@ class ExtractLook(publish.Extractor): color_space = cmds.getAttr(color_space_attr) except ValueError: # node doesn't have color space attribute - img_info = imageInfo(filepath) + img_info = image_info(filepath) color_space = guess_colorspace(img_info) self.log.info("tx: converting {0} -> {1}".format(color_space, render_colorspace)) # noqa additional_args.extend(["--colorconvert", color_space, render_colorspace]) else: - img_info = imageInfo(filepath) + img_info = image_info(filepath) color_space = guess_colorspace(img_info) if color_space == "sRGB": self.log.info("tx: converting sRGB -> linear") diff --git a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py index b354d51fef..b1bdeb7541 100644 --- a/openpype/hosts/maya/plugins/publish/validate_look_color_space.py +++ b/openpype/hosts/maya/plugins/publish/validate_look_color_space.py @@ -2,6 +2,7 @@ from maya import cmds import pyblish.api from openpype.pipeline.publish import ValidateContentsOrder +from openpype.pipeline import PublishValidationError class ValidateMayaColorSpace(pyblish.api.InstancePlugin): @@ -22,4 +23,4 @@ class ValidateMayaColorSpace(pyblish.api.InstancePlugin): maketx = instance.data["maketx"] if ocio_maya and maketx: - raise RuntimeError("Maya is color managed and maketx option is on. OpenPype doesn't support this combination yet.") # noqa + raise PublishValidationError("Maya is color managed and maketx option is on. OpenPype doesn't support this combination yet.") # noqa From 3cb530ce6048bf2e5cb85798b66d11893ba7acfb Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 22 Feb 2023 22:19:47 +0800 Subject: [PATCH 367/912] bug fix for not being able to remove item in scene inventory --- openpype/hosts/max/plugins/load/load_pointcache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/max/plugins/load/load_pointcache.py b/openpype/hosts/max/plugins/load/load_pointcache.py index 65d0662faa..f7a72ece25 100644 --- a/openpype/hosts/max/plugins/load/load_pointcache.py +++ b/openpype/hosts/max/plugins/load/load_pointcache.py @@ -80,7 +80,7 @@ importFile @"{file_path}" #noPrompt def remove(self, container): from pymxs import runtime as rt - node = container["node"] + node = rt.getNodeByName(container["instance_node"]) rt.delete(node) @staticmethod From 6860d6dcfeac07138887ea34ffbe2e56d102b098 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 22 Feb 2023 22:51:15 +0800 Subject: [PATCH 368/912] bug fix for not being able to remove item in scene inventory --- .../hosts/max/plugins/load/load_camera_fbx.py | 27 ++++++++++++++---- .../hosts/max/plugins/load/load_max_scene.py | 28 +++++++++++++------ 2 files changed, 41 insertions(+), 14 deletions(-) diff --git a/openpype/hosts/max/plugins/load/load_camera_fbx.py b/openpype/hosts/max/plugins/load/load_camera_fbx.py index 1b1df364c1..23933b29e6 100644 --- a/openpype/hosts/max/plugins/load/load_camera_fbx.py +++ b/openpype/hosts/max/plugins/load/load_camera_fbx.py @@ -1,7 +1,10 @@ import os from openpype.pipeline import ( - load + load, + get_representation_path ) +from openpype.hosts.max.api.pipeline import containerise +from openpype.hosts.max.api import lib class FbxLoader(load.LoaderPlugin): @@ -36,14 +39,26 @@ importFile @"{filepath}" #noPrompt using:FBXIMP container_name = f"{name}_CON" asset = rt.getNodeByName(f"{name}") - # rename the container with "_CON" - container = rt.container(name=container_name) - asset.Parent = container - return container + return containerise( + name, [asset], context, loader=self.__class__.__name__) + + def update(self, container, representation): + from pymxs import runtime as rt + + path = get_representation_path(representation) + node = rt.getNodeByName(container["instance_node"]) + + alembic_objects = self.get_container_children(node, "AlembicObject") + for alembic_object in alembic_objects: + alembic_object.source = path + + lib.imprint(container["instance_node"], { + "representation": str(representation["_id"]) + }) def remove(self, container): from pymxs import runtime as rt - node = container["node"] + node = rt.getNodeByName(container["instance_node"]) rt.delete(node) diff --git a/openpype/hosts/max/plugins/load/load_max_scene.py b/openpype/hosts/max/plugins/load/load_max_scene.py index 57f172cf6a..57a74c7ad7 100644 --- a/openpype/hosts/max/plugins/load/load_max_scene.py +++ b/openpype/hosts/max/plugins/load/load_max_scene.py @@ -1,7 +1,9 @@ import os from openpype.pipeline import ( - load + load, get_representation_path ) +from openpype.hosts.max.api.pipeline import containerise +from openpype.hosts.max.api import lib class MaxSceneLoader(load.LoaderPlugin): @@ -35,16 +37,26 @@ class MaxSceneLoader(load.LoaderPlugin): self.log.error("Something failed when loading.") max_container = max_containers.pop() - container_name = f"{name}_CON" - # rename the container with "_CON" - # get the original container - container = rt.container(name=container_name) - max_container.Parent = container - return container + return containerise( + name, [max_container], context, loader=self.__class__.__name__) + + def update(self, container, representation): + from pymxs import runtime as rt + + path = get_representation_path(representation) + node = rt.getNodeByName(container["instance_node"]) + + alembic_objects = self.get_container_children(node, "AlembicObject") + for alembic_object in alembic_objects: + alembic_object.source = path + + lib.imprint(container["instance_node"], { + "representation": str(representation["_id"]) + }) def remove(self, container): from pymxs import runtime as rt - node = container["node"] + node = rt.getNodeByName(container["instance_node"]) rt.delete(node) From 0ef87d0949105a386ba4e3200e421ee1af130176 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 22 Feb 2023 23:46:34 +0800 Subject: [PATCH 369/912] renaming some variables --- openpype/hosts/max/plugins/load/load_camera_fbx.py | 6 +++--- openpype/hosts/max/plugins/load/load_max_scene.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/max/plugins/load/load_camera_fbx.py b/openpype/hosts/max/plugins/load/load_camera_fbx.py index 23933b29e6..e6eac25cfc 100644 --- a/openpype/hosts/max/plugins/load/load_camera_fbx.py +++ b/openpype/hosts/max/plugins/load/load_camera_fbx.py @@ -49,9 +49,9 @@ importFile @"{filepath}" #noPrompt using:FBXIMP path = get_representation_path(representation) node = rt.getNodeByName(container["instance_node"]) - alembic_objects = self.get_container_children(node, "AlembicObject") - for alembic_object in alembic_objects: - alembic_object.source = path + fbx_objects = self.get_container_children(node, "AlembicObject") + for fbx_object in fbx_objects: + fbx_object.source = path lib.imprint(container["instance_node"], { "representation": str(representation["_id"]) diff --git a/openpype/hosts/max/plugins/load/load_max_scene.py b/openpype/hosts/max/plugins/load/load_max_scene.py index 57a74c7ad7..13cf1e6019 100644 --- a/openpype/hosts/max/plugins/load/load_max_scene.py +++ b/openpype/hosts/max/plugins/load/load_max_scene.py @@ -47,9 +47,9 @@ class MaxSceneLoader(load.LoaderPlugin): path = get_representation_path(representation) node = rt.getNodeByName(container["instance_node"]) - alembic_objects = self.get_container_children(node, "AlembicObject") - for alembic_object in alembic_objects: - alembic_object.source = path + max_objects = self.get_container_children(node, "AlembicObject") + for max_object in max_objects: + max_object.source = path lib.imprint(container["instance_node"], { "representation": str(representation["_id"]) From 810b57ffb190434aa433511c17aa38c792aac618 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 22 Feb 2023 23:58:02 +0800 Subject: [PATCH 370/912] renaming some variables --- openpype/hosts/max/plugins/load/load_camera_fbx.py | 2 +- openpype/hosts/max/plugins/load/load_max_scene.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/max/plugins/load/load_camera_fbx.py b/openpype/hosts/max/plugins/load/load_camera_fbx.py index e6eac25cfc..3a6947798e 100644 --- a/openpype/hosts/max/plugins/load/load_camera_fbx.py +++ b/openpype/hosts/max/plugins/load/load_camera_fbx.py @@ -49,7 +49,7 @@ importFile @"{filepath}" #noPrompt using:FBXIMP path = get_representation_path(representation) node = rt.getNodeByName(container["instance_node"]) - fbx_objects = self.get_container_children(node, "AlembicObject") + fbx_objects = self.get_container_children(node) for fbx_object in fbx_objects: fbx_object.source = path diff --git a/openpype/hosts/max/plugins/load/load_max_scene.py b/openpype/hosts/max/plugins/load/load_max_scene.py index 13cf1e6019..b863b9363f 100644 --- a/openpype/hosts/max/plugins/load/load_max_scene.py +++ b/openpype/hosts/max/plugins/load/load_max_scene.py @@ -47,7 +47,7 @@ class MaxSceneLoader(load.LoaderPlugin): path = get_representation_path(representation) node = rt.getNodeByName(container["instance_node"]) - max_objects = self.get_container_children(node, "AlembicObject") + max_objects = self.get_container_children(node) for max_object in max_objects: max_object.source = path From 9bf7246f52e085c8bd61816b0516c72f275536c3 Mon Sep 17 00:00:00 2001 From: Fabia Serra Arrizabalaga Date: Tue, 21 Feb 2023 18:43:28 +0100 Subject: [PATCH 371/912] Fix typos --- .../nuke/plugins/publish/extract_review_data.py | 2 +- .../plugins/publish/submit_publish_job.py | 16 ++++++++-------- .../publish/integrate_shotgrid_publish.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/openpype/hosts/nuke/plugins/publish/extract_review_data.py b/openpype/hosts/nuke/plugins/publish/extract_review_data.py index 3c85b21b08..dee8248295 100644 --- a/openpype/hosts/nuke/plugins/publish/extract_review_data.py +++ b/openpype/hosts/nuke/plugins/publish/extract_review_data.py @@ -23,7 +23,7 @@ class ExtractReviewData(publish.Extractor): representations = instance.data.get("representations", []) # review can be removed since `ProcessSubmittedJobOnFarm` will create - # reviable representation if needed + # reviewable representation if needed if ( "render.farm" in instance.data["families"] and "review" in instance.data["families"] diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index c7a559466c..b8edd0f161 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -194,7 +194,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): metadata_path = os.path.join(output_dir, metadata_filename) # Convert output dir to `{root}/rest/of/path/...` with Anatomy - success, roothless_mtdt_p = self.anatomy.find_root_template_from_path( + success, rootless_mtdt_p = self.anatomy.find_root_template_from_path( metadata_path) if not success: # `rootless_path` is not set to `output_dir` if none of roots match @@ -202,9 +202,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): "Could not find root path for remapping \"{}\"." " This may cause issues on farm." ).format(output_dir)) - roothless_mtdt_p = metadata_path + rootless_mtdt_p = metadata_path - return metadata_path, roothless_mtdt_p + return metadata_path, rootless_mtdt_p def _submit_deadline_post_job(self, instance, job, instances): """Submit publish job to Deadline. @@ -237,7 +237,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): # Transfer the environment from the original job to this dependent # job so they use the same environment - metadata_path, roothless_metadata_path = \ + metadata_path, rootless_metadata_path = \ self._create_metadata_path(instance) environment = { @@ -274,7 +274,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): args = [ "--headless", 'publish', - roothless_metadata_path, + rootless_metadata_path, "--targets", "deadline", "--targets", "farm" ] @@ -588,7 +588,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): host_name = os.environ.get("AVALON_APP", "") collections, remainders = clique.assemble(exp_files) - # create representation for every collected sequento ce + # create representation for every collected sequence for collection in collections: ext = collection.tail.lstrip(".") preview = False @@ -656,7 +656,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): self._solve_families(instance, preview) - # add reminders as representations + # add remainders as representations for remainder in remainders: ext = remainder.split(".")[-1] @@ -1060,7 +1060,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): } publish_job.update({"ftrack": ftrack}) - metadata_path, roothless_metadata_path = self._create_metadata_path( + metadata_path, rootless_metadata_path = self._create_metadata_path( instance) self.log.info("Writing json file: {}".format(metadata_path)) diff --git a/openpype/modules/shotgrid/plugins/publish/integrate_shotgrid_publish.py b/openpype/modules/shotgrid/plugins/publish/integrate_shotgrid_publish.py index fc15d5515f..a1eb2e188c 100644 --- a/openpype/modules/shotgrid/plugins/publish/integrate_shotgrid_publish.py +++ b/openpype/modules/shotgrid/plugins/publish/integrate_shotgrid_publish.py @@ -7,7 +7,7 @@ from openpype.pipeline.publish import get_publish_repre_path class IntegrateShotgridPublish(pyblish.api.InstancePlugin): """ Create published Files from representations and add it to version. If - representation is tagged add shotgrid review, it will add it in + representation is tagged as shotgrid review, it will add it in path to movie for a movie file or path to frame for an image sequence. """ From e5ebc8566376bf3be30e3b2be27b72ad2c237538 Mon Sep 17 00:00:00 2001 From: Fabia Serra Arrizabalaga Date: Tue, 21 Feb 2023 18:44:15 +0100 Subject: [PATCH 372/912] Add OPENPYPE_SG_USER environment variable to deadline submission env --- .../modules/deadline/plugins/publish/submit_nuke_deadline.py | 3 ++- .../modules/deadline/plugins/publish/submit_publish_job.py | 3 ++- .../shotgrid/plugins/publish/collect_shotgrid_session.py | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py index cca2a4d896..faa66effbd 100644 --- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py @@ -266,7 +266,8 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): "PYBLISHPLUGINPATH", "NUKE_PATH", "TOOL_ENV", - "FOUNDRY_LICENSE" + "FOUNDRY_LICENSE", + "OPENPYPE_SG_USER", ] # Add OpenPype version if we are running from build. diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index b8edd0f161..afab041b7d 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -139,7 +139,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): "FTRACK_API_KEY", "FTRACK_SERVER", "AVALON_APP_NAME", - "OPENPYPE_USERNAME" + "OPENPYPE_USERNAME", + "OPENPYPE_SG_USER", ] # Add OpenPype version if we are running from build. diff --git a/openpype/modules/shotgrid/plugins/publish/collect_shotgrid_session.py b/openpype/modules/shotgrid/plugins/publish/collect_shotgrid_session.py index 9d5d2271bf..74f039ba22 100644 --- a/openpype/modules/shotgrid/plugins/publish/collect_shotgrid_session.py +++ b/openpype/modules/shotgrid/plugins/publish/collect_shotgrid_session.py @@ -83,6 +83,10 @@ class CollectShotgridSession(pyblish.api.ContextPlugin): "login to shotgrid withing openpype Tray" ) + # Set OPENPYPE_SG_USER with login so other deadline tasks can make use of it + self.log.info("Setting OPENPYPE_SG_USER to '%s'.", login) + os.environ["OPENPYPE_SG_USER"] = login + session = shotgun_api3.Shotgun( base_url=shotgrid_url, script_name=shotgrid_script_name, From 35e4313ddbd21161e2f14073caea63a1608be499 Mon Sep 17 00:00:00 2001 From: Fabia Serra Arrizabalaga Date: Tue, 21 Feb 2023 18:44:34 +0100 Subject: [PATCH 373/912] Fix typo on function as 'fill_roots' doesn't exist --- openpype/modules/deadline/plugins/publish/submit_publish_job.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index afab041b7d..84092a3bb2 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -412,7 +412,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): assert fn is not None, "padding string wasn't found" # list of tuples (source, destination) staging = representation.get("stagingDir") - staging = self.anatomy.fill_roots(staging) + staging = self.anatomy.fill_root(staging) resource_files.append( (frame, os.path.join(staging, From 03c64a7290a0159fcacea503ad85f5692041a922 Mon Sep 17 00:00:00 2001 From: Fabia Serra Arrizabalaga Date: Tue, 21 Feb 2023 18:44:56 +0100 Subject: [PATCH 374/912] Set staging dir with rootless syntax like the other representations --- openpype/modules/deadline/plugins/publish/submit_publish_job.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 84092a3bb2..8748da1b35 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -677,7 +677,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): "name": ext, "ext": ext, "files": os.path.basename(remainder), - "stagingDir": os.path.dirname(remainder), + "stagingDir": staging, } preview = match_aov_pattern( From 271b19a90d6a4599c08917f6be78eea182d324fa Mon Sep 17 00:00:00 2001 From: Fabia Serra Arrizabalaga Date: Tue, 21 Feb 2023 18:45:18 +0100 Subject: [PATCH 375/912] Move variable initialization closer to its use --- .../shotgrid/plugins/publish/integrate_shotgrid_publish.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/modules/shotgrid/plugins/publish/integrate_shotgrid_publish.py b/openpype/modules/shotgrid/plugins/publish/integrate_shotgrid_publish.py index a1eb2e188c..ad400572c9 100644 --- a/openpype/modules/shotgrid/plugins/publish/integrate_shotgrid_publish.py +++ b/openpype/modules/shotgrid/plugins/publish/integrate_shotgrid_publish.py @@ -27,11 +27,11 @@ class IntegrateShotgridPublish(pyblish.api.InstancePlugin): local_path = get_publish_repre_path( instance, representation, False ) - code = os.path.basename(local_path) if representation.get("tags", []): continue + code = os.path.basename(local_path) published_file = self._find_existing_publish( code, context, shotgrid_version ) From ab5ef5469f355175094312c4815d018b1479a5a3 Mon Sep 17 00:00:00 2001 From: Fabia Serra Arrizabalaga Date: Tue, 21 Feb 2023 18:46:13 +0100 Subject: [PATCH 376/912] Fix code so it doesn't error out when 'intent' attribute returns None or empty string --- .../shotgrid/plugins/publish/integrate_shotgrid_version.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/modules/shotgrid/plugins/publish/integrate_shotgrid_version.py b/openpype/modules/shotgrid/plugins/publish/integrate_shotgrid_version.py index adfdca718c..e1fa0c5174 100644 --- a/openpype/modules/shotgrid/plugins/publish/integrate_shotgrid_version.py +++ b/openpype/modules/shotgrid/plugins/publish/integrate_shotgrid_version.py @@ -37,9 +37,9 @@ class IntegrateShotgridVersion(pyblish.api.InstancePlugin): self.log.info("Use existing Shotgrid version: {}".format(version)) data_to_update = {} - status = context.data.get("intent", {}).get("value") - if status: - data_to_update["sg_status_list"] = status + intent = context.data.get("intent") + if intent: + data_to_update["sg_status_list"] = intent["value"] for representation in instance.data.get("representations", []): local_path = get_publish_repre_path( From 7dd5c42ec9f46ebc83245fec9eb867290c8babde Mon Sep 17 00:00:00 2001 From: Fabia Serra Arrizabalaga Date: Tue, 21 Feb 2023 18:46:36 +0100 Subject: [PATCH 377/912] Load plugin modules with importlib so we can debug symbols --- openpype/pipeline/publish/lib.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/openpype/pipeline/publish/lib.py b/openpype/pipeline/publish/lib.py index bbc511fc5a..313e80a02b 100644 --- a/openpype/pipeline/publish/lib.py +++ b/openpype/pipeline/publish/lib.py @@ -5,6 +5,7 @@ import inspect import copy import tempfile import xml.etree.ElementTree +import importlib import six import pyblish.plugin @@ -305,8 +306,15 @@ def publish_plugins_discover(paths=None): module.__file__ = abspath try: - with open(abspath, "rb") as f: - six.exec_(f.read(), module.__dict__) + if six.PY3: + # Use loader so module has full specs + module_loader = importlib.machinery.SourceFileLoader( + mod_name, abspath + ) + module_loader.exec_module(module) + else: + with open(abspath, "rb") as f: + six.exec_(f.read(), module.__dict__) # Store reference to original module, to avoid # garbage collection from collecting it's global From 0b811854ba67c23e6c8746d7776e5662a437fb57 Mon Sep 17 00:00:00 2001 From: Fabia Serra Arrizabalaga Date: Tue, 21 Feb 2023 18:47:03 +0100 Subject: [PATCH 378/912] Expand stating dir paths on integrate plugin so it doesn't error out with rootless paths --- openpype/pipeline/publish/lib.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/openpype/pipeline/publish/lib.py b/openpype/pipeline/publish/lib.py index 313e80a02b..c563bc8207 100644 --- a/openpype/pipeline/publish/lib.py +++ b/openpype/pipeline/publish/lib.py @@ -691,6 +691,12 @@ def get_publish_repre_path(instance, repre, only_published=False): staging_dir = repre.get("stagingDir") if not staging_dir: staging_dir = get_instance_staging_dir(instance) + + # Expand the staging dir path in case it's been stored with the root + # template syntax + anatomy = instance.context.data.get("anatomy") + staging_dir = anatomy.fill_root(staging_dir) + src_path = os.path.normpath(os.path.join(staging_dir, filename)) if os.path.exists(src_path): return src_path From f9dc9f892076cb1ee8570ad04d6cd2c203dbc309 Mon Sep 17 00:00:00 2001 From: Fabia Serra Arrizabalaga Date: Tue, 21 Feb 2023 18:47:19 +0100 Subject: [PATCH 379/912] Protect code for cases where 'Frames' key doesn't exist --- .../plugins/publish/validate_expected_and_rendered_files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py index f0a3ddd246..f34f71d213 100644 --- a/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py +++ b/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py @@ -91,7 +91,7 @@ class ValidateExpectedFiles(pyblish.api.InstancePlugin): for job_id in render_job_ids: job_info = self._get_job_info(job_id) - frame_list = job_info["Props"]["Frames"] + frame_list = job_info["Props"].get("Frames") if frame_list: all_frame_lists.extend(frame_list.split(',')) From f62e6c9c50327cc3f6869c635693900427ec0206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A0=20Serra=20Arrizabalaga?= Date: Tue, 21 Feb 2023 22:09:47 +0100 Subject: [PATCH 380/912] Break line so it fits under 79 chars --- .../shotgrid/plugins/publish/collect_shotgrid_session.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/modules/shotgrid/plugins/publish/collect_shotgrid_session.py b/openpype/modules/shotgrid/plugins/publish/collect_shotgrid_session.py index 74f039ba22..acfd6d1820 100644 --- a/openpype/modules/shotgrid/plugins/publish/collect_shotgrid_session.py +++ b/openpype/modules/shotgrid/plugins/publish/collect_shotgrid_session.py @@ -83,7 +83,8 @@ class CollectShotgridSession(pyblish.api.ContextPlugin): "login to shotgrid withing openpype Tray" ) - # Set OPENPYPE_SG_USER with login so other deadline tasks can make use of it + # Set OPENPYPE_SG_USER with login so other deadline tasks can make + # use of it self.log.info("Setting OPENPYPE_SG_USER to '%s'.", login) os.environ["OPENPYPE_SG_USER"] = login From bfbfdf7067703226c921916d2e4bbd1e0bd14854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A0=20Serra=20Arrizabalaga?= Date: Tue, 21 Feb 2023 23:33:28 +0100 Subject: [PATCH 381/912] Use dict indexing instead of .get to assert existence Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- openpype/pipeline/publish/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/pipeline/publish/lib.py b/openpype/pipeline/publish/lib.py index c563bc8207..5dce74156b 100644 --- a/openpype/pipeline/publish/lib.py +++ b/openpype/pipeline/publish/lib.py @@ -694,7 +694,7 @@ def get_publish_repre_path(instance, repre, only_published=False): # Expand the staging dir path in case it's been stored with the root # template syntax - anatomy = instance.context.data.get("anatomy") + anatomy = instance.context.data["anatomy"] staging_dir = anatomy.fill_root(staging_dir) src_path = os.path.normpath(os.path.join(staging_dir, filename)) From 574f8d2c6d5701b59b4d824310d88fb029e3f110 Mon Sep 17 00:00:00 2001 From: Fabia Serra Arrizabalaga Date: Tue, 21 Feb 2023 23:43:21 +0100 Subject: [PATCH 382/912] Make use of openpype.lib.import_filepath function --- openpype/pipeline/publish/lib.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/openpype/pipeline/publish/lib.py b/openpype/pipeline/publish/lib.py index 5dce74156b..c51a96f2be 100644 --- a/openpype/pipeline/publish/lib.py +++ b/openpype/pipeline/publish/lib.py @@ -13,6 +13,7 @@ import pyblish.api from openpype.lib import ( Logger, + import_filepath, filter_profiles ) from openpype.settings import ( @@ -302,19 +303,8 @@ def publish_plugins_discover(paths=None): if not mod_ext == ".py": continue - module = types.ModuleType(mod_name) - module.__file__ = abspath - try: - if six.PY3: - # Use loader so module has full specs - module_loader = importlib.machinery.SourceFileLoader( - mod_name, abspath - ) - module_loader.exec_module(module) - else: - with open(abspath, "rb") as f: - six.exec_(f.read(), module.__dict__) + module = import_filepath(abspath) # Store reference to original module, to avoid # garbage collection from collecting it's global From c41a3b1cb851e3ce4e7c2954b8d20147a98d16e5 Mon Sep 17 00:00:00 2001 From: Fabia Serra Arrizabalaga Date: Wed, 22 Feb 2023 00:43:26 +0100 Subject: [PATCH 383/912] Pass module name and set __file__ on module to avoid AttributeErrors saying module has no __file__ attribute --- openpype/lib/python_module_tools.py | 2 +- openpype/pipeline/publish/lib.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/lib/python_module_tools.py b/openpype/lib/python_module_tools.py index 6fad3b547f..9e8e94842c 100644 --- a/openpype/lib/python_module_tools.py +++ b/openpype/lib/python_module_tools.py @@ -28,6 +28,7 @@ def import_filepath(filepath, module_name=None): # Prepare module object where content of file will be parsed module = types.ModuleType(module_name) + module.__file__ = filepath if six.PY3: # Use loader so module has full specs @@ -41,7 +42,6 @@ def import_filepath(filepath, module_name=None): # Execute content and store it to module object six.exec_(_stream.read(), module.__dict__) - module.__file__ = filepath return module diff --git a/openpype/pipeline/publish/lib.py b/openpype/pipeline/publish/lib.py index c51a96f2be..7dcfec4ebc 100644 --- a/openpype/pipeline/publish/lib.py +++ b/openpype/pipeline/publish/lib.py @@ -304,7 +304,7 @@ def publish_plugins_discover(paths=None): continue try: - module = import_filepath(abspath) + module = import_filepath(abspath, mod_name) # Store reference to original module, to avoid # garbage collection from collecting it's global From a946eae6c413e64f50e96594e292906cc769f1d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A0=20Serra=20Arrizabalaga?= Date: Wed, 22 Feb 2023 12:49:05 +0100 Subject: [PATCH 384/912] Remove unused module --- openpype/pipeline/publish/lib.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/pipeline/publish/lib.py b/openpype/pipeline/publish/lib.py index 7dcfec4ebc..1ec641bac4 100644 --- a/openpype/pipeline/publish/lib.py +++ b/openpype/pipeline/publish/lib.py @@ -5,7 +5,6 @@ import inspect import copy import tempfile import xml.etree.ElementTree -import importlib import six import pyblish.plugin From 36b7fa32df20c9640ccda6a81ed61766017d607c Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 22 Feb 2023 17:33:20 +0100 Subject: [PATCH 385/912] OP-4643 - added explicit enum for transcoding type As transcoding info (colorspace, display) might be collected from DCC, it must be explicit which should be used. --- openpype/lib/transcoding.py | 2 +- .../plugins/publish/extract_color_transcode.py | 15 +++++++++++---- .../schemas/schema_global_publish.json | 9 +++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 8a80e88d3a..42db374402 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1044,7 +1044,7 @@ def convert_colorspace( output_path, config_path, source_colorspace, - target_colorspace, + target_colorspace=None, view=None, display=None, additional_command_args=None, diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 456e40008d..b0921688e9 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -118,10 +118,17 @@ class ExtractOIIOTranscode(publish.Extractor): output_name, output_extension) - target_colorspace = output_def["colorspace"] - view = output_def["view"] or colorspace_data.get("view") - display = (output_def["display"] or - colorspace_data.get("display")) + transcoding_type = output_def["transcoding_type"] + + target_colorspace = view = display = None + if transcoding_type == "colorspace": + target_colorspace = (output_def["colorspace"] or + colorspace_data.get("colorspace")) + else: + view = output_def["view"] or colorspace_data.get("view") + display = (output_def["display"] or + colorspace_data.get("display")) + # both could be already collected by DCC, # but could be overwritten if view: diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 3e9467af61..76574e8b9b 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -271,6 +271,15 @@ "label": "Extension", "type": "text" }, + { + "type": "enum", + "key": "transcoding_type", + "label": "Transcoding type", + "enum_items": [ + { "colorspace": "Use Colorspace" }, + { "display": "Use Display&View" } + ] + }, { "key": "colorspace", "label": "Colorspace", From 90afe4185110f2571242007f88566be7dce78dff Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 22 Feb 2023 17:34:03 +0100 Subject: [PATCH 386/912] OP-4643 - added explicit enum for transcoding type As transcoding info (colorspace, display) might be collected from DCC, it must be explicit which should be used. --- .../assets/global_oiio_transcode.png | Bin 29010 -> 17936 bytes .../settings_project_global.md | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/website/docs/project_settings/assets/global_oiio_transcode.png b/website/docs/project_settings/assets/global_oiio_transcode.png index 99396d5bb3f16d434a92c6079515128488b82489..d818ecfe19f93366e5f4664734d68c7b448d7b4f 100644 GIT binary patch literal 17936 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 DbV~re literal 29010 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 diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 9e2ee187cc..6e78ee5d45 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -53,8 +53,9 @@ OIIOTools transcoder plugin with configurable output presets. Any incoming repre Notable parameters: - **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. - **`Extension`** - target extension. If left empty, original extension is used. -- **`Colorspace`** - target colorspace, which must be available in used color config. -- **`Display & View`** - transcoding into colorspace or into display and viewer space could be used. Cannot use both `Colorspace` and `Display & View` at the same time. +- **`Transcoding type`** - transcoding into colorspace or into display and viewer space could be used. Cannot use both at the same time. +- **`Colorspace`** - target colorspace, which must be available in used color config. (If `Transcoding type` is `Use Colorspace` value in configuration is used OR if empty value collected on instance from DCC). +- **`Display & View`** - display and viewer colorspace. (If `Transcoding type` is `Use Display&View` values in configuration is used OR if empty values collected on instance from DCC). - **`Arguments`** - special additional command line arguments for `oiiotool`. From 1594d7753728820b4d84568c7c5fe80aaa0ebbab Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 22 Feb 2023 17:42:07 +0100 Subject: [PATCH 387/912] OP-4643 - added use case for Maya to documentation --- .../assets/global_oiio_transcode2.png | Bin 0 -> 17960 bytes .../project_settings/settings_project_global.md | 3 +++ 2 files changed, 3 insertions(+) create mode 100644 website/docs/project_settings/assets/global_oiio_transcode2.png diff --git a/website/docs/project_settings/assets/global_oiio_transcode2.png b/website/docs/project_settings/assets/global_oiio_transcode2.png new file mode 100644 index 0000000000000000000000000000000000000000..906f780830a96b4bc6f26d98484dd3f9cc3885f2 GIT binary patch literal 17960 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 F{{cSxQDp!C literal 0 HcmV?d00001 diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 6e78ee5d45..f58d2c2bf2 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -62,6 +62,9 @@ Notable parameters: Example here describes use case for creation of new color coded review of png image sequence. Original representation's files are kept intact, review is created from transcoded files, but these files are removed in cleanup process. ![global_oiio_transcode](assets/global_oiio_transcode.png) +Another use case is to transcode in Maya only `beauty` render layers and use collected `Display` and `View` colorspaces from DCC. +![global_oiio_transcode_in_Maya](assets/global_oiio_transcode.png) + ## Profile filters Many of the settings are using a concept of **Profile filters** From 9a44a8fd7d1d5cf4102066e12c56696769609f2b Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 14:00:14 +0100 Subject: [PATCH 388/912] save default settings with newline character at the end of file --- openpype/settings/entities/root_entities.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/settings/entities/root_entities.py b/openpype/settings/entities/root_entities.py index ff76fa5180..f2e24fb522 100644 --- a/openpype/settings/entities/root_entities.py +++ b/openpype/settings/entities/root_entities.py @@ -440,8 +440,9 @@ class RootEntity(BaseItemEntity): os.makedirs(dirpath) self.log.debug("Saving data to: {}\n{}".format(subpath, value)) + data = json.dumps(value, indent=4) + "\n" with open(output_path, "w") as file_stream: - json.dump(value, file_stream, indent=4) + file_stream.write(data) dynamic_values_item = self.collect_dynamic_schema_entities() dynamic_values_item.save_values() From 974510044611ea05c58f6ef2f5eb70095ea122de Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 14:50:56 +0100 Subject: [PATCH 389/912] resave default settings --- openpype/settings/defaults/project_anatomy/attributes.json | 2 +- openpype/settings/defaults/project_anatomy/imageio.json | 2 +- openpype/settings/defaults/project_anatomy/roots.json | 2 +- openpype/settings/defaults/project_anatomy/tasks.json | 2 +- openpype/settings/defaults/project_anatomy/templates.json | 2 +- .../settings/defaults/project_settings/aftereffects.json | 2 +- openpype/settings/defaults/project_settings/blender.json | 2 +- openpype/settings/defaults/project_settings/celaction.json | 2 +- openpype/settings/defaults/project_settings/flame.json | 2 +- openpype/settings/defaults/project_settings/ftrack.json | 2 +- openpype/settings/defaults/project_settings/fusion.json | 2 +- openpype/settings/defaults/project_settings/global.json | 2 +- openpype/settings/defaults/project_settings/harmony.json | 2 +- openpype/settings/defaults/project_settings/hiero.json | 2 +- openpype/settings/defaults/project_settings/houdini.json | 2 +- openpype/settings/defaults/project_settings/kitsu.json | 2 +- openpype/settings/defaults/project_settings/max.json | 2 +- openpype/settings/defaults/project_settings/maya.json | 2 +- openpype/settings/defaults/project_settings/nuke.json | 2 +- openpype/settings/defaults/project_settings/photoshop.json | 2 +- openpype/settings/defaults/project_settings/resolve.json | 2 +- .../settings/defaults/project_settings/royalrender.json | 2 +- openpype/settings/defaults/project_settings/shotgrid.json | 2 +- openpype/settings/defaults/project_settings/slack.json | 2 +- .../defaults/project_settings/standalonepublisher.json | 2 +- .../settings/defaults/project_settings/traypublisher.json | 2 +- openpype/settings/defaults/project_settings/tvpaint.json | 2 +- openpype/settings/defaults/project_settings/unreal.json | 2 +- .../settings/defaults/project_settings/webpublisher.json | 2 +- .../settings/defaults/system_settings/applications.json | 6 ++++-- openpype/settings/defaults/system_settings/general.json | 2 +- openpype/settings/defaults/system_settings/modules.json | 2 +- openpype/settings/defaults/system_settings/tools.json | 2 +- 33 files changed, 36 insertions(+), 34 deletions(-) diff --git a/openpype/settings/defaults/project_anatomy/attributes.json b/openpype/settings/defaults/project_anatomy/attributes.json index bf8bbef8de..0cc414fb69 100644 --- a/openpype/settings/defaults/project_anatomy/attributes.json +++ b/openpype/settings/defaults/project_anatomy/attributes.json @@ -23,4 +23,4 @@ ], "tools_env": [], "active": true -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_anatomy/imageio.json b/openpype/settings/defaults/project_anatomy/imageio.json index caa2a8a206..d38d0a0774 100644 --- a/openpype/settings/defaults/project_anatomy/imageio.json +++ b/openpype/settings/defaults/project_anatomy/imageio.json @@ -255,4 +255,4 @@ ] } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_anatomy/roots.json b/openpype/settings/defaults/project_anatomy/roots.json index ce295e946f..8171d17d56 100644 --- a/openpype/settings/defaults/project_anatomy/roots.json +++ b/openpype/settings/defaults/project_anatomy/roots.json @@ -4,4 +4,4 @@ "darwin": "/Volumes/path", "linux": "/mnt/share/projects" } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_anatomy/tasks.json b/openpype/settings/defaults/project_anatomy/tasks.json index 74504cc4d7..135462839f 100644 --- a/openpype/settings/defaults/project_anatomy/tasks.json +++ b/openpype/settings/defaults/project_anatomy/tasks.json @@ -41,4 +41,4 @@ "Compositing": { "short_name": "comp" } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_anatomy/templates.json b/openpype/settings/defaults/project_anatomy/templates.json index 32230e0625..99a869963b 100644 --- a/openpype/settings/defaults/project_anatomy/templates.json +++ b/openpype/settings/defaults/project_anatomy/templates.json @@ -66,4 +66,4 @@ "source": "source" } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/aftereffects.json b/openpype/settings/defaults/project_settings/aftereffects.json index e4b957fb85..669e1db0b8 100644 --- a/openpype/settings/defaults/project_settings/aftereffects.json +++ b/openpype/settings/defaults/project_settings/aftereffects.json @@ -33,4 +33,4 @@ "create_first_version": false, "custom_templates": [] } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/blender.json b/openpype/settings/defaults/project_settings/blender.json index 3585d2ad0a..fe05f94590 100644 --- a/openpype/settings/defaults/project_settings/blender.json +++ b/openpype/settings/defaults/project_settings/blender.json @@ -82,4 +82,4 @@ "active": false } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/celaction.json b/openpype/settings/defaults/project_settings/celaction.json index ad01e62d95..bdba6d7322 100644 --- a/openpype/settings/defaults/project_settings/celaction.json +++ b/openpype/settings/defaults/project_settings/celaction.json @@ -16,4 +16,4 @@ "anatomy_template_key_metadata": "render" } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/flame.json b/openpype/settings/defaults/project_settings/flame.json index cbd99c4560..3190bdb3bf 100644 --- a/openpype/settings/defaults/project_settings/flame.json +++ b/openpype/settings/defaults/project_settings/flame.json @@ -163,4 +163,4 @@ ] } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/ftrack.json b/openpype/settings/defaults/project_settings/ftrack.json index ec48ba52ea..4ca4a35d1f 100644 --- a/openpype/settings/defaults/project_settings/ftrack.json +++ b/openpype/settings/defaults/project_settings/ftrack.json @@ -496,4 +496,4 @@ "farm_status_profiles": [] } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/fusion.json b/openpype/settings/defaults/project_settings/fusion.json index 720178e17a..954606820a 100644 --- a/openpype/settings/defaults/project_settings/fusion.json +++ b/openpype/settings/defaults/project_settings/fusion.json @@ -17,4 +17,4 @@ } } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index 0e078dc157..cedc2d6876 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -607,4 +607,4 @@ "linux": [] }, "project_environments": {} -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/harmony.json b/openpype/settings/defaults/project_settings/harmony.json index 1f4ea88272..3f51a9c28b 100644 --- a/openpype/settings/defaults/project_settings/harmony.json +++ b/openpype/settings/defaults/project_settings/harmony.json @@ -50,4 +50,4 @@ "skip_timelines_check": [] } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/hiero.json b/openpype/settings/defaults/project_settings/hiero.json index c6180d0a58..0412967eaa 100644 --- a/openpype/settings/defaults/project_settings/hiero.json +++ b/openpype/settings/defaults/project_settings/hiero.json @@ -97,4 +97,4 @@ } ] } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/houdini.json b/openpype/settings/defaults/project_settings/houdini.json index 68cc8945fe..1b7faf8526 100644 --- a/openpype/settings/defaults/project_settings/houdini.json +++ b/openpype/settings/defaults/project_settings/houdini.json @@ -76,4 +76,4 @@ "active": true } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/kitsu.json b/openpype/settings/defaults/project_settings/kitsu.json index 3a9723b9c0..95b3da04ae 100644 --- a/openpype/settings/defaults/project_settings/kitsu.json +++ b/openpype/settings/defaults/project_settings/kitsu.json @@ -10,4 +10,4 @@ "note_status_shortname": "wfa" } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/max.json b/openpype/settings/defaults/project_settings/max.json index 84e0c7dba7..667b42411d 100644 --- a/openpype/settings/defaults/project_settings/max.json +++ b/openpype/settings/defaults/project_settings/max.json @@ -5,4 +5,4 @@ "image_format": "exr", "multipass": true } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index 03c2d325bb..b590a56da6 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -1103,4 +1103,4 @@ "ValidateNoAnimation": false } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/nuke.json b/openpype/settings/defaults/project_settings/nuke.json index 2999d1427d..d475c337d9 100644 --- a/openpype/settings/defaults/project_settings/nuke.json +++ b/openpype/settings/defaults/project_settings/nuke.json @@ -533,4 +533,4 @@ "profiles": [] }, "filters": {} -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/photoshop.json b/openpype/settings/defaults/project_settings/photoshop.json index cdfab0c439..bcf21f55dd 100644 --- a/openpype/settings/defaults/project_settings/photoshop.json +++ b/openpype/settings/defaults/project_settings/photoshop.json @@ -67,4 +67,4 @@ "create_first_version": false, "custom_templates": [] } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/resolve.json b/openpype/settings/defaults/project_settings/resolve.json index 66013c5ac7..264f3bd902 100644 --- a/openpype/settings/defaults/project_settings/resolve.json +++ b/openpype/settings/defaults/project_settings/resolve.json @@ -27,4 +27,4 @@ "handleEnd": 10 } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/royalrender.json b/openpype/settings/defaults/project_settings/royalrender.json index be267b11d8..b72fed8474 100644 --- a/openpype/settings/defaults/project_settings/royalrender.json +++ b/openpype/settings/defaults/project_settings/royalrender.json @@ -4,4 +4,4 @@ "review": true } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/shotgrid.json b/openpype/settings/defaults/project_settings/shotgrid.json index 774bce714b..83b6f69074 100644 --- a/openpype/settings/defaults/project_settings/shotgrid.json +++ b/openpype/settings/defaults/project_settings/shotgrid.json @@ -19,4 +19,4 @@ "step": "step" } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/slack.json b/openpype/settings/defaults/project_settings/slack.json index c156fed08e..910f099d04 100644 --- a/openpype/settings/defaults/project_settings/slack.json +++ b/openpype/settings/defaults/project_settings/slack.json @@ -17,4 +17,4 @@ ] } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/standalonepublisher.json b/openpype/settings/defaults/project_settings/standalonepublisher.json index b6e2e056a1..d923b4db43 100644 --- a/openpype/settings/defaults/project_settings/standalonepublisher.json +++ b/openpype/settings/defaults/project_settings/standalonepublisher.json @@ -304,4 +304,4 @@ } } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/traypublisher.json b/openpype/settings/defaults/project_settings/traypublisher.json index 8a222a6dd2..fdea4aeaba 100644 --- a/openpype/settings/defaults/project_settings/traypublisher.json +++ b/openpype/settings/defaults/project_settings/traypublisher.json @@ -321,4 +321,4 @@ "active": true } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json index 40603ed874..0b6d3d7e81 100644 --- a/openpype/settings/defaults/project_settings/tvpaint.json +++ b/openpype/settings/defaults/project_settings/tvpaint.json @@ -109,4 +109,4 @@ "custom_templates": [] }, "filters": {} -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/unreal.json b/openpype/settings/defaults/project_settings/unreal.json index b06bf28714..75cee11bd9 100644 --- a/openpype/settings/defaults/project_settings/unreal.json +++ b/openpype/settings/defaults/project_settings/unreal.json @@ -14,4 +14,4 @@ "project_setup": { "dev_mode": true } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/project_settings/webpublisher.json b/openpype/settings/defaults/project_settings/webpublisher.json index 27eac131b7..e830ba6a40 100644 --- a/openpype/settings/defaults/project_settings/webpublisher.json +++ b/openpype/settings/defaults/project_settings/webpublisher.json @@ -141,4 +141,4 @@ "layer_name_regex": "(?PL[0-9]{3}_\\w+)_(?P.+)" } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json index 936407a49b..f84d99e36b 100644 --- a/openpype/settings/defaults/system_settings/applications.json +++ b/openpype/settings/defaults/system_settings/applications.json @@ -1302,7 +1302,9 @@ "variant_label": "Current", "use_python_2": false, "executables": { - "windows": ["C:/Program Files/CelAction/CelAction2D Studio/CelAction2D.exe"], + "windows": [ + "C:/Program Files/CelAction/CelAction2D Studio/CelAction2D.exe" + ], "darwin": [], "linux": [] }, @@ -1365,4 +1367,4 @@ } }, "additional_apps": {} -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/system_settings/general.json b/openpype/settings/defaults/system_settings/general.json index 909ffc1ee4..d2994d1a62 100644 --- a/openpype/settings/defaults/system_settings/general.json +++ b/openpype/settings/defaults/system_settings/general.json @@ -18,4 +18,4 @@ "production_version": "", "staging_version": "", "version_check_interval": 5 -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/system_settings/modules.json b/openpype/settings/defaults/system_settings/modules.json index 703e72cb5d..1ddbfd2726 100644 --- a/openpype/settings/defaults/system_settings/modules.json +++ b/openpype/settings/defaults/system_settings/modules.json @@ -211,4 +211,4 @@ "linux": "" } } -} \ No newline at end of file +} diff --git a/openpype/settings/defaults/system_settings/tools.json b/openpype/settings/defaults/system_settings/tools.json index 243cde40cc..921e13af3a 100644 --- a/openpype/settings/defaults/system_settings/tools.json +++ b/openpype/settings/defaults/system_settings/tools.json @@ -87,4 +87,4 @@ "renderman": "Pixar Renderman" } } -} \ No newline at end of file +} From aa9817ae5272db128d66d009189811700b65b492 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Wed, 25 Jan 2023 11:09:19 +0000 Subject: [PATCH 390/912] Basic implementation of the new Creator --- openpype/hosts/unreal/api/__init__.py | 6 +- openpype/hosts/unreal/api/pipeline.py | 53 ++++++- openpype/hosts/unreal/api/plugin.py | 209 +++++++++++++++++++++++++- 3 files changed, 262 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/unreal/api/__init__.py b/openpype/hosts/unreal/api/__init__.py index ca9db259e6..2618a7677c 100644 --- a/openpype/hosts/unreal/api/__init__.py +++ b/openpype/hosts/unreal/api/__init__.py @@ -1,7 +1,11 @@ # -*- coding: utf-8 -*- """Unreal Editor OpenPype host API.""" -from .plugin import Loader +from .plugin import ( + UnrealActorCreator, + UnrealAssetCreator, + Loader +) from .pipeline import ( install, diff --git a/openpype/hosts/unreal/api/pipeline.py b/openpype/hosts/unreal/api/pipeline.py index 2081c8fd13..7a21effcbc 100644 --- a/openpype/hosts/unreal/api/pipeline.py +++ b/openpype/hosts/unreal/api/pipeline.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- import os +import json import logging from typing import List from contextlib import contextmanager @@ -16,13 +17,14 @@ from openpype.pipeline import ( ) from openpype.tools.utils import host_tools import openpype.hosts.unreal -from openpype.host import HostBase, ILoadHost +from openpype.host import HostBase, ILoadHost, IPublishHost import unreal # noqa - logger = logging.getLogger("openpype.hosts.unreal") + OPENPYPE_CONTAINERS = "OpenPypeContainers" +CONTEXT_CONTAINER = "OpenPype/context.json" UNREAL_VERSION = semver.VersionInfo( *os.getenv("OPENPYPE_UNREAL_VERSION").split(".") ) @@ -35,7 +37,7 @@ CREATE_PATH = os.path.join(PLUGINS_DIR, "create") INVENTORY_PATH = os.path.join(PLUGINS_DIR, "inventory") -class UnrealHost(HostBase, ILoadHost): +class UnrealHost(HostBase, ILoadHost, IPublishHost): """Unreal host implementation. For some time this class will re-use functions from module based @@ -60,6 +62,26 @@ class UnrealHost(HostBase, ILoadHost): show_tools_dialog() + def update_context_data(self, data, changes): + unreal.log_warning("update_context_data") + unreal.log_warning(data) + content_path = unreal.Paths.project_content_dir() + op_ctx = content_path + CONTEXT_CONTAINER + with open(op_ctx, "w+") as f: + json.dump(data, f) + with open(op_ctx, "r") as fp: + test = eval(json.load(fp)) + unreal.log_warning(test) + + def get_context_data(self): + content_path = unreal.Paths.project_content_dir() + op_ctx = content_path + CONTEXT_CONTAINER + if not os.path.isfile(op_ctx): + return {} + with open(op_ctx, "r") as fp: + data = eval(json.load(fp)) + return data + def install(): """Install Unreal configuration for OpenPype.""" @@ -133,6 +155,31 @@ def ls(): yield data +def lsinst(): + ar = unreal.AssetRegistryHelpers.get_asset_registry() + # UE 5.1 changed how class name is specified + class_name = [ + "/Script/OpenPype", + "OpenPypePublishInstance" + ] if ( + UNREAL_VERSION.major == 5 + and UNREAL_VERSION.minor > 0 + ) else "OpenPypePublishInstance" # noqa + instances = ar.get_assets_by_class(class_name, True) + + # get_asset_by_class returns AssetData. To get all metadata we need to + # load asset. get_tag_values() work only on metadata registered in + # Asset Registry Project settings (and there is no way to set it with + # python short of editing ini configuration file). + for asset_data in instances: + asset = asset_data.get_asset() + data = unreal.EditorAssetLibrary.get_metadata_tag_values(asset) + data["objectName"] = asset_data.asset_name + data = cast_map_to_str_dict(data) + + yield data + + def parse_container(container): """To get data from container, AssetContainer must be loaded. diff --git a/openpype/hosts/unreal/api/plugin.py b/openpype/hosts/unreal/api/plugin.py index 6fc00cb71c..f89ff153b1 100644 --- a/openpype/hosts/unreal/api/plugin.py +++ b/openpype/hosts/unreal/api/plugin.py @@ -1,7 +1,212 @@ # -*- coding: utf-8 -*- -from abc import ABC +import sys +import six +from abc import ( + ABC, + ABCMeta, + abstractmethod +) -from openpype.pipeline import LoaderPlugin +import unreal + +from .pipeline import ( + create_publish_instance, + imprint, + lsinst +) +from openpype.lib import BoolDef +from openpype.pipeline import ( + Creator, + LoaderPlugin, + CreatorError, + CreatedInstance +) + + +class OpenPypeCreatorError(CreatorError): + pass + + +@six.add_metaclass(ABCMeta) +class UnrealBaseCreator(Creator): + """Base class for Unreal creator plugins.""" + root = "/Game/OpenPype/PublishInstances" + suffix = "_INS" + + @staticmethod + def cache_subsets(shared_data): + """Cache instances for Creators to shared data. + + Create `unreal_cached_subsets` key when needed in shared data and + fill it with all collected instances from the scene under its + respective creator identifiers. + + If legacy instances are detected in the scene, create + `unreal_cached_legacy_subsets` there and fill it with + all legacy subsets under family as a key. + + Args: + Dict[str, Any]: Shared data. + + Return: + Dict[str, Any]: Shared data dictionary. + + """ + if shared_data.get("unreal_cached_subsets") is None: + shared_data["unreal_cached_subsets"] = {} + if shared_data.get("unreal_cached_legacy_subsets") is None: + shared_data["unreal_cached_legacy_subsets"] = {} + cached_instances = lsinst() + for i in cached_instances: + if not i.get("creator_identifier"): + # we have legacy instance + family = i.get("family") + if (family not in + shared_data["unreal_cached_legacy_subsets"]): + shared_data[ + "unreal_cached_legacy_subsets"][family] = [i] + else: + shared_data[ + "unreal_cached_legacy_subsets"][family].append(i) + continue + + creator_id = i.get("creator_identifier") + if creator_id not in shared_data["unreal_cached_subsets"]: + shared_data["unreal_cached_subsets"][creator_id] = [i] + else: + shared_data["unreal_cached_subsets"][creator_id].append(i) + return shared_data + + @abstractmethod + def create(self, subset_name, instance_data, pre_create_data): + pass + + def collect_instances(self): + # cache instances if missing + self.cache_subsets(self.collection_shared_data) + for instance in self.collection_shared_data[ + "unreal_cached_subsets"].get(self.identifier, []): + created_instance = CreatedInstance.from_existing(instance, self) + self._add_instance_to_context(created_instance) + + def update_instances(self, update_list): + unreal.log_warning(f"Update instances: {update_list}") + for created_inst, _changes in update_list: + instance_node = created_inst.get("instance_path", "") + + if not instance_node: + unreal.log_warning( + f"Instance node not found for {created_inst}") + + new_values = { + key: new_value + for key, (_old_value, new_value) in _changes.items() + } + imprint( + instance_node, + new_values + ) + + def remove_instances(self, instances): + for instance in instances: + instance_node = instance.data.get("instance_path", "") + if instance_node: + unreal.EditorAssetLibrary.delete_asset(instance_node) + + self._remove_instance_from_context(instance) + + def get_pre_create_attr_defs(self): + return [ + BoolDef("use_selection", label="Use selection") + ] + + +@six.add_metaclass(ABCMeta) +class UnrealAssetCreator(UnrealBaseCreator): + """Base class for Unreal creator plugins based on assets.""" + + def create(self, subset_name, instance_data, pre_create_data): + """Create instance of the asset. + + Args: + subset_name (str): Name of the subset. + instance_data (dict): Data for the instance. + pre_create_data (dict): Data for the instance. + + Returns: + CreatedInstance: Created instance. + """ + try: + selection = [] + + if pre_create_data.get("use_selection"): + sel_objects = unreal.EditorUtilityLibrary.get_selected_assets() + selection = [a.get_path_name() for a in sel_objects] + + instance_name = f"{subset_name}{self.suffix}" + create_publish_instance(instance_name, self.root) + instance_data["members"] = selection + instance_data["subset"] = subset_name + instance_data["instance_path"] = f"{self.root}/{instance_name}" + instance = CreatedInstance( + self.family, + subset_name, + instance_data, + self) + self._add_instance_to_context(instance) + + imprint(f"{self.root}/{instance_name}", instance_data) + + except Exception as er: + six.reraise( + OpenPypeCreatorError, + OpenPypeCreatorError(f"Creator error: {er}"), + sys.exc_info()[2]) + + +@six.add_metaclass(ABCMeta) +class UnrealActorCreator(UnrealBaseCreator): + """Base class for Unreal creator plugins based on actors.""" + + def create(self, subset_name, instance_data, pre_create_data): + """Create instance of the asset. + + Args: + subset_name (str): Name of the subset. + instance_data (dict): Data for the instance. + pre_create_data (dict): Data for the instance. + + Returns: + CreatedInstance: Created instance. + """ + try: + selection = [] + + if pre_create_data.get("use_selection"): + sel_objects = unreal.EditorUtilityLibrary.get_selected_actors() + selection = [a.get_path_name() for a in sel_objects] + + instance_name = f"{subset_name}{self.suffix}" + create_publish_instance(instance_name, self.root) + instance_data["members"] = selection + instance_data[ + "level"] = unreal.EditorLevelLibrary.get_editor_world() + instance_data["subset"] = subset_name + instance_data["instance_path"] = f"{self.root}/{instance_name}" + instance = CreatedInstance( + self.family, + subset_name, + instance_data, + self) + self._add_instance_to_context(instance) + + imprint(f"{self.root}/{instance_name}", instance_data) + + except Exception as er: + six.reraise( + OpenPypeCreatorError, + OpenPypeCreatorError(f"Creator error: {er}"), + sys.exc_info()[2]) class Loader(LoaderPlugin, ABC): From f0db455a09287223677c333b08a70a459120df6c Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Thu, 26 Jan 2023 17:35:11 +0000 Subject: [PATCH 391/912] Improved basic creator --- openpype/hosts/unreal/api/plugin.py | 95 ++++++++++++++++++----------- 1 file changed, 58 insertions(+), 37 deletions(-) diff --git a/openpype/hosts/unreal/api/plugin.py b/openpype/hosts/unreal/api/plugin.py index f89ff153b1..6a561420fa 100644 --- a/openpype/hosts/unreal/api/plugin.py +++ b/openpype/hosts/unreal/api/plugin.py @@ -4,7 +4,6 @@ import six from abc import ( ABC, ABCMeta, - abstractmethod ) import unreal @@ -12,7 +11,8 @@ import unreal from .pipeline import ( create_publish_instance, imprint, - lsinst + lsinst, + UNREAL_VERSION ) from openpype.lib import BoolDef from openpype.pipeline import ( @@ -77,9 +77,28 @@ class UnrealBaseCreator(Creator): shared_data["unreal_cached_subsets"][creator_id].append(i) return shared_data - @abstractmethod def create(self, subset_name, instance_data, pre_create_data): - pass + try: + instance_name = f"{subset_name}{self.suffix}" + create_publish_instance(instance_name, self.root) + + instance_data["subset"] = subset_name + instance_data["instance_path"] = f"{self.root}/{instance_name}" + + instance = CreatedInstance( + self.family, + subset_name, + instance_data, + self) + self._add_instance_to_context(instance) + + imprint(f"{self.root}/{instance_name}", instance_data) + + except Exception as er: + six.reraise( + OpenPypeCreatorError, + OpenPypeCreatorError(f"Creator error: {er}"), + sys.exc_info()[2]) def collect_instances(self): # cache instances if missing @@ -117,7 +136,7 @@ class UnrealBaseCreator(Creator): def get_pre_create_attr_defs(self): return [ - BoolDef("use_selection", label="Use selection") + BoolDef("use_selection", label="Use selection", default=True) ] @@ -137,25 +156,21 @@ class UnrealAssetCreator(UnrealBaseCreator): CreatedInstance: Created instance. """ try: - selection = [] + # Check if instance data has members, filled by the plugin. + # If not, use selection. + if not instance_data.get("members"): + selection = [] - if pre_create_data.get("use_selection"): - sel_objects = unreal.EditorUtilityLibrary.get_selected_assets() - selection = [a.get_path_name() for a in sel_objects] + if pre_create_data.get("use_selection"): + sel_objects = unreal.EditorUtilityLibrary.get_selected_assets() + selection = [a.get_path_name() for a in sel_objects] - instance_name = f"{subset_name}{self.suffix}" - create_publish_instance(instance_name, self.root) - instance_data["members"] = selection - instance_data["subset"] = subset_name - instance_data["instance_path"] = f"{self.root}/{instance_name}" - instance = CreatedInstance( - self.family, + instance_data["members"] = selection + + super(UnrealAssetCreator, self).create( subset_name, instance_data, - self) - self._add_instance_to_context(instance) - - imprint(f"{self.root}/{instance_name}", instance_data) + pre_create_data) except Exception as er: six.reraise( @@ -180,27 +195,33 @@ class UnrealActorCreator(UnrealBaseCreator): CreatedInstance: Created instance. """ try: - selection = [] + if UNREAL_VERSION.major == 5: + world = unreal.UnrealEditorSubsystem().get_editor_world() + else: + world = unreal.EditorLevelLibrary.get_editor_world() - if pre_create_data.get("use_selection"): - sel_objects = unreal.EditorUtilityLibrary.get_selected_actors() - selection = [a.get_path_name() for a in sel_objects] + # Check if the level is saved + if world.get_path_name().startswith("/Temp/"): + raise OpenPypeCreatorError( + "Level must be saved before creating instances.") - instance_name = f"{subset_name}{self.suffix}" - create_publish_instance(instance_name, self.root) - instance_data["members"] = selection - instance_data[ - "level"] = unreal.EditorLevelLibrary.get_editor_world() - instance_data["subset"] = subset_name - instance_data["instance_path"] = f"{self.root}/{instance_name}" - instance = CreatedInstance( - self.family, + # Check if instance data has members, filled by the plugin. + # If not, use selection. + if not instance_data.get("members"): + selection = [] + + if pre_create_data.get("use_selection"): + sel_objects = unreal.EditorUtilityLibrary.get_selected_actors() + selection = [a.get_path_name() for a in sel_objects] + + instance_data["members"] = selection + + instance_data["level"] = world.get_path_name() + + super(UnrealActorCreator, self).create( subset_name, instance_data, - self) - self._add_instance_to_context(instance) - - imprint(f"{self.root}/{instance_name}", instance_data) + pre_create_data) except Exception as er: six.reraise( From 7284601d62c2304ce6fe07b538a858745e7d8869 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Thu, 26 Jan 2023 17:35:42 +0000 Subject: [PATCH 392/912] Updated creators to be compatible with new publisher --- .../unreal/plugins/create/create_camera.py | 44 +++---------- .../unreal/plugins/create/create_layout.py | 39 ++--------- .../unreal/plugins/create/create_look.py | 64 +++++++++---------- .../plugins/create/create_staticmeshfbx.py | 34 ++-------- .../unreal/plugins/create/create_uasset.py | 44 ++++--------- 5 files changed, 65 insertions(+), 160 deletions(-) diff --git a/openpype/hosts/unreal/plugins/create/create_camera.py b/openpype/hosts/unreal/plugins/create/create_camera.py index bf1489d688..239dc87db5 100644 --- a/openpype/hosts/unreal/plugins/create/create_camera.py +++ b/openpype/hosts/unreal/plugins/create/create_camera.py @@ -1,41 +1,13 @@ -import unreal -from unreal import EditorAssetLibrary as eal -from unreal import EditorLevelLibrary as ell - -from openpype.hosts.unreal.api.pipeline import instantiate -from openpype.pipeline import LegacyCreator +# -*- coding: utf-8 -*- +from openpype.hosts.unreal.api.plugin import ( + UnrealActorCreator, +) -class CreateCamera(LegacyCreator): - """Layout output for character rigs""" +class CreateCamera(UnrealActorCreator): + """Create Camera.""" - name = "layoutMain" + identifier = "io.openpype.creators.unreal.camera" label = "Camera" family = "camera" - icon = "cubes" - - root = "/Game/OpenPype/Instances" - suffix = "_INS" - - def __init__(self, *args, **kwargs): - super(CreateCamera, self).__init__(*args, **kwargs) - - def process(self): - data = self.data - - name = data["subset"] - - data["level"] = ell.get_editor_world().get_path_name() - - if not eal.does_directory_exist(self.root): - eal.make_directory(self.root) - - factory = unreal.LevelSequenceFactoryNew() - tools = unreal.AssetToolsHelpers().get_asset_tools() - tools.create_asset(name, f"{self.root}/{name}", None, factory) - - asset_name = f"{self.root}/{name}/{name}.{name}" - - data["members"] = [asset_name] - - instantiate(f"{self.root}", name, data, None, self.suffix) + icon = "camera" diff --git a/openpype/hosts/unreal/plugins/create/create_layout.py b/openpype/hosts/unreal/plugins/create/create_layout.py index c1067b00d9..1d2e800a13 100644 --- a/openpype/hosts/unreal/plugins/create/create_layout.py +++ b/openpype/hosts/unreal/plugins/create/create_layout.py @@ -1,42 +1,13 @@ # -*- coding: utf-8 -*- -from unreal import EditorLevelLibrary - -from openpype.pipeline import LegacyCreator -from openpype.hosts.unreal.api.pipeline import instantiate +from openpype.hosts.unreal.api.plugin import ( + UnrealActorCreator, +) -class CreateLayout(LegacyCreator): +class CreateLayout(UnrealActorCreator): """Layout output for character rigs.""" - name = "layoutMain" + identifier = "io.openpype.creators.unreal.layout" label = "Layout" family = "layout" icon = "cubes" - - root = "/Game" - suffix = "_INS" - - def __init__(self, *args, **kwargs): - super(CreateLayout, self).__init__(*args, **kwargs) - - def process(self): - data = self.data - - name = data["subset"] - - selection = [] - # if (self.options or {}).get("useSelection"): - # sel_objects = unreal.EditorUtilityLibrary.get_selected_assets() - # selection = [a.get_path_name() for a in sel_objects] - - data["level"] = EditorLevelLibrary.get_editor_world().get_path_name() - - data["members"] = [] - - if (self.options or {}).get("useSelection"): - # Set as members the selected actors - for actor in EditorLevelLibrary.get_selected_level_actors(): - data["members"].append("{}.{}".format( - actor.get_outer().get_name(), actor.get_name())) - - instantiate(self.root, name, data, selection, self.suffix) diff --git a/openpype/hosts/unreal/plugins/create/create_look.py b/openpype/hosts/unreal/plugins/create/create_look.py index 4abf3f6095..08d61ab9f8 100644 --- a/openpype/hosts/unreal/plugins/create/create_look.py +++ b/openpype/hosts/unreal/plugins/create/create_look.py @@ -1,56 +1,53 @@ # -*- coding: utf-8 -*- -"""Create look in Unreal.""" -import unreal # noqa -from openpype.hosts.unreal.api import pipeline, plugin -from openpype.pipeline import LegacyCreator +import unreal + +from openpype.hosts.unreal.api.pipeline import ( + create_folder +) +from openpype.hosts.unreal.api.plugin import ( + UnrealAssetCreator +) -class CreateLook(LegacyCreator): +class CreateLook(UnrealAssetCreator): """Shader connections defining shape look.""" - name = "unrealLook" - label = "Unreal - Look" + identifier = "io.openpype.creators.unreal.look" + label = "Look" family = "look" icon = "paint-brush" - root = "/Game/Avalon/Assets" - suffix = "_INS" - - def __init__(self, *args, **kwargs): - super(CreateLook, self).__init__(*args, **kwargs) - - def process(self): - name = self.data["subset"] - + def create(self, subset_name, instance_data, pre_create_data): selection = [] - if (self.options or {}).get("useSelection"): + if pre_create_data.get("use_selection"): sel_objects = unreal.EditorUtilityLibrary.get_selected_assets() selection = [a.get_path_name() for a in sel_objects] + if len(selection) != 1: + raise RuntimeError("Please select only one asset.") + + selected_asset = selection[0] + + look_directory = "/Game/OpenPype/Looks" + # Create the folder - path = f"{self.root}/{self.data['asset']}" - new_name = pipeline.create_folder(path, name) - full_path = f"{path}/{new_name}" + folder_name = create_folder(look_directory, subset_name) + path = f"{look_directory}/{folder_name}" # Create a new cube static mesh ar = unreal.AssetRegistryHelpers.get_asset_registry() cube = ar.get_asset_by_object_path("/Engine/BasicShapes/Cube.Cube") - # Create the avalon publish instance object - container_name = f"{name}{self.suffix}" - pipeline.create_publish_instance( - instance=container_name, path=full_path) - # Get the mesh of the selected object - original_mesh = ar.get_asset_by_object_path(selection[0]).get_asset() - materials = original_mesh.get_editor_property('materials') + original_mesh = ar.get_asset_by_object_path(selected_asset).get_asset() + materials = original_mesh.get_editor_property('static_materials') - self.data["members"] = [] + instance_data["members"] = [] # Add the materials to the cube for material in materials: - name = material.get_editor_property('material_slot_name') - object_path = f"{full_path}/{name}.{name}" + mat_name = material.get_editor_property('material_slot_name') + object_path = f"{path}/{mat_name}.{mat_name}" unreal_object = unreal.EditorAssetLibrary.duplicate_loaded_asset( cube.get_asset(), object_path ) @@ -61,8 +58,11 @@ class CreateLook(LegacyCreator): unreal_object.add_material( material.get_editor_property('material_interface')) - self.data["members"].append(object_path) + instance_data["members"].append(object_path) unreal.EditorAssetLibrary.save_asset(object_path) - pipeline.imprint(f"{full_path}/{container_name}", self.data) + super(CreateLook, self).create( + subset_name, + instance_data, + pre_create_data) diff --git a/openpype/hosts/unreal/plugins/create/create_staticmeshfbx.py b/openpype/hosts/unreal/plugins/create/create_staticmeshfbx.py index 45d517d27d..1acf7084d1 100644 --- a/openpype/hosts/unreal/plugins/create/create_staticmeshfbx.py +++ b/openpype/hosts/unreal/plugins/create/create_staticmeshfbx.py @@ -1,35 +1,13 @@ # -*- coding: utf-8 -*- -"""Create Static Meshes as FBX geometry.""" -import unreal # noqa -from openpype.hosts.unreal.api.pipeline import ( - instantiate, +from openpype.hosts.unreal.api.plugin import ( + UnrealAssetCreator, ) -from openpype.pipeline import LegacyCreator -class CreateStaticMeshFBX(LegacyCreator): - """Static FBX geometry.""" +class CreateStaticMeshFBX(UnrealAssetCreator): + """Create Static Meshes as FBX geometry.""" - name = "unrealStaticMeshMain" - label = "Unreal - Static Mesh" + identifier = "io.openpype.creators.unreal.staticmeshfbx" + label = "Static Mesh (FBX)" family = "unrealStaticMesh" icon = "cube" - asset_types = ["StaticMesh"] - - root = "/Game" - suffix = "_INS" - - def __init__(self, *args, **kwargs): - super(CreateStaticMeshFBX, self).__init__(*args, **kwargs) - - def process(self): - - name = self.data["subset"] - - selection = [] - if (self.options or {}).get("useSelection"): - sel_objects = unreal.EditorUtilityLibrary.get_selected_assets() - selection = [a.get_path_name() for a in sel_objects] - - unreal.log("selection: {}".format(selection)) - instantiate(self.root, name, self.data, selection, self.suffix) diff --git a/openpype/hosts/unreal/plugins/create/create_uasset.py b/openpype/hosts/unreal/plugins/create/create_uasset.py index ee584ac00c..2d6fcc1d59 100644 --- a/openpype/hosts/unreal/plugins/create/create_uasset.py +++ b/openpype/hosts/unreal/plugins/create/create_uasset.py @@ -1,36 +1,25 @@ -"""Create UAsset.""" +# -*- coding: utf-8 -*- from pathlib import Path import unreal -from openpype.hosts.unreal.api import pipeline -from openpype.pipeline import LegacyCreator +from openpype.hosts.unreal.api.plugin import ( + UnrealAssetCreator, +) -class CreateUAsset(LegacyCreator): - """UAsset.""" +class CreateUAsset(UnrealAssetCreator): + """Create UAsset.""" - name = "UAsset" + identifier = "io.openpype.creators.unreal.uasset" label = "UAsset" family = "uasset" icon = "cube" - root = "/Game/OpenPype" - suffix = "_INS" + def create(self, subset_name, instance_data, pre_create_data): + if pre_create_data.get("use_selection"): + ar = unreal.AssetRegistryHelpers.get_asset_registry() - def __init__(self, *args, **kwargs): - super(CreateUAsset, self).__init__(*args, **kwargs) - - def process(self): - ar = unreal.AssetRegistryHelpers.get_asset_registry() - - subset = self.data["subset"] - path = f"{self.root}/PublishInstances/" - - unreal.EditorAssetLibrary.make_directory(path) - - selection = [] - if (self.options or {}).get("useSelection"): sel_objects = unreal.EditorUtilityLibrary.get_selected_assets() selection = [a.get_path_name() for a in sel_objects] @@ -50,12 +39,7 @@ class CreateUAsset(LegacyCreator): if Path(sys_path).suffix != ".uasset": raise RuntimeError(f"{Path(sys_path).name} is not a UAsset.") - unreal.log("selection: {}".format(selection)) - container_name = f"{subset}{self.suffix}" - pipeline.create_publish_instance( - instance=container_name, path=path) - - data = self.data.copy() - data["members"] = selection - - pipeline.imprint(f"{path}/{container_name}", data) + super(CreateUAsset, self).create( + subset_name, + instance_data, + pre_create_data) From ca7ae2a306218ab729e51af94e70b842aabfd671 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Fri, 27 Jan 2023 16:53:39 +0000 Subject: [PATCH 393/912] Updated render creator --- .../unreal/plugins/create/create_render.py | 174 ++++++++++-------- 1 file changed, 94 insertions(+), 80 deletions(-) diff --git a/openpype/hosts/unreal/plugins/create/create_render.py b/openpype/hosts/unreal/plugins/create/create_render.py index a85d17421b..de3efdad74 100644 --- a/openpype/hosts/unreal/plugins/create/create_render.py +++ b/openpype/hosts/unreal/plugins/create/create_render.py @@ -1,117 +1,131 @@ +# -*- coding: utf-8 -*- import unreal -from openpype.hosts.unreal.api import pipeline -from openpype.pipeline import LegacyCreator +from openpype.hosts.unreal.api.pipeline import ( + get_subsequences +) +from openpype.hosts.unreal.api.plugin import ( + UnrealAssetCreator, +) -class CreateRender(LegacyCreator): +class CreateRender(UnrealAssetCreator): """Create instance for sequence for rendering""" - name = "unrealRender" - label = "Unreal - Render" + identifier = "io.openpype.creators.unreal.render" + label = "Render" family = "render" - icon = "cube" - asset_types = ["LevelSequence"] - - root = "/Game/OpenPype/PublishInstances" - suffix = "_INS" - - def process(self): - subset = self.data["subset"] + icon = "eye" + def create(self, subset_name, instance_data, pre_create_data): ar = unreal.AssetRegistryHelpers.get_asset_registry() - # The asset name is the the third element of the path which contains - # the map. - # The index of the split path is 3 because the first element is an - # empty string, as the path begins with "/Content". - a = unreal.EditorUtilityLibrary.get_selected_assets()[0] - asset_name = a.get_path_name().split("/")[3] - - # Get the master sequence and the master level. - # There should be only one sequence and one level in the directory. - filter = unreal.ARFilter( - class_names=["LevelSequence"], - package_paths=[f"/Game/OpenPype/{asset_name}"], - recursive_paths=False) - sequences = ar.get_assets(filter) - ms = sequences[0].get_editor_property('object_path') - filter = unreal.ARFilter( - class_names=["World"], - package_paths=[f"/Game/OpenPype/{asset_name}"], - recursive_paths=False) - levels = ar.get_assets(filter) - ml = levels[0].get_editor_property('object_path') - - selection = [] - if (self.options or {}).get("useSelection"): + if pre_create_data.get("use_selection"): sel_objects = unreal.EditorUtilityLibrary.get_selected_assets() selection = [ a.get_path_name() for a in sel_objects - if a.get_class().get_name() in self.asset_types] + if a.get_class().get_name() == "LevelSequence"] else: - selection.append(self.data['sequence']) + selection = [instance_data['sequence']] - unreal.log(f"selection: {selection}") + seq_data = None - path = f"{self.root}" - unreal.EditorAssetLibrary.make_directory(path) + for sel in selection: + selected_asset = ar.get_asset_by_object_path(sel).get_asset() + selected_asset_path = selected_asset.get_path_name() - ar = unreal.AssetRegistryHelpers.get_asset_registry() + # Check if the selected asset is a level sequence asset. + if selected_asset.get_class().get_name() != "LevelSequence": + unreal.log_warning( + f"Skipping {selected_asset.get_name()}. It isn't a Level " + "Sequence.") - for a in selection: - ms_obj = ar.get_asset_by_object_path(ms).get_asset() + # The asset name is the the third element of the path which + # contains the map. + # To take the asset name, we remove from the path the prefix + # "/Game/OpenPype/" and then we split the path by "/". + sel_path = selected_asset_path + asset_name = sel_path.replace("/Game/OpenPype/", "").split("/")[0] - seq_data = None + # Get the master sequence and the master level. + # There should be only one sequence and one level in the directory. + ar_filter = unreal.ARFilter( + class_names=["LevelSequence"], + package_paths=[f"/Game/OpenPype/{asset_name}"], + recursive_paths=False) + sequences = ar.get_assets(ar_filter) + master_seq = sequences[0].get_asset().get_path_name() + master_seq_obj = sequences[0].get_asset() + ar_filter = unreal.ARFilter( + class_names=["World"], + package_paths=[f"/Game/OpenPype/{asset_name}"], + recursive_paths=False) + levels = ar.get_assets(ar_filter) + master_lvl = levels[0].get_asset().get_path_name() - if a == ms: - seq_data = { - "sequence": ms_obj, - "output": f"{ms_obj.get_name()}", - "frame_range": ( - ms_obj.get_playback_start(), ms_obj.get_playback_end()) - } + # If the selected asset is the master sequence, we get its data + # and then we create the instance for the master sequence. + # Otherwise, we cycle from the master sequence to find the selected + # sequence and we get its data. This data will be used to create + # the instance for the selected sequence. In particular, + # we get the frame range of the selected sequence and its final + # output path. + master_seq_data = { + "sequence": master_seq_obj, + "output": f"{master_seq_obj.get_name()}", + "frame_range": ( + master_seq_obj.get_playback_start(), + master_seq_obj.get_playback_end())} + + if selected_asset_path == master_seq: + seq_data = master_seq_data else: - seq_data_list = [{ - "sequence": ms_obj, - "output": f"{ms_obj.get_name()}", - "frame_range": ( - ms_obj.get_playback_start(), ms_obj.get_playback_end()) - }] + seq_data_list = [master_seq_data] - for s in seq_data_list: - subscenes = pipeline.get_subsequences(s.get('sequence')) + for seq in seq_data_list: + subscenes = get_subsequences(seq.get('sequence')) - for ss in subscenes: + for sub_seq in subscenes: + sub_seq_obj = sub_seq.get_sequence() curr_data = { - "sequence": ss.get_sequence(), - "output": (f"{s.get('output')}/" - f"{ss.get_sequence().get_name()}"), + "sequence": sub_seq_obj, + "output": (f"{seq.get('output')}/" + f"{sub_seq_obj.get_name()}"), "frame_range": ( - ss.get_start_frame(), ss.get_end_frame() - 1) - } + sub_seq.get_start_frame(), + sub_seq.get_end_frame() - 1)} - if ss.get_sequence().get_path_name() == a: + # If the selected asset is the current sub-sequence, + # we get its data and we break the loop. + # Otherwise, we add the current sub-sequence data to + # the list of sequences to check. + if sub_seq_obj.get_path_name() == selected_asset_path: seq_data = curr_data break + seq_data_list.append(curr_data) + # If we found the selected asset, we break the loop. if seq_data is not None: break + # If we didn't find the selected asset, we don't create the + # instance. if not seq_data: + unreal.log_warning( + f"Skipping {selected_asset.get_name()}. It isn't a " + "sub-sequence of the master sequence.") continue - d = self.data.copy() - d["members"] = [a] - d["sequence"] = a - d["master_sequence"] = ms - d["master_level"] = ml - d["output"] = seq_data.get('output') - d["frameStart"] = seq_data.get('frame_range')[0] - d["frameEnd"] = seq_data.get('frame_range')[1] + instance_data["members"] = [selected_asset_path] + instance_data["sequence"] = selected_asset_path + instance_data["master_sequence"] = master_seq + instance_data["master_level"] = master_lvl + instance_data["output"] = seq_data.get('output') + instance_data["frameStart"] = seq_data.get('frame_range')[0] + instance_data["frameEnd"] = seq_data.get('frame_range')[1] - container_name = f"{subset}{self.suffix}" - pipeline.create_publish_instance( - instance=container_name, path=path) - pipeline.imprint(f"{path}/{container_name}", d) + super(CreateRender, self).create( + subset_name, + instance_data, + pre_create_data) From a4c751b49ad43dfd4226fd3a99348877b8e5c084 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Mon, 30 Jan 2023 11:17:21 +0000 Subject: [PATCH 394/912] Hound fixes --- openpype/hosts/unreal/api/plugin.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/unreal/api/plugin.py b/openpype/hosts/unreal/api/plugin.py index 6a561420fa..71ce0c18a7 100644 --- a/openpype/hosts/unreal/api/plugin.py +++ b/openpype/hosts/unreal/api/plugin.py @@ -104,7 +104,7 @@ class UnrealBaseCreator(Creator): # cache instances if missing self.cache_subsets(self.collection_shared_data) for instance in self.collection_shared_data[ - "unreal_cached_subsets"].get(self.identifier, []): + "unreal_cached_subsets"].get(self.identifier, []): created_instance = CreatedInstance.from_existing(instance, self) self._add_instance_to_context(created_instance) @@ -162,7 +162,8 @@ class UnrealAssetCreator(UnrealBaseCreator): selection = [] if pre_create_data.get("use_selection"): - sel_objects = unreal.EditorUtilityLibrary.get_selected_assets() + utility_lib = unreal.EditorUtilityLibrary + sel_objects = utility_lib.get_selected_assets() selection = [a.get_path_name() for a in sel_objects] instance_data["members"] = selection @@ -211,7 +212,8 @@ class UnrealActorCreator(UnrealBaseCreator): selection = [] if pre_create_data.get("use_selection"): - sel_objects = unreal.EditorUtilityLibrary.get_selected_actors() + utility_lib = unreal.EditorUtilityLibrary + sel_objects = utility_lib.get_selected_assets() selection = [a.get_path_name() for a in sel_objects] instance_data["members"] = selection From 833860468c90395601679941fdb0d69b05a7a472 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Tue, 31 Jan 2023 16:05:01 +0000 Subject: [PATCH 395/912] Collect instances is no longer needed with the new publisher --- .../plugins/publish/collect_instances.py | 67 ------------------- 1 file changed, 67 deletions(-) delete mode 100644 openpype/hosts/unreal/plugins/publish/collect_instances.py diff --git a/openpype/hosts/unreal/plugins/publish/collect_instances.py b/openpype/hosts/unreal/plugins/publish/collect_instances.py deleted file mode 100644 index 27b711cad6..0000000000 --- a/openpype/hosts/unreal/plugins/publish/collect_instances.py +++ /dev/null @@ -1,67 +0,0 @@ -# -*- coding: utf-8 -*- -"""Collect publishable instances in Unreal.""" -import ast -import unreal # noqa -import pyblish.api -from openpype.hosts.unreal.api.pipeline import UNREAL_VERSION -from openpype.pipeline.publish import KnownPublishError - - -class CollectInstances(pyblish.api.ContextPlugin): - """Gather instances by OpenPypePublishInstance class - - This collector finds all paths containing `OpenPypePublishInstance` class - asset - - Identifier: - id (str): "pyblish.avalon.instance" - - """ - - label = "Collect Instances" - order = pyblish.api.CollectorOrder - 0.1 - hosts = ["unreal"] - - def process(self, context): - - ar = unreal.AssetRegistryHelpers.get_asset_registry() - class_name = [ - "/Script/OpenPype", - "OpenPypePublishInstance" - ] if ( - UNREAL_VERSION.major == 5 - and UNREAL_VERSION.minor > 0 - ) else "OpenPypePublishInstance" # noqa - instance_containers = ar.get_assets_by_class(class_name, True) - - for container_data in instance_containers: - asset = container_data.get_asset() - data = unreal.EditorAssetLibrary.get_metadata_tag_values(asset) - data["objectName"] = container_data.asset_name - # convert to strings - data = {str(key): str(value) for (key, value) in data.items()} - if not data.get("family"): - raise KnownPublishError("instance has no family") - - # content of container - members = ast.literal_eval(data.get("members")) - self.log.debug(members) - self.log.debug(asset.get_path_name()) - # remove instance container - self.log.info("Creating instance for {}".format(asset.get_name())) - - instance = context.create_instance(asset.get_name()) - instance[:] = members - - # Store the exact members of the object set - instance.data["setMembers"] = members - instance.data["families"] = [data.get("family")] - instance.data["level"] = data.get("level") - instance.data["parent"] = data.get("parent") - - label = "{0} ({1})".format(asset.get_name()[:-4], - data["asset"]) - - instance.data["label"] = label - - instance.data.update(data) From ba6d77b88ba5f808c9c6e2a33dfacdb5388ddf91 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Thu, 2 Feb 2023 11:22:36 +0000 Subject: [PATCH 396/912] Use External Data in the Unreal Publish Instance to store members Not possible with all the families. Some families require to store actors in a scenes, and we cannot store them in the External Data. --- openpype/hosts/unreal/api/plugin.py | 24 ++++++--- .../unreal/plugins/create/create_look.py | 6 ++- .../publish/collect_instance_members.py | 49 +++++++++++++++++++ .../unreal/plugins/publish/extract_look.py | 4 +- .../unreal/plugins/publish/extract_uasset.py | 8 ++- 5 files changed, 78 insertions(+), 13 deletions(-) create mode 100644 openpype/hosts/unreal/plugins/publish/collect_instance_members.py diff --git a/openpype/hosts/unreal/api/plugin.py b/openpype/hosts/unreal/api/plugin.py index 71ce0c18a7..da571af9be 100644 --- a/openpype/hosts/unreal/api/plugin.py +++ b/openpype/hosts/unreal/api/plugin.py @@ -80,7 +80,7 @@ class UnrealBaseCreator(Creator): def create(self, subset_name, instance_data, pre_create_data): try: instance_name = f"{subset_name}{self.suffix}" - create_publish_instance(instance_name, self.root) + pub_instance = create_publish_instance(instance_name, self.root) instance_data["subset"] = subset_name instance_data["instance_path"] = f"{self.root}/{instance_name}" @@ -92,6 +92,15 @@ class UnrealBaseCreator(Creator): self) self._add_instance_to_context(instance) + pub_instance.set_editor_property('add_external_assets', True) + assets = pub_instance.get_editor_property('asset_data_external') + + ar = unreal.AssetRegistryHelpers.get_asset_registry() + + for member in pre_create_data.get("members", []): + obj = ar.get_asset_by_object_path(member).get_asset() + assets.add(obj) + imprint(f"{self.root}/{instance_name}", instance_data) except Exception as er: @@ -158,15 +167,14 @@ class UnrealAssetCreator(UnrealBaseCreator): try: # Check if instance data has members, filled by the plugin. # If not, use selection. - if not instance_data.get("members"): - selection = [] + if not pre_create_data.get("members"): + pre_create_data["members"] = [] if pre_create_data.get("use_selection"): - utility_lib = unreal.EditorUtilityLibrary - sel_objects = utility_lib.get_selected_assets() - selection = [a.get_path_name() for a in sel_objects] - - instance_data["members"] = selection + utilib = unreal.EditorUtilityLibrary + sel_objects = utilib.get_selected_assets() + pre_create_data["members"] = [ + a.get_path_name() for a in sel_objects] super(UnrealAssetCreator, self).create( subset_name, diff --git a/openpype/hosts/unreal/plugins/create/create_look.py b/openpype/hosts/unreal/plugins/create/create_look.py index 08d61ab9f8..047764ef2a 100644 --- a/openpype/hosts/unreal/plugins/create/create_look.py +++ b/openpype/hosts/unreal/plugins/create/create_look.py @@ -34,6 +34,8 @@ class CreateLook(UnrealAssetCreator): folder_name = create_folder(look_directory, subset_name) path = f"{look_directory}/{folder_name}" + instance_data["look"] = path + # Create a new cube static mesh ar = unreal.AssetRegistryHelpers.get_asset_registry() cube = ar.get_asset_by_object_path("/Engine/BasicShapes/Cube.Cube") @@ -42,7 +44,7 @@ class CreateLook(UnrealAssetCreator): original_mesh = ar.get_asset_by_object_path(selected_asset).get_asset() materials = original_mesh.get_editor_property('static_materials') - instance_data["members"] = [] + pre_create_data["members"] = [] # Add the materials to the cube for material in materials: @@ -58,7 +60,7 @@ class CreateLook(UnrealAssetCreator): unreal_object.add_material( material.get_editor_property('material_interface')) - instance_data["members"].append(object_path) + pre_create_data["members"].append(object_path) unreal.EditorAssetLibrary.save_asset(object_path) diff --git a/openpype/hosts/unreal/plugins/publish/collect_instance_members.py b/openpype/hosts/unreal/plugins/publish/collect_instance_members.py new file mode 100644 index 0000000000..74969f5033 --- /dev/null +++ b/openpype/hosts/unreal/plugins/publish/collect_instance_members.py @@ -0,0 +1,49 @@ +import unreal + +import pyblish.api + + +class CollectInstanceMembers(pyblish.api.InstancePlugin): + """ + Collect members of instance. + + This collector will collect the assets for the families that support to + have them included as External Data, and will add them to the instance + as members. + """ + + order = pyblish.api.CollectorOrder + 0.1 + hosts = ["unreal"] + families = ["look", "unrealStaticMesh", "uasset"] + label = "Collect Instance Members" + + def process(self, instance): + """Collect members of instance.""" + self.log.info("Collecting instance members") + + ar = unreal.AssetRegistryHelpers.get_asset_registry() + + inst_path = instance.data.get('instance_path') + inst_name = instance.data.get('objectName') + + pub_instance = ar.get_asset_by_object_path( + f"{inst_path}.{inst_name}").get_asset() + + if not pub_instance: + self.log.error(f"{inst_path}.{inst_name}") + raise RuntimeError(f"Instance {instance} not found.") + + if not pub_instance.get_editor_property("add_external_assets"): + # No external assets in the instance + return + + assets = pub_instance.get_editor_property('asset_data_external') + + members = [] + + for asset in assets: + members.append(asset.get_path_name()) + + self.log.debug(f"Members: {members}") + + instance.data["members"] = members diff --git a/openpype/hosts/unreal/plugins/publish/extract_look.py b/openpype/hosts/unreal/plugins/publish/extract_look.py index f999ad8651..4b32b4eb95 100644 --- a/openpype/hosts/unreal/plugins/publish/extract_look.py +++ b/openpype/hosts/unreal/plugins/publish/extract_look.py @@ -29,13 +29,13 @@ class ExtractLook(publish.Extractor): for member in instance: asset = ar.get_asset_by_object_path(member) - object = asset.get_asset() + obj = asset.get_asset() name = asset.get_editor_property('asset_name') json_element = {'material': str(name)} - material_obj = object.get_editor_property('static_materials')[0] + material_obj = obj.get_editor_property('static_materials')[0] material = material_obj.material_interface base_color = mat_lib.get_material_property_input_node( diff --git a/openpype/hosts/unreal/plugins/publish/extract_uasset.py b/openpype/hosts/unreal/plugins/publish/extract_uasset.py index 89d779d368..f719df2a82 100644 --- a/openpype/hosts/unreal/plugins/publish/extract_uasset.py +++ b/openpype/hosts/unreal/plugins/publish/extract_uasset.py @@ -22,7 +22,13 @@ class ExtractUAsset(publish.Extractor): staging_dir = self.staging_dir(instance) filename = "{}.uasset".format(instance.name) - obj = instance[0] + members = instance.data.get("members", []) + + if not members: + raise RuntimeError("No members found in instance.") + + # UAsset publishing supports only one member + obj = members[0] asset = ar.get_asset_by_object_path(obj).get_asset() sys_path = unreal.SystemLibrary.get_system_path(asset) From 6f15f39e4ffcbc5f4d8f09627901b5cc78daa13f Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Thu, 2 Feb 2023 12:18:03 +0000 Subject: [PATCH 397/912] Improved attributes for the creators --- openpype/hosts/unreal/api/plugin.py | 20 +++++++++++++------ .../unreal/plugins/create/create_render.py | 6 ++++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/unreal/api/plugin.py b/openpype/hosts/unreal/api/plugin.py index da571af9be..7121aea20b 100644 --- a/openpype/hosts/unreal/api/plugin.py +++ b/openpype/hosts/unreal/api/plugin.py @@ -14,7 +14,10 @@ from .pipeline import ( lsinst, UNREAL_VERSION ) -from openpype.lib import BoolDef +from openpype.lib import ( + BoolDef, + UILabelDef +) from openpype.pipeline import ( Creator, LoaderPlugin, @@ -143,11 +146,6 @@ class UnrealBaseCreator(Creator): self._remove_instance_from_context(instance) - def get_pre_create_attr_defs(self): - return [ - BoolDef("use_selection", label="Use selection", default=True) - ] - @six.add_metaclass(ABCMeta) class UnrealAssetCreator(UnrealBaseCreator): @@ -187,6 +185,11 @@ class UnrealAssetCreator(UnrealBaseCreator): OpenPypeCreatorError(f"Creator error: {er}"), sys.exc_info()[2]) + def get_pre_create_attr_defs(self): + return [ + BoolDef("use_selection", label="Use selection", default=True) + ] + @six.add_metaclass(ABCMeta) class UnrealActorCreator(UnrealBaseCreator): @@ -239,6 +242,11 @@ class UnrealActorCreator(UnrealBaseCreator): OpenPypeCreatorError(f"Creator error: {er}"), sys.exc_info()[2]) + def get_pre_create_attr_defs(self): + return [ + UILabelDef("Select actors to create instance from them.") + ] + class Loader(LoaderPlugin, ABC): """This serves as skeleton for future OpenPype specific functionality""" diff --git a/openpype/hosts/unreal/plugins/create/create_render.py b/openpype/hosts/unreal/plugins/create/create_render.py index de3efdad74..8100a5016c 100644 --- a/openpype/hosts/unreal/plugins/create/create_render.py +++ b/openpype/hosts/unreal/plugins/create/create_render.py @@ -7,6 +7,7 @@ from openpype.hosts.unreal.api.pipeline import ( from openpype.hosts.unreal.api.plugin import ( UnrealAssetCreator, ) +from openpype.lib import UILabelDef class CreateRender(UnrealAssetCreator): @@ -129,3 +130,8 @@ class CreateRender(UnrealAssetCreator): subset_name, instance_data, pre_create_data) + + def get_pre_create_attr_defs(self): + return [ + UILabelDef("Select the sequence to render.") + ] From f3834db1ae65566e91e4ba5532befbab637a333e Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Thu, 2 Feb 2023 16:15:03 +0000 Subject: [PATCH 398/912] Fix render creator problem with selection --- .../hosts/unreal/plugins/create/create_render.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/openpype/hosts/unreal/plugins/create/create_render.py b/openpype/hosts/unreal/plugins/create/create_render.py index 8100a5016c..a1e3e43a78 100644 --- a/openpype/hosts/unreal/plugins/create/create_render.py +++ b/openpype/hosts/unreal/plugins/create/create_render.py @@ -6,6 +6,7 @@ from openpype.hosts.unreal.api.pipeline import ( ) from openpype.hosts.unreal.api.plugin import ( UnrealAssetCreator, + OpenPypeCreatorError ) from openpype.lib import UILabelDef @@ -21,13 +22,13 @@ class CreateRender(UnrealAssetCreator): def create(self, subset_name, instance_data, pre_create_data): ar = unreal.AssetRegistryHelpers.get_asset_registry() - if pre_create_data.get("use_selection"): - sel_objects = unreal.EditorUtilityLibrary.get_selected_assets() - selection = [ - a.get_path_name() for a in sel_objects - if a.get_class().get_name() == "LevelSequence"] - else: - selection = [instance_data['sequence']] + sel_objects = unreal.EditorUtilityLibrary.get_selected_assets() + selection = [ + a.get_path_name() for a in sel_objects + if a.get_class().get_name() == "LevelSequence"] + + if len(selection) == 0: + raise RuntimeError("Please select at least one Level Sequence.") seq_data = None From cae2186d402e6546e14b66c9a99d4bd772311cd3 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Thu, 2 Feb 2023 16:17:23 +0000 Subject: [PATCH 399/912] Hound fixes --- openpype/hosts/unreal/plugins/create/create_render.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openpype/hosts/unreal/plugins/create/create_render.py b/openpype/hosts/unreal/plugins/create/create_render.py index a1e3e43a78..c957e50e29 100644 --- a/openpype/hosts/unreal/plugins/create/create_render.py +++ b/openpype/hosts/unreal/plugins/create/create_render.py @@ -5,8 +5,7 @@ from openpype.hosts.unreal.api.pipeline import ( get_subsequences ) from openpype.hosts.unreal.api.plugin import ( - UnrealAssetCreator, - OpenPypeCreatorError + UnrealAssetCreator ) from openpype.lib import UILabelDef From b54d83247800c601f5e120cd02ed69e37bd347ef Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Wed, 15 Feb 2023 11:41:57 +0000 Subject: [PATCH 400/912] Implemented suggestions from review --- openpype/hosts/unreal/api/pipeline.py | 3 - openpype/hosts/unreal/api/plugin.py | 69 +++++++------------ .../unreal/plugins/create/create_camera.py | 2 +- .../unreal/plugins/create/create_look.py | 14 ++-- 4 files changed, 37 insertions(+), 51 deletions(-) diff --git a/openpype/hosts/unreal/api/pipeline.py b/openpype/hosts/unreal/api/pipeline.py index 7a21effcbc..0fe8c02ec5 100644 --- a/openpype/hosts/unreal/api/pipeline.py +++ b/openpype/hosts/unreal/api/pipeline.py @@ -69,9 +69,6 @@ class UnrealHost(HostBase, ILoadHost, IPublishHost): op_ctx = content_path + CONTEXT_CONTAINER with open(op_ctx, "w+") as f: json.dump(data, f) - with open(op_ctx, "r") as fp: - test = eval(json.load(fp)) - unreal.log_warning(test) def get_context_data(self): content_path = unreal.Paths.project_content_dir() diff --git a/openpype/hosts/unreal/api/plugin.py b/openpype/hosts/unreal/api/plugin.py index 7121aea20b..fc724105b6 100644 --- a/openpype/hosts/unreal/api/plugin.py +++ b/openpype/hosts/unreal/api/plugin.py @@ -1,10 +1,8 @@ # -*- coding: utf-8 -*- +import collections import sys import six -from abc import ( - ABC, - ABCMeta, -) +from abc import ABC import unreal @@ -26,11 +24,6 @@ from openpype.pipeline import ( ) -class OpenPypeCreatorError(CreatorError): - pass - - -@six.add_metaclass(ABCMeta) class UnrealBaseCreator(Creator): """Base class for Unreal creator plugins.""" root = "/Game/OpenPype/PublishInstances" @@ -56,28 +49,20 @@ class UnrealBaseCreator(Creator): """ if shared_data.get("unreal_cached_subsets") is None: - shared_data["unreal_cached_subsets"] = {} - if shared_data.get("unreal_cached_legacy_subsets") is None: - shared_data["unreal_cached_legacy_subsets"] = {} - cached_instances = lsinst() - for i in cached_instances: - if not i.get("creator_identifier"): - # we have legacy instance - family = i.get("family") - if (family not in - shared_data["unreal_cached_legacy_subsets"]): - shared_data[ - "unreal_cached_legacy_subsets"][family] = [i] - else: - shared_data[ - "unreal_cached_legacy_subsets"][family].append(i) - continue - - creator_id = i.get("creator_identifier") - if creator_id not in shared_data["unreal_cached_subsets"]: - shared_data["unreal_cached_subsets"][creator_id] = [i] + unreal_cached_subsets = collections.defaultdict(list) + unreal_cached_legacy_subsets = collections.defaultdict(list) + for instance in lsinst(): + creator_id = instance.get("creator_identifier") + if creator_id: + unreal_cached_subsets[creator_id].append(instance) else: - shared_data["unreal_cached_subsets"][creator_id].append(i) + family = instance.get("family") + unreal_cached_legacy_subsets[family].append(instance) + + shared_data["unreal_cached_subsets"] = unreal_cached_subsets + shared_data["unreal_cached_legacy_subsets"] = ( + unreal_cached_legacy_subsets + ) return shared_data def create(self, subset_name, instance_data, pre_create_data): @@ -108,8 +93,8 @@ class UnrealBaseCreator(Creator): except Exception as er: six.reraise( - OpenPypeCreatorError, - OpenPypeCreatorError(f"Creator error: {er}"), + CreatorError, + CreatorError(f"Creator error: {er}"), sys.exc_info()[2]) def collect_instances(self): @@ -121,17 +106,17 @@ class UnrealBaseCreator(Creator): self._add_instance_to_context(created_instance) def update_instances(self, update_list): - unreal.log_warning(f"Update instances: {update_list}") - for created_inst, _changes in update_list: + for created_inst, changes in update_list: instance_node = created_inst.get("instance_path", "") if not instance_node: unreal.log_warning( f"Instance node not found for {created_inst}") + continue new_values = { - key: new_value - for key, (_old_value, new_value) in _changes.items() + key: changes[key].new_value + for key in changes.changed_keys } imprint( instance_node, @@ -147,7 +132,6 @@ class UnrealBaseCreator(Creator): self._remove_instance_from_context(instance) -@six.add_metaclass(ABCMeta) class UnrealAssetCreator(UnrealBaseCreator): """Base class for Unreal creator plugins based on assets.""" @@ -181,8 +165,8 @@ class UnrealAssetCreator(UnrealBaseCreator): except Exception as er: six.reraise( - OpenPypeCreatorError, - OpenPypeCreatorError(f"Creator error: {er}"), + CreatorError, + CreatorError(f"Creator error: {er}"), sys.exc_info()[2]) def get_pre_create_attr_defs(self): @@ -191,7 +175,6 @@ class UnrealAssetCreator(UnrealBaseCreator): ] -@six.add_metaclass(ABCMeta) class UnrealActorCreator(UnrealBaseCreator): """Base class for Unreal creator plugins based on actors.""" @@ -214,7 +197,7 @@ class UnrealActorCreator(UnrealBaseCreator): # Check if the level is saved if world.get_path_name().startswith("/Temp/"): - raise OpenPypeCreatorError( + raise CreatorError( "Level must be saved before creating instances.") # Check if instance data has members, filled by the plugin. @@ -238,8 +221,8 @@ class UnrealActorCreator(UnrealBaseCreator): except Exception as er: six.reraise( - OpenPypeCreatorError, - OpenPypeCreatorError(f"Creator error: {er}"), + CreatorError, + CreatorError(f"Creator error: {er}"), sys.exc_info()[2]) def get_pre_create_attr_defs(self): diff --git a/openpype/hosts/unreal/plugins/create/create_camera.py b/openpype/hosts/unreal/plugins/create/create_camera.py index 239dc87db5..00815e1ed4 100644 --- a/openpype/hosts/unreal/plugins/create/create_camera.py +++ b/openpype/hosts/unreal/plugins/create/create_camera.py @@ -10,4 +10,4 @@ class CreateCamera(UnrealActorCreator): identifier = "io.openpype.creators.unreal.camera" label = "Camera" family = "camera" - icon = "camera" + icon = "fa.camera" diff --git a/openpype/hosts/unreal/plugins/create/create_look.py b/openpype/hosts/unreal/plugins/create/create_look.py index 047764ef2a..cecb88bca3 100644 --- a/openpype/hosts/unreal/plugins/create/create_look.py +++ b/openpype/hosts/unreal/plugins/create/create_look.py @@ -7,6 +7,7 @@ from openpype.hosts.unreal.api.pipeline import ( from openpype.hosts.unreal.api.plugin import ( UnrealAssetCreator ) +from openpype.lib import UILabelDef class CreateLook(UnrealAssetCreator): @@ -18,10 +19,10 @@ class CreateLook(UnrealAssetCreator): icon = "paint-brush" def create(self, subset_name, instance_data, pre_create_data): - selection = [] - if pre_create_data.get("use_selection"): - sel_objects = unreal.EditorUtilityLibrary.get_selected_assets() - selection = [a.get_path_name() for a in sel_objects] + # We need to set this to True for the parent class to work + pre_create_data["use_selection"] = True + sel_objects = unreal.EditorUtilityLibrary.get_selected_assets() + selection = [a.get_path_name() for a in sel_objects] if len(selection) != 1: raise RuntimeError("Please select only one asset.") @@ -68,3 +69,8 @@ class CreateLook(UnrealAssetCreator): subset_name, instance_data, pre_create_data) + + def get_pre_create_attr_defs(self): + return [ + UILabelDef("Select the asset from which to create the look.") + ] From 4f882b9b1989edaa53464ce3375ca85124d65489 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Wed, 15 Feb 2023 11:45:30 +0000 Subject: [PATCH 401/912] Fixed problem with the instance metadata --- openpype/hosts/unreal/api/pipeline.py | 2 +- openpype/hosts/unreal/api/plugin.py | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/unreal/api/pipeline.py b/openpype/hosts/unreal/api/pipeline.py index 0fe8c02ec5..0810ec7c07 100644 --- a/openpype/hosts/unreal/api/pipeline.py +++ b/openpype/hosts/unreal/api/pipeline.py @@ -76,7 +76,7 @@ class UnrealHost(HostBase, ILoadHost, IPublishHost): if not os.path.isfile(op_ctx): return {} with open(op_ctx, "r") as fp: - data = eval(json.load(fp)) + data = json.load(fp) return data diff --git a/openpype/hosts/unreal/api/plugin.py b/openpype/hosts/unreal/api/plugin.py index fc724105b6..a852ed9bb1 100644 --- a/openpype/hosts/unreal/api/plugin.py +++ b/openpype/hosts/unreal/api/plugin.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +import ast import collections import sys import six @@ -89,7 +90,9 @@ class UnrealBaseCreator(Creator): obj = ar.get_asset_by_object_path(member).get_asset() assets.add(obj) - imprint(f"{self.root}/{instance_name}", instance_data) + imprint(f"{self.root}/{instance_name}", instance.data_to_store()) + + return instance except Exception as er: six.reraise( @@ -102,6 +105,11 @@ class UnrealBaseCreator(Creator): self.cache_subsets(self.collection_shared_data) for instance in self.collection_shared_data[ "unreal_cached_subsets"].get(self.identifier, []): + # Unreal saves metadata as string, so we need to convert it back + instance['creator_attributes'] = ast.literal_eval( + instance.get('creator_attributes', '{}')) + instance['publish_attributes'] = ast.literal_eval( + instance.get('publish_attributes', '{}')) created_instance = CreatedInstance.from_existing(instance, self) self._add_instance_to_context(created_instance) From 606b3e3449e5f9ad0493ec3e93358bdd3a65f4c0 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Mon, 20 Feb 2023 12:31:13 +0000 Subject: [PATCH 402/912] More changes from suggestions --- openpype/hosts/unreal/api/pipeline.py | 2 +- openpype/hosts/unreal/api/plugin.py | 12 +++++++++--- openpype/hosts/unreal/plugins/create/create_look.py | 3 ++- .../hosts/unreal/plugins/create/create_render.py | 7 ++++--- .../hosts/unreal/plugins/create/create_uasset.py | 7 ++++--- .../plugins/publish/collect_instance_members.py | 5 +---- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/openpype/hosts/unreal/api/pipeline.py b/openpype/hosts/unreal/api/pipeline.py index 0810ec7c07..4a22189c14 100644 --- a/openpype/hosts/unreal/api/pipeline.py +++ b/openpype/hosts/unreal/api/pipeline.py @@ -152,7 +152,7 @@ def ls(): yield data -def lsinst(): +def ls_inst(): ar = unreal.AssetRegistryHelpers.get_asset_registry() # UE 5.1 changed how class name is specified class_name = [ diff --git a/openpype/hosts/unreal/api/plugin.py b/openpype/hosts/unreal/api/plugin.py index a852ed9bb1..2498a249e8 100644 --- a/openpype/hosts/unreal/api/plugin.py +++ b/openpype/hosts/unreal/api/plugin.py @@ -3,14 +3,17 @@ import ast import collections import sys import six -from abc import ABC +from abc import ( + ABC, + ABCMeta, +) import unreal from .pipeline import ( create_publish_instance, imprint, - lsinst, + ls_inst, UNREAL_VERSION ) from openpype.lib import ( @@ -25,6 +28,7 @@ from openpype.pipeline import ( ) +@six.add_metaclass(ABCMeta) class UnrealBaseCreator(Creator): """Base class for Unreal creator plugins.""" root = "/Game/OpenPype/PublishInstances" @@ -52,7 +56,7 @@ class UnrealBaseCreator(Creator): if shared_data.get("unreal_cached_subsets") is None: unreal_cached_subsets = collections.defaultdict(list) unreal_cached_legacy_subsets = collections.defaultdict(list) - for instance in lsinst(): + for instance in ls_inst(): creator_id = instance.get("creator_identifier") if creator_id: unreal_cached_subsets[creator_id].append(instance) @@ -140,6 +144,7 @@ class UnrealBaseCreator(Creator): self._remove_instance_from_context(instance) +@six.add_metaclass(ABCMeta) class UnrealAssetCreator(UnrealBaseCreator): """Base class for Unreal creator plugins based on assets.""" @@ -183,6 +188,7 @@ class UnrealAssetCreator(UnrealBaseCreator): ] +@six.add_metaclass(ABCMeta) class UnrealActorCreator(UnrealBaseCreator): """Base class for Unreal creator plugins based on actors.""" diff --git a/openpype/hosts/unreal/plugins/create/create_look.py b/openpype/hosts/unreal/plugins/create/create_look.py index cecb88bca3..f6c73e47e6 100644 --- a/openpype/hosts/unreal/plugins/create/create_look.py +++ b/openpype/hosts/unreal/plugins/create/create_look.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import unreal +from openpype.pipeline import CreatorError from openpype.hosts.unreal.api.pipeline import ( create_folder ) @@ -25,7 +26,7 @@ class CreateLook(UnrealAssetCreator): selection = [a.get_path_name() for a in sel_objects] if len(selection) != 1: - raise RuntimeError("Please select only one asset.") + raise CreatorError("Please select only one asset.") selected_asset = selection[0] diff --git a/openpype/hosts/unreal/plugins/create/create_render.py b/openpype/hosts/unreal/plugins/create/create_render.py index c957e50e29..5834d2e7a7 100644 --- a/openpype/hosts/unreal/plugins/create/create_render.py +++ b/openpype/hosts/unreal/plugins/create/create_render.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import unreal +from openpype.pipeline import CreatorError from openpype.hosts.unreal.api.pipeline import ( get_subsequences ) @@ -26,8 +27,8 @@ class CreateRender(UnrealAssetCreator): a.get_path_name() for a in sel_objects if a.get_class().get_name() == "LevelSequence"] - if len(selection) == 0: - raise RuntimeError("Please select at least one Level Sequence.") + if not selection: + raise CreatorError("Please select at least one Level Sequence.") seq_data = None @@ -41,7 +42,7 @@ class CreateRender(UnrealAssetCreator): f"Skipping {selected_asset.get_name()}. It isn't a Level " "Sequence.") - # The asset name is the the third element of the path which + # The asset name is the third element of the path which # contains the map. # To take the asset name, we remove from the path the prefix # "/Game/OpenPype/" and then we split the path by "/". diff --git a/openpype/hosts/unreal/plugins/create/create_uasset.py b/openpype/hosts/unreal/plugins/create/create_uasset.py index 2d6fcc1d59..70f17d478b 100644 --- a/openpype/hosts/unreal/plugins/create/create_uasset.py +++ b/openpype/hosts/unreal/plugins/create/create_uasset.py @@ -3,6 +3,7 @@ from pathlib import Path import unreal +from openpype.pipeline import CreatorError from openpype.hosts.unreal.api.plugin import ( UnrealAssetCreator, ) @@ -24,7 +25,7 @@ class CreateUAsset(UnrealAssetCreator): selection = [a.get_path_name() for a in sel_objects] if len(selection) != 1: - raise RuntimeError("Please select only one object.") + raise CreatorError("Please select only one object.") obj = selection[0] @@ -32,12 +33,12 @@ class CreateUAsset(UnrealAssetCreator): sys_path = unreal.SystemLibrary.get_system_path(asset) if not sys_path: - raise RuntimeError( + raise CreatorError( f"{Path(obj).name} is not on the disk. Likely it needs to" "be saved first.") if Path(sys_path).suffix != ".uasset": - raise RuntimeError(f"{Path(sys_path).name} is not a UAsset.") + raise CreatorError(f"{Path(sys_path).name} is not a UAsset.") super(CreateUAsset, self).create( subset_name, diff --git a/openpype/hosts/unreal/plugins/publish/collect_instance_members.py b/openpype/hosts/unreal/plugins/publish/collect_instance_members.py index 74969f5033..bd467a98fb 100644 --- a/openpype/hosts/unreal/plugins/publish/collect_instance_members.py +++ b/openpype/hosts/unreal/plugins/publish/collect_instance_members.py @@ -39,10 +39,7 @@ class CollectInstanceMembers(pyblish.api.InstancePlugin): assets = pub_instance.get_editor_property('asset_data_external') - members = [] - - for asset in assets: - members.append(asset.get_path_name()) + members = [asset.get_path_name() for asset in assets] self.log.debug(f"Members: {members}") From 637c1c08068a57a98972f8a0c29838f5628e6645 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Tue, 21 Feb 2023 12:28:33 +0000 Subject: [PATCH 403/912] Addressing a concurrency issue when trying to access context --- openpype/hosts/unreal/api/pipeline.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/unreal/api/pipeline.py b/openpype/hosts/unreal/api/pipeline.py index 4a22189c14..8a5a459194 100644 --- a/openpype/hosts/unreal/api/pipeline.py +++ b/openpype/hosts/unreal/api/pipeline.py @@ -5,6 +5,7 @@ import logging from typing import List from contextlib import contextmanager import semver +import time import pyblish.api @@ -63,12 +64,21 @@ class UnrealHost(HostBase, ILoadHost, IPublishHost): show_tools_dialog() def update_context_data(self, data, changes): - unreal.log_warning("update_context_data") - unreal.log_warning(data) content_path = unreal.Paths.project_content_dir() op_ctx = content_path + CONTEXT_CONTAINER - with open(op_ctx, "w+") as f: - json.dump(data, f) + attempts = 3 + for i in range(attempts): + try: + with open(op_ctx, "w+") as f: + json.dump(data, f) + break + except IOError: + if i == attempts - 1: + raise Exception("Failed to write context data. Aborting.") + unreal.log_warning("Failed to write context data. Retrying...") + i += 1 + time.sleep(3) + continue def get_context_data(self): content_path = unreal.Paths.project_content_dir() From e958a692896027fe351e1b74266546eef5eb3fb3 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Tue, 21 Feb 2023 17:30:23 +0000 Subject: [PATCH 404/912] Fix UnrealActorCreator when getting actors from the scene --- openpype/hosts/unreal/api/plugin.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/unreal/api/plugin.py b/openpype/hosts/unreal/api/plugin.py index 2498a249e8..d60050a696 100644 --- a/openpype/hosts/unreal/api/plugin.py +++ b/openpype/hosts/unreal/api/plugin.py @@ -217,12 +217,9 @@ class UnrealActorCreator(UnrealBaseCreator): # Check if instance data has members, filled by the plugin. # If not, use selection. if not instance_data.get("members"): - selection = [] - - if pre_create_data.get("use_selection"): - utility_lib = unreal.EditorUtilityLibrary - sel_objects = utility_lib.get_selected_assets() - selection = [a.get_path_name() for a in sel_objects] + actor_subsystem = unreal.EditorActorSubsystem() + sel_actors = actor_subsystem.get_selected_level_actors() + selection = [a.get_path_name() for a in sel_actors] instance_data["members"] = selection From 8fb21d9a1444326ed7b43aa4efe7f4e7f7aeaa2b Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Tue, 21 Feb 2023 17:32:17 +0000 Subject: [PATCH 405/912] Fix Camera Publishing --- .../unreal/plugins/create/create_camera.py | 29 ++++++++- .../publish/collect_instance_members.py | 2 +- .../unreal/plugins/publish/extract_camera.py | 64 ++++++++++++++----- 3 files changed, 76 insertions(+), 19 deletions(-) diff --git a/openpype/hosts/unreal/plugins/create/create_camera.py b/openpype/hosts/unreal/plugins/create/create_camera.py index 00815e1ed4..642924e2d6 100644 --- a/openpype/hosts/unreal/plugins/create/create_camera.py +++ b/openpype/hosts/unreal/plugins/create/create_camera.py @@ -1,13 +1,38 @@ # -*- coding: utf-8 -*- +import unreal + +from openpype.pipeline import CreatorError +from openpype.hosts.unreal.api.pipeline import UNREAL_VERSION from openpype.hosts.unreal.api.plugin import ( - UnrealActorCreator, + UnrealAssetCreator, ) -class CreateCamera(UnrealActorCreator): +class CreateCamera(UnrealAssetCreator): """Create Camera.""" identifier = "io.openpype.creators.unreal.camera" label = "Camera" family = "camera" icon = "fa.camera" + + def create(self, subset_name, instance_data, pre_create_data): + if pre_create_data.get("use_selection"): + sel_objects = unreal.EditorUtilityLibrary.get_selected_assets() + selection = [a.get_path_name() for a in sel_objects] + + if len(selection) != 1: + raise CreatorError("Please select only one object.") + + # Add the current level path to the metadata + if UNREAL_VERSION.major == 5: + world = unreal.UnrealEditorSubsystem().get_editor_world() + else: + world = unreal.EditorLevelLibrary.get_editor_world() + + instance_data["level"] = world.get_path_name() + + super(CreateCamera, self).create( + subset_name, + instance_data, + pre_create_data) diff --git a/openpype/hosts/unreal/plugins/publish/collect_instance_members.py b/openpype/hosts/unreal/plugins/publish/collect_instance_members.py index bd467a98fb..46ca51ab7e 100644 --- a/openpype/hosts/unreal/plugins/publish/collect_instance_members.py +++ b/openpype/hosts/unreal/plugins/publish/collect_instance_members.py @@ -14,7 +14,7 @@ class CollectInstanceMembers(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.1 hosts = ["unreal"] - families = ["look", "unrealStaticMesh", "uasset"] + families = ["camera", "look", "unrealStaticMesh", "uasset"] label = "Collect Instance Members" def process(self, instance): diff --git a/openpype/hosts/unreal/plugins/publish/extract_camera.py b/openpype/hosts/unreal/plugins/publish/extract_camera.py index 4e37cc6a86..70a835aca2 100644 --- a/openpype/hosts/unreal/plugins/publish/extract_camera.py +++ b/openpype/hosts/unreal/plugins/publish/extract_camera.py @@ -3,10 +3,9 @@ import os import unreal -from unreal import EditorAssetLibrary as eal -from unreal import EditorLevelLibrary as ell from openpype.pipeline import publish +from openpype.hosts.unreal.api.pipeline import UNREAL_VERSION class ExtractCamera(publish.Extractor): @@ -18,6 +17,8 @@ class ExtractCamera(publish.Extractor): optional = True def process(self, instance): + ar = unreal.AssetRegistryHelpers.get_asset_registry() + # Define extract output file path staging_dir = self.staging_dir(instance) fbx_filename = "{}.fbx".format(instance.name) @@ -26,23 +27,54 @@ class ExtractCamera(publish.Extractor): self.log.info("Performing extraction..") # Check if the loaded level is the same of the instance - current_level = ell.get_editor_world().get_path_name() + if UNREAL_VERSION.major == 5: + world = unreal.UnrealEditorSubsystem().get_editor_world() + else: + world = unreal.EditorLevelLibrary.get_editor_world() + current_level = world.get_path_name() assert current_level == instance.data.get("level"), \ "Wrong level loaded" - for member in instance[:]: - data = eal.find_asset_data(member) - if data.asset_class == "LevelSequence": - ar = unreal.AssetRegistryHelpers.get_asset_registry() - sequence = ar.get_asset_by_object_path(member).get_asset() - unreal.SequencerTools.export_fbx( - ell.get_editor_world(), - sequence, - sequence.get_bindings(), - unreal.FbxExportOption(), - os.path.join(staging_dir, fbx_filename) - ) - break + for member in instance.data.get('members'): + data = ar.get_asset_by_object_path(member) + if UNREAL_VERSION.major == 5: + is_level_sequence = ( + data.asset_class_path.asset_name == "LevelSequence") + else: + is_level_sequence = (data.asset_class == "LevelSequence") + + if is_level_sequence: + sequence = data.get_asset() + if UNREAL_VERSION.major == 5 and UNREAL_VERSION.minor >= 1: + params = unreal.SequencerExportFBXParams( + world=world, + root_sequence=sequence, + sequence=sequence, + bindings=sequence.get_bindings(), + master_tracks=sequence.get_master_tracks(), + fbx_file_name=os.path.join(staging_dir, fbx_filename) + ) + unreal.SequencerTools.export_level_sequence_fbx(params) + elif UNREAL_VERSION.major == 4 and UNREAL_VERSION.minor == 26: + unreal.SequencerTools.export_fbx( + world, + sequence, + sequence.get_bindings(), + unreal.FbxExportOption(), + os.path.join(staging_dir, fbx_filename) + ) + else: + # Unreal 5.0 or 4.27 + unreal.SequencerTools.export_level_sequence_fbx( + world, + sequence, + sequence.get_bindings(), + unreal.FbxExportOption(), + os.path.join(staging_dir, fbx_filename) + ) + + if not os.path.isfile(os.path.join(staging_dir, fbx_filename)): + raise RuntimeError("Failed to extract camera") if "representations" not in instance.data: instance.data["representations"] = [] From 1dd41d072d5b038e03f20b0d19262ea34933a841 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Tue, 21 Feb 2023 17:33:29 +0000 Subject: [PATCH 406/912] Hound fixes --- openpype/hosts/unreal/plugins/publish/extract_camera.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/unreal/plugins/publish/extract_camera.py b/openpype/hosts/unreal/plugins/publish/extract_camera.py index 70a835aca2..16e365ca96 100644 --- a/openpype/hosts/unreal/plugins/publish/extract_camera.py +++ b/openpype/hosts/unreal/plugins/publish/extract_camera.py @@ -39,7 +39,7 @@ class ExtractCamera(publish.Extractor): data = ar.get_asset_by_object_path(member) if UNREAL_VERSION.major == 5: is_level_sequence = ( - data.asset_class_path.asset_name == "LevelSequence") + data.asset_class_path.asset_name == "LevelSequence") else: is_level_sequence = (data.asset_class == "LevelSequence") From 9f44aff3ed946e7158c8ba3be67ae084384fbd7c Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Tue, 21 Feb 2023 17:40:10 +0000 Subject: [PATCH 407/912] Changed menu to remove Create and link Publish to new publisher --- openpype/hosts/unreal/api/tools_ui.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/unreal/api/tools_ui.py b/openpype/hosts/unreal/api/tools_ui.py index 708e167a65..8531472142 100644 --- a/openpype/hosts/unreal/api/tools_ui.py +++ b/openpype/hosts/unreal/api/tools_ui.py @@ -17,9 +17,8 @@ class ToolsBtnsWidget(QtWidgets.QWidget): def __init__(self, parent=None): super(ToolsBtnsWidget, self).__init__(parent) - create_btn = QtWidgets.QPushButton("Create...", self) load_btn = QtWidgets.QPushButton("Load...", self) - publish_btn = QtWidgets.QPushButton("Publish...", self) + publish_btn = QtWidgets.QPushButton("Publisher...", self) manage_btn = QtWidgets.QPushButton("Manage...", self) render_btn = QtWidgets.QPushButton("Render...", self) experimental_tools_btn = QtWidgets.QPushButton( @@ -28,7 +27,6 @@ class ToolsBtnsWidget(QtWidgets.QWidget): layout = QtWidgets.QVBoxLayout(self) layout.setContentsMargins(0, 0, 0, 0) - layout.addWidget(create_btn, 0) layout.addWidget(load_btn, 0) layout.addWidget(publish_btn, 0) layout.addWidget(manage_btn, 0) @@ -36,7 +34,6 @@ class ToolsBtnsWidget(QtWidgets.QWidget): layout.addWidget(experimental_tools_btn, 0) layout.addStretch(1) - create_btn.clicked.connect(self._on_create) load_btn.clicked.connect(self._on_load) publish_btn.clicked.connect(self._on_publish) manage_btn.clicked.connect(self._on_manage) @@ -50,7 +47,7 @@ class ToolsBtnsWidget(QtWidgets.QWidget): self.tool_required.emit("loader") def _on_publish(self): - self.tool_required.emit("publish") + self.tool_required.emit("publisher") def _on_manage(self): self.tool_required.emit("sceneinventory") From a07e76ebb56d9dc325f11b40a5b336f4125725e0 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 23 Feb 2023 11:05:26 +0100 Subject: [PATCH 408/912] OP-4643 - updates to documentation Co-authored-by: Roy Nieterau --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index f58d2c2bf2..d904080ad1 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -51,7 +51,7 @@ OIIOTools transcoder plugin with configurable output presets. Any incoming repre `oiiotool` is used for transcoding, eg. `oiiotool` must be present in `vendor/bin/oiio` or environment variable `OPENPYPE_OIIO_PATHS` must be provided for custom oiio installation. Notable parameters: -- **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. +- **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation loses its 'review' tag if present. - **`Extension`** - target extension. If left empty, original extension is used. - **`Transcoding type`** - transcoding into colorspace or into display and viewer space could be used. Cannot use both at the same time. - **`Colorspace`** - target colorspace, which must be available in used color config. (If `Transcoding type` is `Use Colorspace` value in configuration is used OR if empty value collected on instance from DCC). From 2a912abbcebccdf16e21e4ac597b17f8b282f932 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 10:53:44 +0100 Subject: [PATCH 409/912] extract sequence can ignore layer's transparency --- .../plugins/publish/extract_sequence.py | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py b/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py index f2856c72a9..1a21715aa2 100644 --- a/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py +++ b/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py @@ -59,6 +59,10 @@ class ExtractSequence(pyblish.api.Extractor): ) ) + ignore_layers_transparency = instance.data.get( + "ignoreLayersTransparency", False + ) + family_lowered = instance.data["family"].lower() mark_in = instance.context.data["sceneMarkIn"] mark_out = instance.context.data["sceneMarkOut"] @@ -114,7 +118,11 @@ class ExtractSequence(pyblish.api.Extractor): else: # Render output result = self.render( - output_dir, mark_in, mark_out, filtered_layers + output_dir, + mark_in, + mark_out, + filtered_layers, + ignore_layers_transparency ) output_filepaths_by_frame_idx, thumbnail_fullpath = result @@ -274,7 +282,9 @@ class ExtractSequence(pyblish.api.Extractor): return output_filepaths_by_frame_idx, thumbnail_filepath - def render(self, output_dir, mark_in, mark_out, layers): + def render( + self, output_dir, mark_in, mark_out, layers, ignore_layer_opacity + ): """ Export images from TVPaint. Args: @@ -282,6 +292,7 @@ class ExtractSequence(pyblish.api.Extractor): mark_in (int): Starting frame index from which export will begin. mark_out (int): On which frame index export will end. layers (list): List of layers to be exported. + ignore_layer_opacity (bool): Layer's opacity will be ignored. Returns: tuple: With 2 items first is list of filenames second is path to @@ -323,7 +334,7 @@ class ExtractSequence(pyblish.api.Extractor): for layer_id, render_data in extraction_data_by_layer_id.items(): layer = layers_by_id[layer_id] filepaths_by_layer_id[layer_id] = self._render_layer( - render_data, layer, output_dir + render_data, layer, output_dir, ignore_layer_opacity ) # Prepare final filepaths where compositing should store result @@ -380,7 +391,9 @@ class ExtractSequence(pyblish.api.Extractor): red, green, blue = self.review_bg return (red, green, blue) - def _render_layer(self, render_data, layer, output_dir): + def _render_layer( + self, render_data, layer, output_dir, ignore_layer_opacity + ): frame_references = render_data["frame_references"] filenames_by_frame_index = render_data["filenames_by_frame_index"] @@ -389,6 +402,12 @@ class ExtractSequence(pyblish.api.Extractor): "tv_layerset {}".format(layer_id), "tv_SaveMode \"PNG\"" ] + # Set density to 100 and store previous opacity + if ignore_layer_opacity: + george_script_lines.extend([ + "tv_layerdensity 100", + "orig_opacity = result", + ]) filepaths_by_frame = {} frames_to_render = [] @@ -409,6 +428,10 @@ class ExtractSequence(pyblish.api.Extractor): # Store image to output george_script_lines.append("tv_saveimage \"{}\"".format(dst_path)) + # Set density back to origin opacity + if ignore_layer_opacity: + george_script_lines.append("tv_layerdensity orig_opacity") + self.log.debug("Rendering Exposure frames {} of layer {} ({})".format( ",".join(frames_to_render), layer_id, layer["name"] )) From fd086776102236e9137a8d6d80d56b5d8def2a3a Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 10:58:49 +0100 Subject: [PATCH 410/912] collect render instances can set 'ignoreLayersTransparency' --- .../tvpaint/plugins/publish/collect_render_instances.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py b/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py index ba89deac5d..e89fbf7882 100644 --- a/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py +++ b/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py @@ -9,6 +9,8 @@ class CollectRenderInstances(pyblish.api.InstancePlugin): hosts = ["tvpaint"] families = ["render", "review"] + ignore_render_pass_transparency = False + def process(self, instance): context = instance.context creator_identifier = instance.data["creator_identifier"] @@ -63,6 +65,9 @@ class CollectRenderInstances(pyblish.api.InstancePlugin): for layer in layers_data if layer["name"] in layer_names ] + instance.data["ignoreLayersTransparency"] = ( + self.ignore_render_pass_transparency + ) render_layer_data = None render_layer_id = creator_attributes["render_layer_instance_id"] From 9c8a9412006a2c6a598cbb5d9253ca8dfb837126 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 10:59:03 +0100 Subject: [PATCH 411/912] added settings for Collect Render Instances --- .../defaults/project_settings/tvpaint.json | 3 +++ .../projects_schema/schema_project_tvpaint.json | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json index 0b6d3d7e81..87d3601ae4 100644 --- a/openpype/settings/defaults/project_settings/tvpaint.json +++ b/openpype/settings/defaults/project_settings/tvpaint.json @@ -49,6 +49,9 @@ } }, "publish": { + "CollectRenderInstances": { + "ignore_render_pass_transparency": true + }, "ExtractSequence": { "review_bg": [ 255, diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json index 57016a8311..708b688ba5 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json @@ -241,6 +241,20 @@ "key": "publish", "label": "Publish plugins", "children": [ + { + "type": "dict", + "collapsible": true, + "key": "CollectRenderInstances", + "label": "Collect Render Instances", + "is_group": true, + "children": [ + { + "type": "boolean", + "key": "ignore_render_pass_transparency", + "label": "Ignore Render Pass opacity" + } + ] + }, { "type": "dict", "collapsible": true, From 0cfc46f4140531e5646df353c81d8ec6895b1b44 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 11:19:49 +0100 Subject: [PATCH 412/912] disable ignore transparency by default --- openpype/settings/defaults/project_settings/tvpaint.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json index 87d3601ae4..e06a67a254 100644 --- a/openpype/settings/defaults/project_settings/tvpaint.json +++ b/openpype/settings/defaults/project_settings/tvpaint.json @@ -50,7 +50,7 @@ }, "publish": { "CollectRenderInstances": { - "ignore_render_pass_transparency": true + "ignore_render_pass_transparency": false }, "ExtractSequence": { "review_bg": [ From ddf333fcdb502ecb8ce10a9b2d2152de198c686c Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 10:39:10 +0100 Subject: [PATCH 413/912] fix access to not existing settings key --- openpype/hosts/tvpaint/plugins/create/create_render.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 40386efe91..7e85977b11 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -660,7 +660,6 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): ["create"] ["auto_detect_render"] ) - self.enabled = plugin_settings["enabled"] self.allow_group_rename = plugin_settings["allow_group_rename"] self.group_name_template = plugin_settings["group_name_template"] self.group_idx_offset = plugin_settings["group_idx_offset"] From bae2ded2f711d68291d6a6d14e60cb19f856d1c5 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 23 Feb 2023 11:30:15 +0100 Subject: [PATCH 414/912] Fix - check existence only if not None review_path might be None --- openpype/modules/slack/plugins/publish/integrate_slack_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/modules/slack/plugins/publish/integrate_slack_api.py b/openpype/modules/slack/plugins/publish/integrate_slack_api.py index 4e2557ccc7..86c97586d2 100644 --- a/openpype/modules/slack/plugins/publish/integrate_slack_api.py +++ b/openpype/modules/slack/plugins/publish/integrate_slack_api.py @@ -187,7 +187,7 @@ class IntegrateSlackAPI(pyblish.api.InstancePlugin): repre_review_path = get_publish_repre_path( instance, repre, False ) - if os.path.exists(repre_review_path): + if repre_review_path and os.path.exists(repre_review_path): review_path = repre_review_path if "burnin" in tags: # burnin has precedence if exists break From d74e17a0e112c48714a87afeddf7750494fb6fca Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 21 Feb 2023 17:40:29 +0000 Subject: [PATCH 415/912] Implement get_multipart --- openpype/hosts/maya/api/lib_renderproducts.py | 82 ++++++++++++------- 1 file changed, 52 insertions(+), 30 deletions(-) diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py index 60090e9f6d..e635414029 100644 --- a/openpype/hosts/maya/api/lib_renderproducts.py +++ b/openpype/hosts/maya/api/lib_renderproducts.py @@ -196,12 +196,18 @@ class ARenderProducts: """Constructor.""" self.layer = layer self.render_instance = render_instance - self.multipart = False + self.multipart = self.get_multipart() # Initialize self.layer_data = self._get_layer_data() self.layer_data.products = self.get_render_products() + def get_multipart(self): + raise NotImplementedError( + "The render product implementation does not have a " + "\"get_multipart\" method." + ) + def has_camera_token(self): # type: () -> bool """Check if camera token is in image prefix. @@ -344,7 +350,6 @@ class ARenderProducts: separator = file_prefix[matches[0].end(1):matches[1].start(1)] return separator - def _get_layer_data(self): # type: () -> LayerMetadata # ______________________________________________ @@ -531,16 +536,20 @@ class RenderProductsArnold(ARenderProducts): return prefix - def _get_aov_render_products(self, aov, cameras=None): - """Return all render products for the AOV""" - - products = [] - aov_name = self._get_attr(aov, "name") + def get_multipart(self): multipart = False multilayer = bool(self._get_attr("defaultArnoldDriver.multipart")) merge_AOVs = bool(self._get_attr("defaultArnoldDriver.mergeAOVs")) if multilayer or merge_AOVs: multipart = True + + return multipart + + def _get_aov_render_products(self, aov, cameras=None): + """Return all render products for the AOV""" + + products = [] + aov_name = self._get_attr(aov, "name") ai_drivers = cmds.listConnections("{}.outputs".format(aov), source=True, destination=False, @@ -594,7 +603,7 @@ class RenderProductsArnold(ARenderProducts): ext=ext, aov=aov_name, driver=ai_driver, - multipart=multipart, + multipart=self.multipart, camera=camera) products.append(product) @@ -731,6 +740,14 @@ class RenderProductsVray(ARenderProducts): renderer = "vray" + def get_multipart(self): + multipart = False + image_format = self._get_attr("vraySettings.imageFormatStr") + if image_format == "exr (multichannel)": + multipart = True + + return multipart + def get_renderer_prefix(self): # type: () -> str """Get image prefix for V-Ray. @@ -797,11 +814,6 @@ class RenderProductsVray(ARenderProducts): if default_ext in {"exr (multichannel)", "exr (deep)"}: default_ext = "exr" - # Define multipart. - multipart = False - if image_format_str == "exr (multichannel)": - multipart = True - products = [] # add beauty as default when not disabled @@ -813,7 +825,7 @@ class RenderProductsVray(ARenderProducts): productName="", ext=default_ext, camera=camera, - multipart=multipart + multipart=self.multipart ) ) @@ -826,10 +838,10 @@ class RenderProductsVray(ARenderProducts): productName="Alpha", ext=default_ext, camera=camera, - multipart=multipart + multipart=self.multipart ) ) - if multipart: + if self.multipart: # AOVs are merged in m-channel file, only main layer is rendered return products @@ -989,6 +1001,19 @@ class RenderProductsRedshift(ARenderProducts): renderer = "redshift" unmerged_aovs = {"Cryptomatte"} + def get_multipart(self): + # For Redshift we don't directly return upon forcing multilayer + # due to some AOVs still being written into separate files, + # like Cryptomatte. + # AOVs are merged in multi-channel file + multipart = False + force_layer = bool(self._get_attr("redshiftOptions.exrForceMultilayer")) # noqa + exMultipart = bool(self._get_attr("redshiftOptions.exrMultipart")) + if exMultipart or force_layer: + multipart = True + + return multipart + def get_renderer_prefix(self): """Get image prefix for Redshift. @@ -1028,16 +1053,6 @@ class RenderProductsRedshift(ARenderProducts): for c in self.get_renderable_cameras() ] - # For Redshift we don't directly return upon forcing multilayer - # due to some AOVs still being written into separate files, - # like Cryptomatte. - # AOVs are merged in multi-channel file - multipart = False - force_layer = bool(self._get_attr("redshiftOptions.exrForceMultilayer")) # noqa - exMultipart = bool(self._get_attr("redshiftOptions.exrMultipart")) - if exMultipart or force_layer: - multipart = True - # Get Redshift Extension from image format image_format = self._get_attr("redshiftOptions.imageFormat") # integer ext = mel.eval("redshiftGetImageExtension(%i)" % image_format) @@ -1059,7 +1074,7 @@ class RenderProductsRedshift(ARenderProducts): continue aov_type = self._get_attr(aov, "aovType") - if multipart and aov_type not in self.unmerged_aovs: + if self.multipart and aov_type not in self.unmerged_aovs: continue # Any AOVs that still get processed, like Cryptomatte @@ -1094,7 +1109,7 @@ class RenderProductsRedshift(ARenderProducts): productName=aov_light_group_name, aov=aov_name, ext=ext, - multipart=multipart, + multipart=self.multipart, camera=camera) products.append(product) @@ -1108,7 +1123,7 @@ class RenderProductsRedshift(ARenderProducts): product = RenderProduct(productName=aov_name, aov=aov_name, ext=ext, - multipart=multipart, + multipart=self.multipart, camera=camera) products.append(product) @@ -1124,7 +1139,7 @@ class RenderProductsRedshift(ARenderProducts): products.insert(0, RenderProduct(productName=beauty_name, ext=ext, - multipart=multipart, + multipart=self.multipart, camera=camera)) return products @@ -1144,6 +1159,10 @@ class RenderProductsRenderman(ARenderProducts): renderer = "renderman" unmerged_aovs = {"PxrCryptomatte"} + def get_multipart(self): + # Implemented as display specific in "get_render_products". + return False + def get_render_products(self): """Get all AOVs. @@ -1283,6 +1302,9 @@ class RenderProductsMayaHardware(ARenderProducts): {"label": "EXR(exr)", "index": 40, "extension": "exr"} ] + def get_multipart(self): + return False + def _get_extension(self, value): result = None if isinstance(value, int): From 069e1eed21a360d8a01effdacd3b3684954ea83c Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 22 Feb 2023 18:00:11 +0000 Subject: [PATCH 416/912] Fix Redshift expected files. --- openpype/hosts/maya/api/lib_renderproducts.py | 26 +++++++++++++++---- .../maya/plugins/publish/collect_render.py | 7 ++++- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py index e635414029..4e9e13d2a3 100644 --- a/openpype/hosts/maya/api/lib_renderproducts.py +++ b/openpype/hosts/maya/api/lib_renderproducts.py @@ -1001,6 +1001,20 @@ class RenderProductsRedshift(ARenderProducts): renderer = "redshift" unmerged_aovs = {"Cryptomatte"} + def get_files(self, product): + # When outputting AOVs we need to replace Redshift specific AOV tokens + # with Maya render tokens for generating file sequences. We validate to + # a specific AOV fileprefix so we only need to accout for one + # replacement. + if not product.multipart and product.driver: + file_prefix = self._get_attr(product.driver + ".filePrefix") + self.layer_data.filePrefix = file_prefix.replace( + "/", + "//" + ) + + return super(RenderProductsRedshift, self).get_files(product) + def get_multipart(self): # For Redshift we don't directly return upon forcing multilayer # due to some AOVs still being written into separate files, @@ -1009,7 +1023,7 @@ class RenderProductsRedshift(ARenderProducts): multipart = False force_layer = bool(self._get_attr("redshiftOptions.exrForceMultilayer")) # noqa exMultipart = bool(self._get_attr("redshiftOptions.exrMultipart")) - if exMultipart or force_layer: + if exMultipart and force_layer: multipart = True return multipart @@ -1109,8 +1123,9 @@ class RenderProductsRedshift(ARenderProducts): productName=aov_light_group_name, aov=aov_name, ext=ext, - multipart=self.multipart, - camera=camera) + multipart=False, + camera=camera, + driver=aov) products.append(product) if light_groups: @@ -1123,8 +1138,9 @@ class RenderProductsRedshift(ARenderProducts): product = RenderProduct(productName=aov_name, aov=aov_name, ext=ext, - multipart=self.multipart, - camera=camera) + multipart=False, + camera=camera, + driver=aov) products.append(product) # When a Beauty AOV is added manually, it will be rendered as diff --git a/openpype/hosts/maya/plugins/publish/collect_render.py b/openpype/hosts/maya/plugins/publish/collect_render.py index f2b5262187..338f148f85 100644 --- a/openpype/hosts/maya/plugins/publish/collect_render.py +++ b/openpype/hosts/maya/plugins/publish/collect_render.py @@ -42,6 +42,7 @@ Provides: import re import os import platform +import json from maya import cmds import maya.app.renderSetup.model.renderSetup as renderSetup @@ -183,7 +184,11 @@ class CollectMayaRender(pyblish.api.ContextPlugin): self.log.info("multipart: {}".format( multipart)) assert exp_files, "no file names were generated, this is bug" - self.log.info(exp_files) + self.log.info( + "expected files: {}".format( + json.dumps(exp_files, indent=4, sort_keys=True) + ) + ) # if we want to attach render to subset, check if we have AOV's # in expectedFiles. If so, raise error as we cannot attach AOV From 43020a6c9d6a8366048a294969deb5d6e6a999e8 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 23 Feb 2023 09:20:25 +0000 Subject: [PATCH 417/912] Only use force options as multipart identifier. --- openpype/hosts/maya/api/lib_renderproducts.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py index 4e9e13d2a3..02e55601b9 100644 --- a/openpype/hosts/maya/api/lib_renderproducts.py +++ b/openpype/hosts/maya/api/lib_renderproducts.py @@ -1021,9 +1021,10 @@ class RenderProductsRedshift(ARenderProducts): # like Cryptomatte. # AOVs are merged in multi-channel file multipart = False - force_layer = bool(self._get_attr("redshiftOptions.exrForceMultilayer")) # noqa - exMultipart = bool(self._get_attr("redshiftOptions.exrMultipart")) - if exMultipart and force_layer: + force_layer = bool( + self._get_attr("redshiftOptions.exrForceMultilayer") + ) + if force_layer: multipart = True return multipart From 9c688309a9883654c0fb66fab992e6f28323670c Mon Sep 17 00:00:00 2001 From: Toke Jepsen Date: Thu, 23 Feb 2023 11:53:55 +0000 Subject: [PATCH 418/912] Update openpype/hosts/maya/api/lib_renderproducts.py --- openpype/hosts/maya/api/lib_renderproducts.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py index 02e55601b9..463324284b 100644 --- a/openpype/hosts/maya/api/lib_renderproducts.py +++ b/openpype/hosts/maya/api/lib_renderproducts.py @@ -1320,6 +1320,7 @@ class RenderProductsMayaHardware(ARenderProducts): ] def get_multipart(self): + # MayaHardware does not support multipart EXRs. return False def _get_extension(self, value): From d760cbab77c39f3a4ae9b72924ad222304a8aa65 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 31 Jan 2023 06:55:36 +0000 Subject: [PATCH 419/912] Batch script for running Openpype on Deadline. --- tools/openpype_console.bat | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tools/openpype_console.bat diff --git a/tools/openpype_console.bat b/tools/openpype_console.bat new file mode 100644 index 0000000000..414b5fdf66 --- /dev/null +++ b/tools/openpype_console.bat @@ -0,0 +1,3 @@ +cd "%~dp0\.." +echo %OPENPYPE_MONGO% +.poetry\bin\poetry.exe run python start.py %* From 5d9fe60013148054b3cbd70d3701febc7f2fe3a4 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Fri, 17 Feb 2023 16:25:35 +0000 Subject: [PATCH 420/912] Commenting for documentation --- tools/openpype_console.bat | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/openpype_console.bat b/tools/openpype_console.bat index 414b5fdf66..04b28c389f 100644 --- a/tools/openpype_console.bat +++ b/tools/openpype_console.bat @@ -1,3 +1,15 @@ +goto comment +SYNOPSIS + Helper script running scripts through the OpenPype environment. + +DESCRIPTION + This script is usually used as a replacement for building when tested farm integration like Deadline. + +EXAMPLE + +cmd> .\openpype_console.bat path/to/python_script.py +:comment + cd "%~dp0\.." echo %OPENPYPE_MONGO% .poetry\bin\poetry.exe run python start.py %* From 7c73995971a39ef5f77bfe277cd86cddc76b78cd Mon Sep 17 00:00:00 2001 From: Fabia Serra Arrizabalaga Date: Thu, 23 Feb 2023 00:52:40 +0100 Subject: [PATCH 421/912] Move get_workfile_build_placeholder_plugins to NukeHost class as workfile template builder expects --- openpype/hosts/nuke/api/__init__.py | 3 --- openpype/hosts/nuke/api/pipeline.py | 13 ++++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/openpype/hosts/nuke/api/__init__.py b/openpype/hosts/nuke/api/__init__.py index 3b00ca9f6f..1af5ff365d 100644 --- a/openpype/hosts/nuke/api/__init__.py +++ b/openpype/hosts/nuke/api/__init__.py @@ -30,7 +30,6 @@ from .pipeline import ( parse_container, update_container, - get_workfile_build_placeholder_plugins, ) from .lib import ( INSTANCE_DATA_KNOB, @@ -79,8 +78,6 @@ __all__ = ( "parse_container", "update_container", - "get_workfile_build_placeholder_plugins", - "INSTANCE_DATA_KNOB", "ROOT_DATA_KNOB", "maintained_selection", diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index 6dec60d81a..d5289010cb 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -101,6 +101,12 @@ class NukeHost( def get_workfile_extensions(self): return file_extensions() + def get_workfile_build_placeholder_plugins(self): + return [ + NukePlaceholderLoadPlugin, + NukePlaceholderCreatePlugin + ] + def get_containers(self): return ls() @@ -200,13 +206,6 @@ def _show_workfiles(): host_tools.show_workfiles(parent=None, on_top=False) -def get_workfile_build_placeholder_plugins(): - return [ - NukePlaceholderLoadPlugin, - NukePlaceholderCreatePlugin - ] - - def _install_menu(): # uninstall original avalon menu main_window = get_main_window() From 2921579164112453343a580f8f358c124eb9c1d7 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 11:57:51 +0100 Subject: [PATCH 422/912] OP-4643 - added Settings for ExtractColorTranscode --- .../defaults/project_settings/global.json | 4 + .../schemas/schema_global_publish.json | 73 +++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index cedc2d6876..8485bec67b 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -68,6 +68,10 @@ "output": [] } }, + "ExtractColorTranscode": { + "enabled": true, + "profiles": [] + }, "ExtractReview": { "enabled": true, "profiles": [ diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 5388d04bc9..46ae6ba554 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -197,6 +197,79 @@ } ] }, + { + "type": "dict", + "collapsible": true, + "key": "ExtractColorTranscode", + "label": "ExtractColorTranscode", + "checkbox_key": "enabled", + "is_group": true, + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "list", + "key": "profiles", + "label": "Profiles", + "object_type": { + "type": "dict", + "children": [ + { + "key": "families", + "label": "Families", + "type": "list", + "object_type": "text" + }, + { + "key": "hosts", + "label": "Host names", + "type": "hosts-enum", + "multiselection": true + }, + { + "key": "task_types", + "label": "Task types", + "type": "task-types-enum" + }, + { + "key": "task_names", + "label": "Task names", + "type": "list", + "object_type": "text" + }, + { + "key": "subsets", + "label": "Subset names", + "type": "list", + "object_type": "text" + }, + { + "type": "splitter" + }, + { + "key": "ext", + "label": "Output extension", + "type": "text" + }, + { + "key": "output_colorspace", + "label": "Output colorspace", + "type": "text" + }, + { + "key": "custom_tags", + "label": "Custom Tags", + "type": "list", + "object_type": "text" + } + ] + } + } + ] + }, { "type": "dict", "collapsible": true, From 8a67065fce1bd39de5870bb768365dffafdda8b2 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 11:58:51 +0100 Subject: [PATCH 423/912] OP-4643 - added ExtractColorTranscode Added method to convert from one colorspace to another to transcoding lib --- openpype/lib/transcoding.py | 53 ++++++++ .../publish/extract_color_transcode.py | 124 ++++++++++++++++++ 2 files changed, 177 insertions(+) create mode 100644 openpype/plugins/publish/extract_color_transcode.py diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 039255d937..2fc662f2a4 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1045,3 +1045,56 @@ def convert_ffprobe_fps_to_float(value): if divisor == 0.0: return 0.0 return dividend / divisor + + +def convert_colorspace_for_input_paths( + input_paths, + output_dir, + source_color_space, + target_color_space, + logger=None +): + """Convert source files from one color space to another. + + Filenames of input files are kept so make sure that output directory + is not the same directory as input files have. + - This way it can handle gaps and can keep input filenames without handling + frame template + + Args: + input_paths (str): Paths that should be converted. It is expected that + contains single file or image sequence of samy type. + output_dir (str): Path to directory where output will be rendered. + Must not be same as input's directory. + source_color_space (str): ocio valid color space of source files + target_color_space (str): ocio valid target color space + logger (logging.Logger): Logger used for logging. + + """ + if logger is None: + logger = logging.getLogger(__name__) + + input_arg = "-i" + oiio_cmd = [ + get_oiio_tools_path(), + + # Don't add any additional attributes + "--nosoftwareattrib", + "--colorconvert", source_color_space, target_color_space + ] + for input_path in input_paths: + # Prepare subprocess arguments + + oiio_cmd.extend([ + input_arg, input_path, + ]) + + # Add last argument - path to output + base_filename = os.path.basename(input_path) + output_path = os.path.join(output_dir, base_filename) + oiio_cmd.extend([ + "-o", output_path + ]) + + logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) + run_subprocess(oiio_cmd, logger=logger) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py new file mode 100644 index 0000000000..58508ab18f --- /dev/null +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -0,0 +1,124 @@ +import pyblish.api + +from openpype.pipeline import publish +from openpype.lib import ( + + is_oiio_supported, +) + +from openpype.lib.transcoding import ( + convert_colorspace_for_input_paths, + get_transcode_temp_directory, +) + +from openpype.lib.profiles_filtering import filter_profiles + + +class ExtractColorTranscode(publish.Extractor): + """ + Extractor to convert colors from one colorspace to different. + """ + + label = "Transcode color spaces" + order = pyblish.api.ExtractorOrder + 0.01 + + optional = True + + # Configurable by Settings + profiles = None + options = None + + def process(self, instance): + if not self.profiles: + self.log.warning("No profiles present for create burnin") + return + + if "representations" not in instance.data: + self.log.warning("No representations, skipping.") + return + + if not is_oiio_supported(): + self.log.warning("OIIO not supported, no transcoding possible.") + return + + colorspace_data = instance.data.get("colorspaceData") + if not colorspace_data: + # TODO get_colorspace ?? + self.log.warning("Instance has not colorspace data, skipping") + return + source_color_space = colorspace_data["colorspace"] + + host_name = instance.context.data["hostName"] + family = instance.data["family"] + task_data = instance.data["anatomyData"].get("task", {}) + task_name = task_data.get("name") + task_type = task_data.get("type") + subset = instance.data["subset"] + + filtering_criteria = { + "hosts": host_name, + "families": family, + "task_names": task_name, + "task_types": task_type, + "subset": subset + } + profile = filter_profiles(self.profiles, filtering_criteria, + logger=self.log) + + if not profile: + self.log.info(( + "Skipped instance. None of profiles in presets are for" + " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" + " | Task type \"{}\" | Subset \"{}\" " + ).format(host_name, family, task_name, task_type, subset)) + return + + self.log.debug("profile: {}".format(profile)) + + target_colorspace = profile["output_colorspace"] + if not target_colorspace: + raise RuntimeError("Target colorspace must be set") + + repres = instance.data.get("representations") or [] + for idx, repre in enumerate(repres): + self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) + if not self.repre_is_valid(repre): + continue + + new_staging_dir = get_transcode_temp_directory() + repre["stagingDir"] = new_staging_dir + files_to_remove = repre["files"] + if not isinstance(files_to_remove, list): + files_to_remove = [files_to_remove] + instance.context.data["cleanupFullPaths"].extend(files_to_remove) + + convert_colorspace_for_input_paths( + repre["files"], + new_staging_dir, + source_color_space, + target_colorspace, + self.log + ) + + def repre_is_valid(self, repre): + """Validation if representation should be processed. + + Args: + repre (dict): Representation which should be checked. + + Returns: + bool: False if can't be processed else True. + """ + + if "review" not in (repre.get("tags") or []): + self.log.info(( + "Representation \"{}\" don't have \"review\" tag. Skipped." + ).format(repre["name"])) + return False + + if not repre.get("files"): + self.log.warning(( + "Representation \"{}\" have empty files. Skipped." + ).format(repre["name"])) + return False + return True From 76c00f9fa8888e991c61074ed894b09c211b55f0 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 12:05:57 +0100 Subject: [PATCH 424/912] OP-4643 - extractor must run just before ExtractReview Nuke render local is set to 0.01 --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 58508ab18f..5163cd4045 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -20,7 +20,7 @@ class ExtractColorTranscode(publish.Extractor): """ label = "Transcode color spaces" - order = pyblish.api.ExtractorOrder + 0.01 + order = pyblish.api.ExtractorOrder + 0.019 optional = True From 455eb379c26ac8494d1aff4fb257cd01e80dbdd5 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:03:22 +0100 Subject: [PATCH 425/912] OP-4643 - fix for full file paths --- .../publish/extract_color_transcode.py | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 5163cd4045..6ad7599f2c 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -1,3 +1,4 @@ +import os import pyblish.api from openpype.pipeline import publish @@ -41,13 +42,6 @@ class ExtractColorTranscode(publish.Extractor): self.log.warning("OIIO not supported, no transcoding possible.") return - colorspace_data = instance.data.get("colorspaceData") - if not colorspace_data: - # TODO get_colorspace ?? - self.log.warning("Instance has not colorspace data, skipping") - return - source_color_space = colorspace_data["colorspace"] - host_name = instance.context.data["hostName"] family = instance.data["family"] task_data = instance.data["anatomyData"].get("task", {}) @@ -82,18 +76,32 @@ class ExtractColorTranscode(publish.Extractor): repres = instance.data.get("representations") or [] for idx, repre in enumerate(repres): self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) - if not self.repre_is_valid(repre): + # if not self.repre_is_valid(repre): + # continue + + colorspace_data = repre.get("colorspaceData") + if not colorspace_data: + # TODO get_colorspace ?? + self.log.warning("Repre has not colorspace data, skipping") + continue + source_color_space = colorspace_data["colorspace"] + config_path = colorspace_data.get("configData", {}).get("path") + if not os.path.exists(config_path): + self.log.warning("Config file doesn't exist, skipping") continue new_staging_dir = get_transcode_temp_directory() + original_staging_dir = repre["stagingDir"] repre["stagingDir"] = new_staging_dir - files_to_remove = repre["files"] - if not isinstance(files_to_remove, list): - files_to_remove = [files_to_remove] - instance.context.data["cleanupFullPaths"].extend(files_to_remove) + files_to_convert = repre["files"] + if not isinstance(files_to_convert, list): + files_to_convert = [files_to_convert] + files_to_convert = [os.path.join(original_staging_dir, path) + for path in files_to_convert] + instance.context.data["cleanupFullPaths"].extend(files_to_convert) convert_colorspace_for_input_paths( - repre["files"], + files_to_convert, new_staging_dir, source_color_space, target_colorspace, From 52a5865341039d03da72dee00d4eb996334a4dbd Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:04:06 +0100 Subject: [PATCH 426/912] OP-4643 - pass path for ocio config --- openpype/lib/transcoding.py | 3 +++ openpype/plugins/publish/extract_color_transcode.py | 1 + 2 files changed, 4 insertions(+) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 2fc662f2a4..ab86e44304 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1050,6 +1050,7 @@ def convert_ffprobe_fps_to_float(value): def convert_colorspace_for_input_paths( input_paths, output_dir, + config_path, source_color_space, target_color_space, logger=None @@ -1066,6 +1067,7 @@ def convert_colorspace_for_input_paths( contains single file or image sequence of samy type. output_dir (str): Path to directory where output will be rendered. Must not be same as input's directory. + config_path (str): path to OCIO config file source_color_space (str): ocio valid color space of source files target_color_space (str): ocio valid target color space logger (logging.Logger): Logger used for logging. @@ -1080,6 +1082,7 @@ def convert_colorspace_for_input_paths( # Don't add any additional attributes "--nosoftwareattrib", + "--colorconfig", config_path, "--colorconvert", source_color_space, target_color_space ] for input_path in input_paths: diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 6ad7599f2c..fdb13a47e8 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -103,6 +103,7 @@ class ExtractColorTranscode(publish.Extractor): convert_colorspace_for_input_paths( files_to_convert, new_staging_dir, + config_path, source_color_space, target_colorspace, self.log From 0f1dcb64eb5c98ca1d78b48b4e9e4a9dcfc86ffa Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:15:33 +0100 Subject: [PATCH 427/912] OP-4643 - add custom_tags --- openpype/plugins/publish/extract_color_transcode.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index fdb13a47e8..ab932b2476 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -72,6 +72,7 @@ class ExtractColorTranscode(publish.Extractor): target_colorspace = profile["output_colorspace"] if not target_colorspace: raise RuntimeError("Target colorspace must be set") + custom_tags = profile["custom_tags"] repres = instance.data.get("representations") or [] for idx, repre in enumerate(repres): @@ -109,6 +110,11 @@ class ExtractColorTranscode(publish.Extractor): self.log ) + if custom_tags: + if not repre.get("custom_tags"): + repre["custom_tags"] = [] + repre["custom_tags"].extend(custom_tags) + def repre_is_valid(self, repre): """Validation if representation should be processed. From 4d29e43a41a49dd805390fd03d3d7602d15ad38f Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:18:38 +0100 Subject: [PATCH 428/912] OP-4643 - added docstring --- openpype/plugins/publish/extract_color_transcode.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index ab932b2476..88e2eed90f 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -18,6 +18,17 @@ from openpype.lib.profiles_filtering import filter_profiles class ExtractColorTranscode(publish.Extractor): """ Extractor to convert colors from one colorspace to different. + + Expects "colorspaceData" on representation. This dictionary is collected + previously and denotes that representation files should be converted. + This dict contains source colorspace information, collected by hosts. + + Target colorspace is selected by profiles in the Settings, based on: + - families + - host + - task types + - task names + - subset names """ label = "Transcode color spaces" From 454f65dc50253afdb7c74c7c8b851fcbe54c372d Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:15:44 +0100 Subject: [PATCH 429/912] OP-4643 - updated Settings schema --- .../schemas/schema_global_publish.json | 48 +++++++++++++------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 46ae6ba554..c2c911d7d6 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -246,24 +246,44 @@ "type": "list", "object_type": "text" }, + { + "type": "boolean", + "key": "delete_original", + "label": "Delete Original Representation" + }, { "type": "splitter" }, { - "key": "ext", - "label": "Output extension", - "type": "text" - }, - { - "key": "output_colorspace", - "label": "Output colorspace", - "type": "text" - }, - { - "key": "custom_tags", - "label": "Custom Tags", - "type": "list", - "object_type": "text" + "key": "outputs", + "label": "Output Definitions", + "type": "dict-modifiable", + "highlight_content": true, + "object_type": { + "type": "dict", + "children": [ + { + "key": "output_extension", + "label": "Output extension", + "type": "text" + }, + { + "key": "output_colorspace", + "label": "Output colorspace", + "type": "text" + }, + { + "type": "schema", + "name": "schema_representation_tags" + }, + { + "key": "custom_tags", + "label": "Custom Tags", + "type": "list", + "object_type": "text" + } + ] + } } ] } From a197c6820209db57dc3182ca392e51239be57bb5 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:17:25 +0100 Subject: [PATCH 430/912] OP-4643 - skip video files Only frames currently supported. --- .../plugins/publish/extract_color_transcode.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 88e2eed90f..a0714c9a33 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -36,6 +36,9 @@ class ExtractColorTranscode(publish.Extractor): optional = True + # Supported extensions + supported_exts = ["exr", "jpg", "jpeg", "png", "dpx"] + # Configurable by Settings profiles = None options = None @@ -88,13 +91,7 @@ class ExtractColorTranscode(publish.Extractor): repres = instance.data.get("representations") or [] for idx, repre in enumerate(repres): self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) - # if not self.repre_is_valid(repre): - # continue - - colorspace_data = repre.get("colorspaceData") - if not colorspace_data: - # TODO get_colorspace ?? - self.log.warning("Repre has not colorspace data, skipping") + if not self._repre_is_valid(repre): continue source_color_space = colorspace_data["colorspace"] config_path = colorspace_data.get("configData", {}).get("path") @@ -136,9 +133,9 @@ class ExtractColorTranscode(publish.Extractor): bool: False if can't be processed else True. """ - if "review" not in (repre.get("tags") or []): - self.log.info(( - "Representation \"{}\" don't have \"review\" tag. Skipped." + if repre.get("ext") not in self.supported_exts: + self.log.warning(( + "Representation \"{}\" of unsupported extension. Skipped." ).format(repre["name"])) return False From bd1a9c7342098e05e095f422200090ce918a56b5 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:19:08 +0100 Subject: [PATCH 431/912] OP-4643 - refactored profile, delete of original Implemented multiple outputs from single input representation --- .../publish/extract_color_transcode.py | 156 ++++++++++++------ 1 file changed, 109 insertions(+), 47 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index a0714c9a33..b0c851d5f4 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -1,4 +1,6 @@ import os +import copy + import pyblish.api from openpype.pipeline import publish @@ -56,13 +58,94 @@ class ExtractColorTranscode(publish.Extractor): self.log.warning("OIIO not supported, no transcoding possible.") return + profile = self._get_profile(instance) + if not profile: + return + + repres = instance.data.get("representations") or [] + for idx, repre in enumerate(list(repres)): + self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) + if not self._repre_is_valid(repre): + continue + + colorspace_data = repre["colorspaceData"] + source_color_space = colorspace_data["colorspace"] + config_path = colorspace_data.get("configData", {}).get("path") + if not os.path.exists(config_path): + self.log.warning("Config file doesn't exist, skipping") + continue + + repre = self._handle_original_repre(repre, profile) + + for _, output_def in profile.get("outputs", {}).items(): + new_repre = copy.deepcopy(repre) + + new_staging_dir = get_transcode_temp_directory() + original_staging_dir = new_repre["stagingDir"] + new_repre["stagingDir"] = new_staging_dir + files_to_convert = new_repre["files"] + if not isinstance(files_to_convert, list): + files_to_convert = [files_to_convert] + + files_to_delete = copy.deepcopy(files_to_convert) + + output_extension = output_def["output_extension"] + files_to_convert = self._rename_output_files(files_to_convert, + output_extension) + + files_to_convert = [os.path.join(original_staging_dir, path) + for path in files_to_convert] + + target_colorspace = output_def["output_colorspace"] + if not target_colorspace: + raise RuntimeError("Target colorspace must be set") + + convert_colorspace_for_input_paths( + files_to_convert, + new_staging_dir, + config_path, + source_color_space, + target_colorspace, + self.log + ) + + instance.context.data["cleanupFullPaths"].extend( + files_to_delete) + + custom_tags = output_def.get("custom_tags") + if custom_tags: + if not new_repre.get("custom_tags"): + new_repre["custom_tags"] = [] + new_repre["custom_tags"].extend(custom_tags) + + # Add additional tags from output definition to representation + for tag in output_def["tags"]: + if tag not in new_repre["tags"]: + new_repre["tags"].append(tag) + + instance.data["representations"].append(new_repre) + + def _rename_output_files(self, files_to_convert, output_extension): + """Change extension of converted files.""" + if output_extension: + output_extension = output_extension.replace('.', '') + renamed_files = [] + for file_name in files_to_convert: + file_name, _ = os.path.splitext(file_name) + new_file_name = '{}.{}'.format(file_name, + output_extension) + renamed_files.append(new_file_name) + files_to_convert = renamed_files + return files_to_convert + + def _get_profile(self, instance): + """Returns profile if and how repre should be color transcoded.""" host_name = instance.context.data["hostName"] family = instance.data["family"] task_data = instance.data["anatomyData"].get("task", {}) task_name = task_data.get("name") task_type = task_data.get("type") subset = instance.data["subset"] - filtering_criteria = { "hosts": host_name, "families": family, @@ -75,55 +158,15 @@ class ExtractColorTranscode(publish.Extractor): if not profile: self.log.info(( - "Skipped instance. None of profiles in presets are for" - " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" - " | Task type \"{}\" | Subset \"{}\" " - ).format(host_name, family, task_name, task_type, subset)) - return + "Skipped instance. None of profiles in presets are for" + " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" + " | Task type \"{}\" | Subset \"{}\" " + ).format(host_name, family, task_name, task_type, subset)) self.log.debug("profile: {}".format(profile)) + return profile - target_colorspace = profile["output_colorspace"] - if not target_colorspace: - raise RuntimeError("Target colorspace must be set") - custom_tags = profile["custom_tags"] - - repres = instance.data.get("representations") or [] - for idx, repre in enumerate(repres): - self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) - if not self._repre_is_valid(repre): - continue - source_color_space = colorspace_data["colorspace"] - config_path = colorspace_data.get("configData", {}).get("path") - if not os.path.exists(config_path): - self.log.warning("Config file doesn't exist, skipping") - continue - - new_staging_dir = get_transcode_temp_directory() - original_staging_dir = repre["stagingDir"] - repre["stagingDir"] = new_staging_dir - files_to_convert = repre["files"] - if not isinstance(files_to_convert, list): - files_to_convert = [files_to_convert] - files_to_convert = [os.path.join(original_staging_dir, path) - for path in files_to_convert] - instance.context.data["cleanupFullPaths"].extend(files_to_convert) - - convert_colorspace_for_input_paths( - files_to_convert, - new_staging_dir, - config_path, - source_color_space, - target_colorspace, - self.log - ) - - if custom_tags: - if not repre.get("custom_tags"): - repre["custom_tags"] = [] - repre["custom_tags"].extend(custom_tags) - - def repre_is_valid(self, repre): + def _repre_is_valid(self, repre): """Validation if representation should be processed. Args: @@ -144,4 +187,23 @@ class ExtractColorTranscode(publish.Extractor): "Representation \"{}\" have empty files. Skipped." ).format(repre["name"])) return False + + if not repre.get("colorspaceData"): + self.log.warning("Repre has not colorspace data, skipping") + return False + return True + + def _handle_original_repre(self, repre, profile): + delete_original = profile["delete_original"] + + if delete_original: + if not repre.get("tags"): + repre["tags"] = [] + + if "review" in repre["tags"]: + repre["tags"].remove("review") + if "delete" not in repre["tags"]: + repre["tags"].append("delete") + + return repre From bb85bc330a514f088fd2fad6037f60976e0e993b Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:23:01 +0100 Subject: [PATCH 432/912] OP-4643 - switched logging levels Do not use warning unnecessary. --- openpype/plugins/publish/extract_color_transcode.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index b0c851d5f4..4d38514b8b 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -47,11 +47,11 @@ class ExtractColorTranscode(publish.Extractor): def process(self, instance): if not self.profiles: - self.log.warning("No profiles present for create burnin") + self.log.debug("No profiles present for color transcode") return if "representations" not in instance.data: - self.log.warning("No representations, skipping.") + self.log.debug("No representations, skipping.") return if not is_oiio_supported(): @@ -177,19 +177,19 @@ class ExtractColorTranscode(publish.Extractor): """ if repre.get("ext") not in self.supported_exts: - self.log.warning(( + self.log.debug(( "Representation \"{}\" of unsupported extension. Skipped." ).format(repre["name"])) return False if not repre.get("files"): - self.log.warning(( + self.log.debug(( "Representation \"{}\" have empty files. Skipped." ).format(repre["name"])) return False if not repre.get("colorspaceData"): - self.log.warning("Repre has not colorspace data, skipping") + self.log.debug("Repre has no colorspace data. Skipped.") return False return True From 1fd17b9f597dfef41852572deae8edbec65c3280 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:46:14 +0100 Subject: [PATCH 433/912] OP-4643 - propagate new extension to representation --- .../publish/extract_color_transcode.py | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 4d38514b8b..62cf8f0dee 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -90,8 +90,13 @@ class ExtractColorTranscode(publish.Extractor): files_to_delete = copy.deepcopy(files_to_convert) output_extension = output_def["output_extension"] - files_to_convert = self._rename_output_files(files_to_convert, - output_extension) + output_extension = output_extension.replace('.', '') + if output_extension: + new_repre["name"] = output_extension + new_repre["ext"] = output_extension + + files_to_convert = self._rename_output_files( + files_to_convert, output_extension) files_to_convert = [os.path.join(original_staging_dir, path) for path in files_to_convert] @@ -127,15 +132,13 @@ class ExtractColorTranscode(publish.Extractor): def _rename_output_files(self, files_to_convert, output_extension): """Change extension of converted files.""" - if output_extension: - output_extension = output_extension.replace('.', '') - renamed_files = [] - for file_name in files_to_convert: - file_name, _ = os.path.splitext(file_name) - new_file_name = '{}.{}'.format(file_name, - output_extension) - renamed_files.append(new_file_name) - files_to_convert = renamed_files + renamed_files = [] + for file_name in files_to_convert: + file_name, _ = os.path.splitext(file_name) + new_file_name = '{}.{}'.format(file_name, + output_extension) + renamed_files.append(new_file_name) + files_to_convert = renamed_files return files_to_convert def _get_profile(self, instance): From ffec1179ad1c9c07fae71db44ff2dc96b6fd7ec2 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:46:35 +0100 Subject: [PATCH 434/912] OP-4643 - added label to Settings --- .../projects_schema/schemas/schema_global_publish.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index c2c911d7d6..7155510fef 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -201,10 +201,14 @@ "type": "dict", "collapsible": true, "key": "ExtractColorTranscode", - "label": "ExtractColorTranscode", + "label": "ExtractColorTranscode (ImageIO)", "checkbox_key": "enabled", "is_group": true, "children": [ + { + "type": "label", + "label": "Configure output format(s) and color spaces for matching representations. Empty 'Output extension' denotes keeping source extension." + }, { "type": "boolean", "key": "enabled", From 5a562dc821b2cbefc780509b44c084bba786e80c Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 16 Jan 2023 18:22:08 +0100 Subject: [PATCH 435/912] OP-4643 - refactored according to review Function turned into single filepath input. --- openpype/lib/transcoding.py | 43 ++++++----- .../publish/extract_color_transcode.py | 72 ++++++++++--------- 2 files changed, 57 insertions(+), 58 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index ab86e44304..e1bd22d109 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1047,12 +1047,12 @@ def convert_ffprobe_fps_to_float(value): return dividend / divisor -def convert_colorspace_for_input_paths( - input_paths, - output_dir, +def convert_colorspace( + input_path, + out_filepath, config_path, - source_color_space, - target_color_space, + source_colorspace, + target_colorspace, logger=None ): """Convert source files from one color space to another. @@ -1063,13 +1063,13 @@ def convert_colorspace_for_input_paths( frame template Args: - input_paths (str): Paths that should be converted. It is expected that + input_path (str): Paths that should be converted. It is expected that contains single file or image sequence of samy type. - output_dir (str): Path to directory where output will be rendered. + out_filepath (str): Path to directory where output will be rendered. Must not be same as input's directory. config_path (str): path to OCIO config file - source_color_space (str): ocio valid color space of source files - target_color_space (str): ocio valid target color space + source_colorspace (str): ocio valid color space of source files + target_colorspace (str): ocio valid target color space logger (logging.Logger): Logger used for logging. """ @@ -1083,21 +1083,18 @@ def convert_colorspace_for_input_paths( # Don't add any additional attributes "--nosoftwareattrib", "--colorconfig", config_path, - "--colorconvert", source_color_space, target_color_space + "--colorconvert", source_colorspace, target_colorspace ] - for input_path in input_paths: - # Prepare subprocess arguments + # Prepare subprocess arguments - oiio_cmd.extend([ - input_arg, input_path, - ]) + oiio_cmd.extend([ + input_arg, input_path, + ]) - # Add last argument - path to output - base_filename = os.path.basename(input_path) - output_path = os.path.join(output_dir, base_filename) - oiio_cmd.extend([ - "-o", output_path - ]) + # Add last argument - path to output + oiio_cmd.extend([ + "-o", out_filepath + ]) - logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) - run_subprocess(oiio_cmd, logger=logger) + logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) + run_subprocess(oiio_cmd, logger=logger) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 62cf8f0dee..3a05426432 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -10,7 +10,7 @@ from openpype.lib import ( ) from openpype.lib.transcoding import ( - convert_colorspace_for_input_paths, + convert_colorspace, get_transcode_temp_directory, ) @@ -69,7 +69,7 @@ class ExtractColorTranscode(publish.Extractor): continue colorspace_data = repre["colorspaceData"] - source_color_space = colorspace_data["colorspace"] + source_colorspace = colorspace_data["colorspace"] config_path = colorspace_data.get("configData", {}).get("path") if not os.path.exists(config_path): self.log.warning("Config file doesn't exist, skipping") @@ -80,8 +80,8 @@ class ExtractColorTranscode(publish.Extractor): for _, output_def in profile.get("outputs", {}).items(): new_repre = copy.deepcopy(repre) - new_staging_dir = get_transcode_temp_directory() original_staging_dir = new_repre["stagingDir"] + new_staging_dir = get_transcode_temp_directory() new_repre["stagingDir"] = new_staging_dir files_to_convert = new_repre["files"] if not isinstance(files_to_convert, list): @@ -92,27 +92,28 @@ class ExtractColorTranscode(publish.Extractor): output_extension = output_def["output_extension"] output_extension = output_extension.replace('.', '') if output_extension: - new_repre["name"] = output_extension + if new_repre["name"] == new_repre["ext"]: + new_repre["name"] = output_extension new_repre["ext"] = output_extension - files_to_convert = self._rename_output_files( - files_to_convert, output_extension) - - files_to_convert = [os.path.join(original_staging_dir, path) - for path in files_to_convert] - target_colorspace = output_def["output_colorspace"] if not target_colorspace: raise RuntimeError("Target colorspace must be set") - convert_colorspace_for_input_paths( - files_to_convert, - new_staging_dir, - config_path, - source_color_space, - target_colorspace, - self.log - ) + for file_name in files_to_convert: + input_filepath = os.path.join(original_staging_dir, + file_name) + output_path = self._get_output_file_path(input_filepath, + new_staging_dir, + output_extension) + convert_colorspace( + input_filepath, + output_path, + config_path, + source_colorspace, + target_colorspace, + self.log + ) instance.context.data["cleanupFullPaths"].extend( files_to_delete) @@ -130,16 +131,16 @@ class ExtractColorTranscode(publish.Extractor): instance.data["representations"].append(new_repre) - def _rename_output_files(self, files_to_convert, output_extension): - """Change extension of converted files.""" - renamed_files = [] - for file_name in files_to_convert: - file_name, _ = os.path.splitext(file_name) - new_file_name = '{}.{}'.format(file_name, - output_extension) - renamed_files.append(new_file_name) - files_to_convert = renamed_files - return files_to_convert + def _get_output_file_path(self, input_filepath, output_dir, + output_extension): + """Create output file name path.""" + file_name = os.path.basename(input_filepath) + file_name, input_extension = os.path.splitext(file_name) + if not output_extension: + output_extension = input_extension + new_file_name = '{}.{}'.format(file_name, + output_extension) + return os.path.join(output_dir, new_file_name) def _get_profile(self, instance): """Returns profile if and how repre should be color transcoded.""" @@ -161,10 +162,10 @@ class ExtractColorTranscode(publish.Extractor): if not profile: self.log.info(( - "Skipped instance. None of profiles in presets are for" - " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" - " | Task type \"{}\" | Subset \"{}\" " - ).format(host_name, family, task_name, task_type, subset)) + "Skipped instance. None of profiles in presets are for" + " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" + " | Task type \"{}\" | Subset \"{}\" " + ).format(host_name, family, task_name, task_type, subset)) self.log.debug("profile: {}".format(profile)) return profile @@ -181,18 +182,19 @@ class ExtractColorTranscode(publish.Extractor): if repre.get("ext") not in self.supported_exts: self.log.debug(( - "Representation \"{}\" of unsupported extension. Skipped." + "Representation '{}' of unsupported extension. Skipped." ).format(repre["name"])) return False if not repre.get("files"): self.log.debug(( - "Representation \"{}\" have empty files. Skipped." + "Representation '{}' have empty files. Skipped." ).format(repre["name"])) return False if not repre.get("colorspaceData"): - self.log.debug("Repre has no colorspace data. Skipped.") + self.log.debug("Representation '{}' has no colorspace data. " + "Skipped.") return False return True From e0a163bc2e836c9292e52757abab43d26bc44c07 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 12:53:02 +0100 Subject: [PATCH 436/912] OP-4643 - updated schema Co-authored-by: Toke Jepsen --- .../projects_schema/schemas/schema_global_publish.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 7155510fef..80c18ce118 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -267,8 +267,8 @@ "type": "dict", "children": [ { - "key": "output_extension", - "label": "Output extension", + "key": "extension", + "label": "Extension", "type": "text" }, { From 657c3156dfc046405cee116c6ccb141e60901d23 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 12:54:46 +0100 Subject: [PATCH 437/912] OP-4643 - updated plugin name in schema MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jakub Ježek --- .../projects_schema/schemas/schema_global_publish.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 80c18ce118..357cbfb287 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -200,8 +200,8 @@ { "type": "dict", "collapsible": true, - "key": "ExtractColorTranscode", - "label": "ExtractColorTranscode (ImageIO)", + "key": "ExtractOIIOTranscode", + "label": "Extract OIIO Transcode", "checkbox_key": "enabled", "is_group": true, "children": [ From 4b5c14e46686e471f20bef6909d6287b2eae6859 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 12:55:57 +0100 Subject: [PATCH 438/912] OP-4643 - updated key in schema Co-authored-by: Toke Jepsen --- .../projects_schema/schemas/schema_global_publish.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 357cbfb287..0281b0ded6 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -272,8 +272,8 @@ "type": "text" }, { - "key": "output_colorspace", - "label": "Output colorspace", + "key": "colorspace", + "label": "Colorspace", "type": "text" }, { From 756661f71b762fb738bd793984787941f2051e4d Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 12:57:03 +0100 Subject: [PATCH 439/912] OP-4643 - changed oiio_cmd creation Co-authored-by: Toke Jepsen --- openpype/lib/transcoding.py | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index e1bd22d109..f22628dd28 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1076,25 +1076,15 @@ def convert_colorspace( if logger is None: logger = logging.getLogger(__name__) - input_arg = "-i" oiio_cmd = [ get_oiio_tools_path(), - + input_path, # Don't add any additional attributes "--nosoftwareattrib", "--colorconfig", config_path, - "--colorconvert", source_colorspace, target_colorspace - ] - # Prepare subprocess arguments - - oiio_cmd.extend([ - input_arg, input_path, - ]) - - # Add last argument - path to output - oiio_cmd.extend([ + "--colorconvert", source_colorspace, target_colorspace, "-o", out_filepath - ]) + ] logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) From c3bf4734fdabc019c966bae93e131235f2560f34 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 13:44:45 +0100 Subject: [PATCH 440/912] OP-4643 - updated new keys into settings --- .../settings/defaults/project_settings/global.json | 2 +- .../projects_schema/schemas/schema_global_publish.json | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index 8485bec67b..a5e2d25a88 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -68,7 +68,7 @@ "output": [] } }, - "ExtractColorTranscode": { + "ExtractOIIOTranscode": { "enabled": true, "profiles": [] }, diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 0281b0ded6..74b81b13af 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -276,6 +276,16 @@ "label": "Colorspace", "type": "text" }, + { + "key": "display", + "label": "Display", + "type": "text" + }, + { + "key": "view", + "label": "View", + "type": "text" + }, { "type": "schema", "name": "schema_representation_tags" From 2b20ede6d86924a19e5bf5ad9697f451a85a757e Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 13:45:42 +0100 Subject: [PATCH 441/912] OP-4643 - renanmed plugin, added new keys into outputs --- openpype/plugins/publish/extract_color_transcode.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 3a05426432..cc63b35988 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -17,7 +17,7 @@ from openpype.lib.transcoding import ( from openpype.lib.profiles_filtering import filter_profiles -class ExtractColorTranscode(publish.Extractor): +class ExtractOIIOTranscode(publish.Extractor): """ Extractor to convert colors from one colorspace to different. @@ -89,14 +89,14 @@ class ExtractColorTranscode(publish.Extractor): files_to_delete = copy.deepcopy(files_to_convert) - output_extension = output_def["output_extension"] + output_extension = output_def["extension"] output_extension = output_extension.replace('.', '') if output_extension: if new_repre["name"] == new_repre["ext"]: new_repre["name"] = output_extension new_repre["ext"] = output_extension - target_colorspace = output_def["output_colorspace"] + target_colorspace = output_def["colorspace"] if not target_colorspace: raise RuntimeError("Target colorspace must be set") From 8b47a44d04aace508cc05608a18c4f7cce23cb9b Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 18:03:13 +0100 Subject: [PATCH 442/912] OP-4643 - fixed config path key --- openpype/plugins/publish/extract_color_transcode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index cc63b35988..245faeb306 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -70,8 +70,8 @@ class ExtractOIIOTranscode(publish.Extractor): colorspace_data = repre["colorspaceData"] source_colorspace = colorspace_data["colorspace"] - config_path = colorspace_data.get("configData", {}).get("path") - if not os.path.exists(config_path): + config_path = colorspace_data.get("config", {}).get("path") + if not config_path or not os.path.exists(config_path): self.log.warning("Config file doesn't exist, skipping") continue From ed7faeef8f0a7678e99f70645d57a72864cc9461 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 18:03:42 +0100 Subject: [PATCH 443/912] OP-4643 - fixed renaming files --- openpype/plugins/publish/extract_color_transcode.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 245faeb306..c079dcf70e 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -96,6 +96,14 @@ class ExtractOIIOTranscode(publish.Extractor): new_repre["name"] = output_extension new_repre["ext"] = output_extension + renamed_files = [] + _, orig_ext = os.path.splitext(files_to_convert[0]) + for file_name in files_to_convert: + file_name = file_name.replace(orig_ext, + "."+output_extension) + renamed_files.append(file_name) + new_repre["files"] = renamed_files + target_colorspace = output_def["colorspace"] if not target_colorspace: raise RuntimeError("Target colorspace must be set") From 4b1418a79242eb63cfd4295d70d474b992c276ea Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 18:04:44 +0100 Subject: [PATCH 444/912] OP-4643 - updated to calculate sequence format --- .../publish/extract_color_transcode.py | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index c079dcf70e..09c86909cb 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -1,5 +1,6 @@ import os import copy +import clique import pyblish.api @@ -108,6 +109,8 @@ class ExtractOIIOTranscode(publish.Extractor): if not target_colorspace: raise RuntimeError("Target colorspace must be set") + files_to_convert = self._translate_to_sequence( + files_to_convert) for file_name in files_to_convert: input_filepath = os.path.join(original_staging_dir, file_name) @@ -139,6 +142,40 @@ class ExtractOIIOTranscode(publish.Extractor): instance.data["representations"].append(new_repre) + def _translate_to_sequence(self, files_to_convert): + """Returns original list of files or single sequence format filename. + + Uses clique to find frame sequence, in this case it merges all frames + into sequence format (%0X) and returns it. + If sequence not found, it returns original list + + Args: + files_to_convert (list): list of file names + Returns: + (list) of [file.%04.exr] or [fileA.exr, fileB.exr] + """ + pattern = [clique.PATTERNS["frames"]] + collections, remainder = clique.assemble( + files_to_convert, patterns=pattern, + assume_padded_when_ambiguous=True) + + if collections: + if len(collections) > 1: + raise ValueError( + "Too many collections {}".format(collections)) + + collection = collections[0] + padding = collection.padding + padding_str = "%0{}".format(padding) + frames = list(collection.indexes) + frame_str = "{}-{}#".format(frames[0], frames[-1]) + file_name = "{}{}{}".format(collection.head, frame_str, + collection.tail) + + files_to_convert = [file_name] + + return files_to_convert + def _get_output_file_path(self, input_filepath, output_dir, output_extension): """Create output file name path.""" From 382074b54cc0eb7a7c6d403853f4350d485fa00a Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 18:54:02 +0100 Subject: [PATCH 445/912] OP-4643 - implemented display and viewer color space --- openpype/lib/transcoding.py | 23 +++++++++++++++++-- .../publish/extract_color_transcode.py | 13 +++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index f22628dd28..cc9cd4e1eb 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1053,6 +1053,8 @@ def convert_colorspace( config_path, source_colorspace, target_colorspace, + view, + display, logger=None ): """Convert source files from one color space to another. @@ -1070,8 +1072,11 @@ def convert_colorspace( config_path (str): path to OCIO config file source_colorspace (str): ocio valid color space of source files target_colorspace (str): ocio valid target color space + view (str): name for viewer space (ocio valid) + display (str): name for display-referred reference space (ocio valid) logger (logging.Logger): Logger used for logging. - + Raises: + ValueError: if misconfigured """ if logger is None: logger = logging.getLogger(__name__) @@ -1082,9 +1087,23 @@ def convert_colorspace( # Don't add any additional attributes "--nosoftwareattrib", "--colorconfig", config_path, - "--colorconvert", source_colorspace, target_colorspace, "-o", out_filepath ] + if all([target_colorspace, view, display]): + raise ValueError("Colorspace and both screen and display" + " cannot be set together." + "Choose colorspace or screen and display") + if not target_colorspace and not all([view, display]): + raise ValueError("Both screen and display must be set.") + + if target_colorspace: + oiio_cmd.extend(["--colorconvert", + source_colorspace, + target_colorspace]) + if view and display: + oiio_cmd.extend(["--iscolorspace", source_colorspace]) + oiio_cmd.extend(["--ociodisplay", display, view]) + logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 09c86909cb..cd8421c0cd 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -106,8 +106,15 @@ class ExtractOIIOTranscode(publish.Extractor): new_repre["files"] = renamed_files target_colorspace = output_def["colorspace"] - if not target_colorspace: - raise RuntimeError("Target colorspace must be set") + view = output_def["view"] or colorspace_data.get("view") + display = (output_def["display"] or + colorspace_data.get("display")) + # both could be already collected by DCC, + # but could be overwritten + if view: + new_repre["colorspaceData"]["view"] = view + if display: + new_repre["colorspaceData"]["view"] = display files_to_convert = self._translate_to_sequence( files_to_convert) @@ -123,6 +130,8 @@ class ExtractOIIOTranscode(publish.Extractor): config_path, source_colorspace, target_colorspace, + view, + display, self.log ) From 8873c9f9056b9b672fe95be0707c9ab8753726b8 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 19:03:10 +0100 Subject: [PATCH 446/912] OP-4643 - fix wrong order of deletion of representation --- openpype/plugins/publish/extract_color_transcode.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index cd8421c0cd..9cca5cc969 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -69,6 +69,8 @@ class ExtractOIIOTranscode(publish.Extractor): if not self._repre_is_valid(repre): continue + added_representations = False + colorspace_data = repre["colorspaceData"] source_colorspace = colorspace_data["colorspace"] config_path = colorspace_data.get("config", {}).get("path") @@ -76,8 +78,6 @@ class ExtractOIIOTranscode(publish.Extractor): self.log.warning("Config file doesn't exist, skipping") continue - repre = self._handle_original_repre(repre, profile) - for _, output_def in profile.get("outputs", {}).items(): new_repre = copy.deepcopy(repre) @@ -150,6 +150,10 @@ class ExtractOIIOTranscode(publish.Extractor): new_repre["tags"].append(tag) instance.data["representations"].append(new_repre) + added_representations = True + + if added_representations: + self._mark_original_repre_for_deletion(repre, profile) def _translate_to_sequence(self, files_to_convert): """Returns original list of files or single sequence format filename. @@ -253,7 +257,8 @@ class ExtractOIIOTranscode(publish.Extractor): return True - def _handle_original_repre(self, repre, profile): + def _mark_original_repre_for_deletion(self, repre, profile): + """If new transcoded representation created, delete old.""" delete_original = profile["delete_original"] if delete_original: @@ -264,5 +269,3 @@ class ExtractOIIOTranscode(publish.Extractor): repre["tags"].remove("review") if "delete" not in repre["tags"]: repre["tags"].append("delete") - - return repre From 176f53117fe49410135121dc0b858eadb8041270 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 11:26:27 +0100 Subject: [PATCH 447/912] OP-4643 - updated docstring, standardized arguments --- openpype/lib/transcoding.py | 19 +++++++---------- .../publish/extract_color_transcode.py | 21 +++++++++---------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index cc9cd4e1eb..0f6d35affe 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1049,7 +1049,7 @@ def convert_ffprobe_fps_to_float(value): def convert_colorspace( input_path, - out_filepath, + output_path, config_path, source_colorspace, target_colorspace, @@ -1057,18 +1057,13 @@ def convert_colorspace( display, logger=None ): - """Convert source files from one color space to another. - - Filenames of input files are kept so make sure that output directory - is not the same directory as input files have. - - This way it can handle gaps and can keep input filenames without handling - frame template + """Convert source file from one color space to another. Args: - input_path (str): Paths that should be converted. It is expected that - contains single file or image sequence of samy type. - out_filepath (str): Path to directory where output will be rendered. - Must not be same as input's directory. + input_path (str): Path that should be converted. It is expected that + contains single file or image sequence of same type + (sequence in format 'file.FRAMESTART-FRAMEEND#.exr', see oiio docs) + output_path (str): Path to output filename. config_path (str): path to OCIO config file source_colorspace (str): ocio valid color space of source files target_colorspace (str): ocio valid target color space @@ -1087,7 +1082,7 @@ def convert_colorspace( # Don't add any additional attributes "--nosoftwareattrib", "--colorconfig", config_path, - "-o", out_filepath + "-o", output_path ] if all([target_colorspace, view, display]): diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 9cca5cc969..c4cef15ea6 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -119,13 +119,13 @@ class ExtractOIIOTranscode(publish.Extractor): files_to_convert = self._translate_to_sequence( files_to_convert) for file_name in files_to_convert: - input_filepath = os.path.join(original_staging_dir, - file_name) - output_path = self._get_output_file_path(input_filepath, + input_path = os.path.join(original_staging_dir, + file_name) + output_path = self._get_output_file_path(input_path, new_staging_dir, output_extension) convert_colorspace( - input_filepath, + input_path, output_path, config_path, source_colorspace, @@ -156,16 +156,17 @@ class ExtractOIIOTranscode(publish.Extractor): self._mark_original_repre_for_deletion(repre, profile) def _translate_to_sequence(self, files_to_convert): - """Returns original list of files or single sequence format filename. + """Returns original list or list with filename formatted in single + sequence format. Uses clique to find frame sequence, in this case it merges all frames - into sequence format (%0X) and returns it. + into sequence format (FRAMESTART-FRAMEEND#) and returns it. If sequence not found, it returns original list Args: files_to_convert (list): list of file names Returns: - (list) of [file.%04.exr] or [fileA.exr, fileB.exr] + (list) of [file.1001-1010#.exr] or [fileA.exr, fileB.exr] """ pattern = [clique.PATTERNS["frames"]] collections, remainder = clique.assemble( @@ -178,8 +179,6 @@ class ExtractOIIOTranscode(publish.Extractor): "Too many collections {}".format(collections)) collection = collections[0] - padding = collection.padding - padding_str = "%0{}".format(padding) frames = list(collection.indexes) frame_str = "{}-{}#".format(frames[0], frames[-1]) file_name = "{}{}{}".format(collection.head, frame_str, @@ -189,10 +188,10 @@ class ExtractOIIOTranscode(publish.Extractor): return files_to_convert - def _get_output_file_path(self, input_filepath, output_dir, + def _get_output_file_path(self, input_path, output_dir, output_extension): """Create output file name path.""" - file_name = os.path.basename(input_filepath) + file_name = os.path.basename(input_path) file_name, input_extension = os.path.splitext(file_name) if not output_extension: output_extension = input_extension From 04ae5a28b415197f36d198e409e8343bc4bc6022 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 11:27:06 +0100 Subject: [PATCH 448/912] OP-4643 - fix wrong assignment --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index c4cef15ea6..4e899a519c 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -114,7 +114,7 @@ class ExtractOIIOTranscode(publish.Extractor): if view: new_repre["colorspaceData"]["view"] = view if display: - new_repre["colorspaceData"]["view"] = display + new_repre["colorspaceData"]["display"] = display files_to_convert = self._translate_to_sequence( files_to_convert) From c6571b9dfd520a77877c84a86c60999ab5257a3a Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 11:59:13 +0100 Subject: [PATCH 449/912] OP-4643 - fix files to delete --- .../publish/extract_color_transcode.py | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 4e899a519c..99e684ba21 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -84,26 +84,18 @@ class ExtractOIIOTranscode(publish.Extractor): original_staging_dir = new_repre["stagingDir"] new_staging_dir = get_transcode_temp_directory() new_repre["stagingDir"] = new_staging_dir - files_to_convert = new_repre["files"] - if not isinstance(files_to_convert, list): - files_to_convert = [files_to_convert] - files_to_delete = copy.deepcopy(files_to_convert) + if isinstance(new_repre["files"], list): + files_to_convert = copy.deepcopy(new_repre["files"]) + else: + files_to_convert = [new_repre["files"]] output_extension = output_def["extension"] output_extension = output_extension.replace('.', '') if output_extension: - if new_repre["name"] == new_repre["ext"]: - new_repre["name"] = output_extension - new_repre["ext"] = output_extension - - renamed_files = [] - _, orig_ext = os.path.splitext(files_to_convert[0]) - for file_name in files_to_convert: - file_name = file_name.replace(orig_ext, - "."+output_extension) - renamed_files.append(file_name) - new_repre["files"] = renamed_files + self._rename_in_representation(new_repre, + files_to_convert, + output_extension) target_colorspace = output_def["colorspace"] view = output_def["view"] or colorspace_data.get("view") @@ -135,8 +127,12 @@ class ExtractOIIOTranscode(publish.Extractor): self.log ) - instance.context.data["cleanupFullPaths"].extend( - files_to_delete) + # cleanup temporary transcoded files + for file_name in new_repre["files"]: + transcoded_file_path = os.path.join(new_staging_dir, + file_name) + instance.context.data["cleanupFullPaths"].append( + transcoded_file_path) custom_tags = output_def.get("custom_tags") if custom_tags: @@ -155,6 +151,21 @@ class ExtractOIIOTranscode(publish.Extractor): if added_representations: self._mark_original_repre_for_deletion(repre, profile) + def _rename_in_representation(self, new_repre, files_to_convert, + output_extension): + """Replace old extension with new one everywhere in representation.""" + if new_repre["name"] == new_repre["ext"]: + new_repre["name"] = output_extension + new_repre["ext"] = output_extension + + renamed_files = [] + for file_name in files_to_convert: + file_name, _ = os.path.splitext(file_name) + file_name = '{}.{}'.format(file_name, + output_extension) + renamed_files.append(file_name) + new_repre["files"] = renamed_files + def _translate_to_sequence(self, files_to_convert): """Returns original list or list with filename formatted in single sequence format. From 8598c1ec393a1c8c0f05ad12a2a66bbf7eb89136 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 13:17:59 +0100 Subject: [PATCH 450/912] OP-4643 - moved output argument to the end --- openpype/lib/transcoding.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 0f6d35affe..e74dab4ccc 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1081,8 +1081,7 @@ def convert_colorspace( input_path, # Don't add any additional attributes "--nosoftwareattrib", - "--colorconfig", config_path, - "-o", output_path + "--colorconfig", config_path ] if all([target_colorspace, view, display]): @@ -1100,5 +1099,7 @@ def convert_colorspace( oiio_cmd.extend(["--iscolorspace", source_colorspace]) oiio_cmd.extend(["--ociodisplay", display, view]) + oiio_cmd.extend(["-o", output_path]) + logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) From afe0a97bc5ace60a5f7740d22b3d1937e1b69fdf Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 13:18:33 +0100 Subject: [PATCH 451/912] OP-4643 - fix no tags in repre --- openpype/plugins/publish/extract_color_transcode.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 99e684ba21..3d897c6d9f 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -142,6 +142,8 @@ class ExtractOIIOTranscode(publish.Extractor): # Add additional tags from output definition to representation for tag in output_def["tags"]: + if not new_repre.get("tags"): + new_repre["tags"] = [] if tag not in new_repre["tags"]: new_repre["tags"].append(tag) From 190a79a836d6e981e57f9f23be58d146193c4d6c Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 13:26:07 +0100 Subject: [PATCH 452/912] OP-4643 - changed docstring Elaborated more that 'target_colorspace' and ('view', 'display') are disjunctive. --- openpype/lib/transcoding.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index e74dab4ccc..f7d5e222c8 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1053,8 +1053,8 @@ def convert_colorspace( config_path, source_colorspace, target_colorspace, - view, - display, + view=None, + display=None, logger=None ): """Convert source file from one color space to another. @@ -1067,7 +1067,9 @@ def convert_colorspace( config_path (str): path to OCIO config file source_colorspace (str): ocio valid color space of source files target_colorspace (str): ocio valid target color space + if filled, 'view' and 'display' must be empty view (str): name for viewer space (ocio valid) + both 'view' and 'display' must be filled (if 'target_colorspace') display (str): name for display-referred reference space (ocio valid) logger (logging.Logger): Logger used for logging. Raises: From 4967d91010dc03df5640364350095f0fae9aa52c Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 1 Feb 2023 11:14:07 +0100 Subject: [PATCH 453/912] OP-4663 - fix double dots in extension Co-authored-by: Toke Jepsen --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 3d897c6d9f..bfed69c300 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -207,7 +207,7 @@ class ExtractOIIOTranscode(publish.Extractor): file_name = os.path.basename(input_path) file_name, input_extension = os.path.splitext(file_name) if not output_extension: - output_extension = input_extension + output_extension = input_extension.replace(".", "") new_file_name = '{}.{}'.format(file_name, output_extension) return os.path.join(output_dir, new_file_name) From 43df616692568352b9734715e3a48b71a60e2221 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 1 Feb 2023 16:11:45 +0100 Subject: [PATCH 454/912] OP-4643 - update documentation in Settings schema --- .../schemas/projects_schema/schemas/schema_global_publish.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 74b81b13af..3956f403f4 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -207,7 +207,7 @@ "children": [ { "type": "label", - "label": "Configure output format(s) and color spaces for matching representations. Empty 'Output extension' denotes keeping source extension." + "label": "Configure Output Definition(s) for new representation(s). \nEmpty 'Extension' denotes keeping source extension. \nName(key) of output definition will be used as new representation name \nunless 'passthrough' value is used to keep existing name. \nFill either 'Colorspace' (for target colorspace) or \nboth 'Display' and 'View' (for display and viewer colorspaces)." }, { "type": "boolean", From 5b72bafcfc9a33302f588e29d314d91b98186f87 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 1 Feb 2023 16:13:59 +0100 Subject: [PATCH 455/912] OP-4643 - name of new representation from output definition key --- .../publish/extract_color_transcode.py | 49 +++++++++++++++---- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index bfed69c300..e39ea3add9 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -32,6 +32,25 @@ class ExtractOIIOTranscode(publish.Extractor): - task types - task names - subset names + + Can produce one or more representations (with different extensions) based + on output definition in format: + "output_name: { + "extension": "png", + "colorspace": "ACES - ACEScg", + "display": "", + "view": "", + "tags": [], + "custom_tags": [] + } + + If 'extension' is empty original representation extension is used. + 'output_name' will be used as name of new representation. In case of value + 'passthrough' name of original representation will be used. + + 'colorspace' denotes target colorspace to be transcoded into. Could be + empty if transcoding should be only into display and viewer colorspace. + (In that case both 'display' and 'view' must be filled.) """ label = "Transcode color spaces" @@ -78,7 +97,7 @@ class ExtractOIIOTranscode(publish.Extractor): self.log.warning("Config file doesn't exist, skipping") continue - for _, output_def in profile.get("outputs", {}).items(): + for output_name, output_def in profile.get("outputs", {}).items(): new_repre = copy.deepcopy(repre) original_staging_dir = new_repre["stagingDir"] @@ -92,10 +111,10 @@ class ExtractOIIOTranscode(publish.Extractor): output_extension = output_def["extension"] output_extension = output_extension.replace('.', '') - if output_extension: - self._rename_in_representation(new_repre, - files_to_convert, - output_extension) + self._rename_in_representation(new_repre, + files_to_convert, + output_name, + output_extension) target_colorspace = output_def["colorspace"] view = output_def["view"] or colorspace_data.get("view") @@ -154,10 +173,22 @@ class ExtractOIIOTranscode(publish.Extractor): self._mark_original_repre_for_deletion(repre, profile) def _rename_in_representation(self, new_repre, files_to_convert, - output_extension): - """Replace old extension with new one everywhere in representation.""" - if new_repre["name"] == new_repre["ext"]: - new_repre["name"] = output_extension + output_name, output_extension): + """Replace old extension with new one everywhere in representation. + + Args: + new_repre (dict) + files_to_convert (list): of filenames from repre["files"], + standardized to always list + output_name (str): key of output definition from Settings, + if "" token used, keep original repre name + output_extension (str): extension from output definition + """ + if output_name != "passthrough": + new_repre["name"] = output_name + if not output_extension: + return + new_repre["ext"] = output_extension renamed_files = [] From 7eacd1f30f2ce92adcec6ce8e48fb62bfb92a148 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 1 Feb 2023 16:42:48 +0100 Subject: [PATCH 456/912] OP-4643 - updated docstring for convert_colorspace --- openpype/lib/transcoding.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index f7d5e222c8..b6edd863f8 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1062,8 +1062,11 @@ def convert_colorspace( Args: input_path (str): Path that should be converted. It is expected that contains single file or image sequence of same type - (sequence in format 'file.FRAMESTART-FRAMEEND#.exr', see oiio docs) + (sequence in format 'file.FRAMESTART-FRAMEEND#.ext', see oiio docs, + eg `big.1-3#.tif`) output_path (str): Path to output filename. + (must follow format of 'input_path', eg. single file or + sequence in 'file.FRAMESTART-FRAMEEND#.ext', `output.1-3#.tif`) config_path (str): path to OCIO config file source_colorspace (str): ocio valid color space of source files target_colorspace (str): ocio valid target color space From 440c4e0c100a413f62aaaf582201384124ba916b Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 7 Feb 2023 18:22:10 +0100 Subject: [PATCH 457/912] OP-4643 - remove review from old representation If new representation gets created and adds 'review' tag it becomes new reviewable representation. --- .../publish/extract_color_transcode.py | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index e39ea3add9..d10b887a0b 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -89,6 +89,7 @@ class ExtractOIIOTranscode(publish.Extractor): continue added_representations = False + added_review = False colorspace_data = repre["colorspaceData"] source_colorspace = colorspace_data["colorspace"] @@ -166,11 +167,15 @@ class ExtractOIIOTranscode(publish.Extractor): if tag not in new_repre["tags"]: new_repre["tags"].append(tag) + if tag == "review": + added_review = True + instance.data["representations"].append(new_repre) added_representations = True if added_representations: - self._mark_original_repre_for_deletion(repre, profile) + self._mark_original_repre_for_deletion(repre, profile, + added_review) def _rename_in_representation(self, new_repre, files_to_convert, output_name, output_extension): @@ -300,15 +305,16 @@ class ExtractOIIOTranscode(publish.Extractor): return True - def _mark_original_repre_for_deletion(self, repre, profile): + def _mark_original_repre_for_deletion(self, repre, profile, added_review): """If new transcoded representation created, delete old.""" + if not repre.get("tags"): + repre["tags"] = [] + delete_original = profile["delete_original"] if delete_original: - if not repre.get("tags"): - repre["tags"] = [] - - if "review" in repre["tags"]: - repre["tags"].remove("review") if "delete" not in repre["tags"]: repre["tags"].append("delete") + + if added_review and "review" in repre["tags"]: + repre["tags"].remove("review") From 212cbe79a2eb05f3b426a01d836d42964838bbbb Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 7 Feb 2023 18:23:42 +0100 Subject: [PATCH 458/912] OP-4643 - remove representation that should be deleted Or old revieable representation would be reviewed too. --- openpype/plugins/publish/extract_color_transcode.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index d10b887a0b..93ee1ec44d 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -177,6 +177,11 @@ class ExtractOIIOTranscode(publish.Extractor): self._mark_original_repre_for_deletion(repre, profile, added_review) + for repre in tuple(instance.data["representations"]): + tags = repre.get("tags") or [] + if "delete" in tags and "thumbnail" not in tags: + instance.data["representations"].remove(repre) + def _rename_in_representation(self, new_repre, files_to_convert, output_name, output_extension): """Replace old extension with new one everywhere in representation. From 6295d0f34a9efc8e86ebbbf1dbe4b40a391dbf7b Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 14 Feb 2023 14:54:25 +0100 Subject: [PATCH 459/912] OP-4643 - fix logging Wrong variable used --- openpype/plugins/publish/extract_review.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py index dcb43d7fa2..0f6dacba18 100644 --- a/openpype/plugins/publish/extract_review.py +++ b/openpype/plugins/publish/extract_review.py @@ -169,7 +169,7 @@ class ExtractReview(pyblish.api.InstancePlugin): "Skipped representation. All output definitions from" " selected profile does not match to representation's" " custom tags. \"{}\"" - ).format(str(tags))) + ).format(str(custom_tags))) continue outputs_per_representations.append((repre, outputs)) From 03e8661323622c39d91c647d2f6cdd615a4ca99c Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 14 Feb 2023 15:14:14 +0100 Subject: [PATCH 460/912] OP-4643 - allow new repre to stay One might want to delete outputs with 'delete' tag, but repre must stay there at least until extract_review. More universal new tag might be created for this. --- openpype/plugins/publish/extract_color_transcode.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 93ee1ec44d..4a03e623fd 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -161,15 +161,17 @@ class ExtractOIIOTranscode(publish.Extractor): new_repre["custom_tags"].extend(custom_tags) # Add additional tags from output definition to representation + if not new_repre.get("tags"): + new_repre["tags"] = [] for tag in output_def["tags"]: - if not new_repre.get("tags"): - new_repre["tags"] = [] if tag not in new_repre["tags"]: new_repre["tags"].append(tag) if tag == "review": added_review = True + new_repre["tags"].append("newly_added") + instance.data["representations"].append(new_repre) added_representations = True @@ -179,6 +181,12 @@ class ExtractOIIOTranscode(publish.Extractor): for repre in tuple(instance.data["representations"]): tags = repre.get("tags") or [] + # TODO implement better way, for now do not delete new repre + # new repre might have 'delete' tag to removed, but it first must + # be there for review to be created + if "newly_added" in tags: + tags.remove("newly_added") + continue if "delete" in tags and "thumbnail" not in tags: instance.data["representations"].remove(repre) From f4140d7664cb3a36c032f4ae4b6d0a240fc01d3a Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 15 Feb 2023 16:04:59 +0100 Subject: [PATCH 461/912] OP-4642 - added additional command arguments to Settings --- .../schemas/schema_global_publish.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 3956f403f4..5333d514b5 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -286,6 +286,20 @@ "label": "View", "type": "text" }, + { + "key": "oiiotool_args", + "label": "OIIOtool arguments", + "type": "dict", + "highlight_content": true, + "children": [ + { + "key": "additional_command_args", + "label": "Additional command line arguments", + "type": "list", + "object_type": "text" + } + ] + }, { "type": "schema", "name": "schema_representation_tags" From b1d30058b0cdb26e46618d37807b01d400c89e33 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 15 Feb 2023 16:08:06 +0100 Subject: [PATCH 462/912] OP-4642 - added additional command arguments for oiiotool Some extension requires special command line arguments (.dpx and binary depth). --- openpype/lib/transcoding.py | 6 ++++++ openpype/plugins/publish/extract_color_transcode.py | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index b6edd863f8..982cee7a46 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1055,6 +1055,7 @@ def convert_colorspace( target_colorspace, view=None, display=None, + additional_command_args=None, logger=None ): """Convert source file from one color space to another. @@ -1074,6 +1075,8 @@ def convert_colorspace( view (str): name for viewer space (ocio valid) both 'view' and 'display' must be filled (if 'target_colorspace') display (str): name for display-referred reference space (ocio valid) + additional_command_args (list): arguments for oiiotool (like binary + depth for .dpx) logger (logging.Logger): Logger used for logging. Raises: ValueError: if misconfigured @@ -1096,6 +1099,9 @@ def convert_colorspace( if not target_colorspace and not all([view, display]): raise ValueError("Both screen and display must be set.") + if additional_command_args: + oiio_cmd.extend(additional_command_args) + if target_colorspace: oiio_cmd.extend(["--colorconvert", source_colorspace, diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 4a03e623fd..3de404125d 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -128,6 +128,9 @@ class ExtractOIIOTranscode(publish.Extractor): if display: new_repre["colorspaceData"]["display"] = display + additional_command_args = (output_def["oiiotool_args"] + ["additional_command_args"]) + files_to_convert = self._translate_to_sequence( files_to_convert) for file_name in files_to_convert: @@ -144,6 +147,7 @@ class ExtractOIIOTranscode(publish.Extractor): target_colorspace, view, display, + additional_command_args, self.log ) From e8a79b4f7673a37657b54a62f74c81985a2b5636 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 15 Feb 2023 16:21:25 +0100 Subject: [PATCH 463/912] OP-4642 - refactored newly added representations --- openpype/plugins/publish/extract_color_transcode.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 3de404125d..8c4ef59de9 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -82,6 +82,7 @@ class ExtractOIIOTranscode(publish.Extractor): if not profile: return + new_representations = [] repres = instance.data.get("representations") or [] for idx, repre in enumerate(list(repres)): self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) @@ -174,9 +175,7 @@ class ExtractOIIOTranscode(publish.Extractor): if tag == "review": added_review = True - new_repre["tags"].append("newly_added") - - instance.data["representations"].append(new_repre) + new_representations.append(new_repre) added_representations = True if added_representations: @@ -185,15 +184,11 @@ class ExtractOIIOTranscode(publish.Extractor): for repre in tuple(instance.data["representations"]): tags = repre.get("tags") or [] - # TODO implement better way, for now do not delete new repre - # new repre might have 'delete' tag to removed, but it first must - # be there for review to be created - if "newly_added" in tags: - tags.remove("newly_added") - continue if "delete" in tags and "thumbnail" not in tags: instance.data["representations"].remove(repre) + instance.data["representations"].extend(new_representations) + def _rename_in_representation(self, new_repre, files_to_convert, output_name, output_extension): """Replace old extension with new one everywhere in representation. From e5ec6c4812aa5d5c59a04d834b631afb0917bd2e Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 15 Feb 2023 16:24:53 +0100 Subject: [PATCH 464/912] OP-4642 - refactored query of representations line 73 returns if no representations. --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 8c4ef59de9..de36ea7d5f 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -83,7 +83,7 @@ class ExtractOIIOTranscode(publish.Extractor): return new_representations = [] - repres = instance.data.get("representations") or [] + repres = instance.data["representations"] for idx, repre in enumerate(list(repres)): self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) if not self._repre_is_valid(repre): From 6235faab82af4ac7d3a50315b4c1dc9223a73c0a Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 10:44:10 +0100 Subject: [PATCH 465/912] OP-4643 - fixed subset filtering Co-authored-by: Toke Jepsen --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index de36ea7d5f..71124b527a 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -273,7 +273,7 @@ class ExtractOIIOTranscode(publish.Extractor): "families": family, "task_names": task_name, "task_types": task_type, - "subset": subset + "subsets": subset } profile = filter_profiles(self.profiles, filtering_criteria, logger=self.log) From b304d63461704f7c2e0709bd5165683a0d890a10 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 12:12:35 +0100 Subject: [PATCH 466/912] OP-4643 - split command line arguments to separate items Reuse existing method from ExtractReview, put it into transcoding.py --- openpype/lib/transcoding.py | 29 +++++++++++++++++++++- openpype/plugins/publish/extract_review.py | 27 +++----------------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 982cee7a46..4d2f72fc41 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1100,7 +1100,7 @@ def convert_colorspace( raise ValueError("Both screen and display must be set.") if additional_command_args: - oiio_cmd.extend(additional_command_args) + oiio_cmd.extend(split_cmd_args(additional_command_args)) if target_colorspace: oiio_cmd.extend(["--colorconvert", @@ -1114,3 +1114,30 @@ def convert_colorspace( logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) + + +def split_cmd_args(in_args): + """Makes sure all entered arguments are separated in individual items. + + Split each argument string with " -" to identify if string contains + one or more arguments. + Args: + in_args (list): of arguments ['-n', '-d uint10'] + Returns + (list): ['-n', '-d', 'unint10'] + """ + splitted_args = [] + for arg in in_args: + sub_args = arg.split(" -") + if len(sub_args) == 1: + if arg and arg not in splitted_args: + splitted_args.append(arg) + continue + + for idx, arg in enumerate(sub_args): + if idx != 0: + arg = "-" + arg + + if arg and arg not in splitted_args: + splitted_args.append(arg) + return splitted_args diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py index 0f6dacba18..e80141fc4a 100644 --- a/openpype/plugins/publish/extract_review.py +++ b/openpype/plugins/publish/extract_review.py @@ -22,6 +22,7 @@ from openpype.lib.transcoding import ( should_convert_for_ffmpeg, convert_input_paths_for_ffmpeg, get_transcode_temp_directory, + split_cmd_args ) @@ -670,7 +671,7 @@ class ExtractReview(pyblish.api.InstancePlugin): res_filters = self.rescaling_filters(temp_data, output_def, new_repre) ffmpeg_video_filters.extend(res_filters) - ffmpeg_input_args = self.split_ffmpeg_args(ffmpeg_input_args) + ffmpeg_input_args = split_cmd_args(ffmpeg_input_args) lut_filters = self.lut_filters(new_repre, instance, ffmpeg_input_args) ffmpeg_video_filters.extend(lut_filters) @@ -723,28 +724,6 @@ class ExtractReview(pyblish.api.InstancePlugin): ffmpeg_output_args ) - def split_ffmpeg_args(self, in_args): - """Makes sure all entered arguments are separated in individual items. - - Split each argument string with " -" to identify if string contains - one or more arguments. - """ - splitted_args = [] - for arg in in_args: - sub_args = arg.split(" -") - if len(sub_args) == 1: - if arg and arg not in splitted_args: - splitted_args.append(arg) - continue - - for idx, arg in enumerate(sub_args): - if idx != 0: - arg = "-" + arg - - if arg and arg not in splitted_args: - splitted_args.append(arg) - return splitted_args - def ffmpeg_full_args( self, input_args, video_filters, audio_filters, output_args ): @@ -764,7 +743,7 @@ class ExtractReview(pyblish.api.InstancePlugin): Returns: list: Containing all arguments ready to run in subprocess. """ - output_args = self.split_ffmpeg_args(output_args) + output_args = split_cmd_args(output_args) video_args_dentifiers = ["-vf", "-filter:v"] audio_args_dentifiers = ["-af", "-filter:a"] From 5d0dc43494452813d19f7ffa511b841e59b64209 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 13:02:41 +0100 Subject: [PATCH 467/912] OP-4643 - refactor - changed existence check --- openpype/plugins/publish/extract_color_transcode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 71124b527a..456e40008d 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -161,12 +161,12 @@ class ExtractOIIOTranscode(publish.Extractor): custom_tags = output_def.get("custom_tags") if custom_tags: - if not new_repre.get("custom_tags"): + if new_repre.get("custom_tags") is None: new_repre["custom_tags"] = [] new_repre["custom_tags"].extend(custom_tags) # Add additional tags from output definition to representation - if not new_repre.get("tags"): + if new_repre.get("tags") is None: new_repre["tags"] = [] for tag in output_def["tags"]: if tag not in new_repre["tags"]: From 8651a693f990d52e43c14845e82efc3033b5a054 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 13:11:11 +0100 Subject: [PATCH 468/912] Revert "Fix - added missed scopes for Slack bot" This reverts commit 5e0c4a3ab1432e120b8f0c324f899070f1a5f831. --- openpype/modules/slack/manifest.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/openpype/modules/slack/manifest.yml b/openpype/modules/slack/manifest.yml index 233c39fbaf..7a65cc5915 100644 --- a/openpype/modules/slack/manifest.yml +++ b/openpype/modules/slack/manifest.yml @@ -19,8 +19,6 @@ oauth_config: - chat:write.public - files:write - channels:read - - users:read - - usergroups:read settings: org_deploy_enabled: false socket_mode_enabled: false From 68313f9215a54d94f4c18119a56679b7c277f937 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 13:10:11 +0100 Subject: [PATCH 469/912] OP-4643 - changed label MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jakub Ježek --- .../schemas/projects_schema/schemas/schema_global_publish.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 5333d514b5..3e9467af61 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -294,7 +294,7 @@ "children": [ { "key": "additional_command_args", - "label": "Additional command line arguments", + "label": "Arguments", "type": "list", "object_type": "text" } From 68a0892a1d20a17f2504382a3c16586de5039108 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 15:06:16 +0100 Subject: [PATCH 470/912] OP-4643 - added documentation --- .../assets/global_oiio_transcode.png | Bin 0 -> 29010 bytes .../project_settings/settings_project_global.md | 15 +++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 website/docs/project_settings/assets/global_oiio_transcode.png diff --git a/website/docs/project_settings/assets/global_oiio_transcode.png b/website/docs/project_settings/assets/global_oiio_transcode.png new file mode 100644 index 0000000000000000000000000000000000000000..99396d5bb3f16d434a92c6079515128488b82489 GIT binary patch literal 29010 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 literal 0 HcmV?d00001 diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 37fed93e69..52671d2db6 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -45,6 +45,21 @@ The _input pattern_ matching uses REGEX expression syntax (try [regexr.com](http The **colorspace name** value is a raw string input and no validation is run after saving project settings. We recommend to open the specified `config.ocio` file and copy pasting the exact colorspace names. ::: +### Extract OIIO Transcode +There is profile configurable (see lower) plugin which allows to transcode any incoming representation to one or multiple new representations (configured in `Output Definitions`) with different target colorspaces. +Plugin expects instances with filled dictionary `colorspaceData` on a representation. This data contains information about source colorspace and must be collected for transcoding. +`oiiotool` is used for transcoding, eg. `oiiotool` must be present in `vendor/bin/oiio` or environment variable `OPENPYPE_OIIO_PATHS` must be provided for custom oiio installation. + +Notable parameters: +- **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. +- **`Extension`** - target extension, could be empty - original extension is used +- **`Colorspace`** - target colorspace - must be available in used color config +- **`Display & View`** - transcoding into colorspace OR into display and viewer space could be used. (It is disjunctive: Colorspace & nothing in Display and View or opposite) +- **`Arguments`** - special additional command line arguments for `oiiotool` + + +Example here describes use case for creation of new color coded review of png image sequence. Original representation's files are kept intact, review is created from transcoded files, but these files are removed in cleanup process. +![global_oiio_transcode](assets/global_oiio_transcode.png) ## Profile filters From 265a08abcdf88d3180fc3a1da362351c28083b9b Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 16:41:42 +0100 Subject: [PATCH 471/912] OP-4643 - updates to documentation Co-authored-by: Toke Jepsen --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 52671d2db6..cc661a21fa 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -46,7 +46,7 @@ The **colorspace name** value is a raw string input and no validation is run aft ::: ### Extract OIIO Transcode -There is profile configurable (see lower) plugin which allows to transcode any incoming representation to one or multiple new representations (configured in `Output Definitions`) with different target colorspaces. +There is profile configurable plugin which allows to transcode any incoming representation to one or multiple new representations (configured in `Output Definitions`) with different target colorspaces. Plugin expects instances with filled dictionary `colorspaceData` on a representation. This data contains information about source colorspace and must be collected for transcoding. `oiiotool` is used for transcoding, eg. `oiiotool` must be present in `vendor/bin/oiio` or environment variable `OPENPYPE_OIIO_PATHS` must be provided for custom oiio installation. From b2d40c1cc39fbc42b0365a3edc9fb638db5c3584 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 16:42:06 +0100 Subject: [PATCH 472/912] OP-4643 - updates to documentation Co-authored-by: Toke Jepsen --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index cc661a21fa..8e557a381c 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -52,7 +52,7 @@ Plugin expects instances with filled dictionary `colorspaceData` on a representa Notable parameters: - **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. -- **`Extension`** - target extension, could be empty - original extension is used +- **`Extension`** - target extension. If left empty, original extension is used. - **`Colorspace`** - target colorspace - must be available in used color config - **`Display & View`** - transcoding into colorspace OR into display and viewer space could be used. (It is disjunctive: Colorspace & nothing in Display and View or opposite) - **`Arguments`** - special additional command line arguments for `oiiotool` From 2d601023f7db52033736e770b6ec3879fda04de5 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 16:42:29 +0100 Subject: [PATCH 473/912] OP-4643 - updates to documentation Co-authored-by: Toke Jepsen --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 8e557a381c..166400cb7f 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -53,7 +53,7 @@ Plugin expects instances with filled dictionary `colorspaceData` on a representa Notable parameters: - **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. - **`Extension`** - target extension. If left empty, original extension is used. -- **`Colorspace`** - target colorspace - must be available in used color config +- **`Colorspace`** - target colorspace, which must be available in used color config. - **`Display & View`** - transcoding into colorspace OR into display and viewer space could be used. (It is disjunctive: Colorspace & nothing in Display and View or opposite) - **`Arguments`** - special additional command line arguments for `oiiotool` From 6260ea0a91cce8f1a67707aa55553e6ea6afbcab Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 16:42:48 +0100 Subject: [PATCH 474/912] OP-4643 - updates to documentation Co-authored-by: Toke Jepsen --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 166400cb7f..908191f122 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -54,7 +54,7 @@ Notable parameters: - **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. - **`Extension`** - target extension. If left empty, original extension is used. - **`Colorspace`** - target colorspace, which must be available in used color config. -- **`Display & View`** - transcoding into colorspace OR into display and viewer space could be used. (It is disjunctive: Colorspace & nothing in Display and View or opposite) +- **`Display & View`** - transcoding into colorspace or into display and viewer space could be used. Cannot use both `Colorspace` and `Display & View` at the same time. - **`Arguments`** - special additional command line arguments for `oiiotool` From c1c8ca234f97c6b3f64bd91c52f91969656077e1 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 16:43:06 +0100 Subject: [PATCH 475/912] OP-4643 - updates to documentation Co-authored-by: Toke Jepsen --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 908191f122..0a73868d2d 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -55,7 +55,7 @@ Notable parameters: - **`Extension`** - target extension. If left empty, original extension is used. - **`Colorspace`** - target colorspace, which must be available in used color config. - **`Display & View`** - transcoding into colorspace or into display and viewer space could be used. Cannot use both `Colorspace` and `Display & View` at the same time. -- **`Arguments`** - special additional command line arguments for `oiiotool` +- **`Arguments`** - special additional command line arguments for `oiiotool`. Example here describes use case for creation of new color coded review of png image sequence. Original representation's files are kept intact, review is created from transcoded files, but these files are removed in cleanup process. From 92768e004993311fae5e74ccc9e552ba8f171a2c Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 17:21:20 +0100 Subject: [PATCH 476/912] OP-4643 - updates to documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jakub Ježek --- website/docs/project_settings/settings_project_global.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 0a73868d2d..9e2ee187cc 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -46,8 +46,8 @@ The **colorspace name** value is a raw string input and no validation is run aft ::: ### Extract OIIO Transcode -There is profile configurable plugin which allows to transcode any incoming representation to one or multiple new representations (configured in `Output Definitions`) with different target colorspaces. -Plugin expects instances with filled dictionary `colorspaceData` on a representation. This data contains information about source colorspace and must be collected for transcoding. +OIIOTools transcoder plugin with configurable output presets. Any incoming representation with `colorspaceData` is convertable to single or multiple representations with different target colorspaces or display and viewer names found in linked **config.ocio** file. + `oiiotool` is used for transcoding, eg. `oiiotool` must be present in `vendor/bin/oiio` or environment variable `OPENPYPE_OIIO_PATHS` must be provided for custom oiio installation. Notable parameters: From 94ee02879286ef75ce60001f8c94d818a24aea57 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 17:56:21 +0100 Subject: [PATCH 477/912] Revert "OP-4643 - split command line arguments to separate items" This reverts commit deaad39437501f18fc3ba4be8b1fc5f0ee3be65d. --- openpype/lib/transcoding.py | 29 +--------------------- openpype/plugins/publish/extract_review.py | 27 +++++++++++++++++--- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 4d2f72fc41..982cee7a46 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1100,7 +1100,7 @@ def convert_colorspace( raise ValueError("Both screen and display must be set.") if additional_command_args: - oiio_cmd.extend(split_cmd_args(additional_command_args)) + oiio_cmd.extend(additional_command_args) if target_colorspace: oiio_cmd.extend(["--colorconvert", @@ -1114,30 +1114,3 @@ def convert_colorspace( logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) - - -def split_cmd_args(in_args): - """Makes sure all entered arguments are separated in individual items. - - Split each argument string with " -" to identify if string contains - one or more arguments. - Args: - in_args (list): of arguments ['-n', '-d uint10'] - Returns - (list): ['-n', '-d', 'unint10'] - """ - splitted_args = [] - for arg in in_args: - sub_args = arg.split(" -") - if len(sub_args) == 1: - if arg and arg not in splitted_args: - splitted_args.append(arg) - continue - - for idx, arg in enumerate(sub_args): - if idx != 0: - arg = "-" + arg - - if arg and arg not in splitted_args: - splitted_args.append(arg) - return splitted_args diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py index e80141fc4a..0f6dacba18 100644 --- a/openpype/plugins/publish/extract_review.py +++ b/openpype/plugins/publish/extract_review.py @@ -22,7 +22,6 @@ from openpype.lib.transcoding import ( should_convert_for_ffmpeg, convert_input_paths_for_ffmpeg, get_transcode_temp_directory, - split_cmd_args ) @@ -671,7 +670,7 @@ class ExtractReview(pyblish.api.InstancePlugin): res_filters = self.rescaling_filters(temp_data, output_def, new_repre) ffmpeg_video_filters.extend(res_filters) - ffmpeg_input_args = split_cmd_args(ffmpeg_input_args) + ffmpeg_input_args = self.split_ffmpeg_args(ffmpeg_input_args) lut_filters = self.lut_filters(new_repre, instance, ffmpeg_input_args) ffmpeg_video_filters.extend(lut_filters) @@ -724,6 +723,28 @@ class ExtractReview(pyblish.api.InstancePlugin): ffmpeg_output_args ) + def split_ffmpeg_args(self, in_args): + """Makes sure all entered arguments are separated in individual items. + + Split each argument string with " -" to identify if string contains + one or more arguments. + """ + splitted_args = [] + for arg in in_args: + sub_args = arg.split(" -") + if len(sub_args) == 1: + if arg and arg not in splitted_args: + splitted_args.append(arg) + continue + + for idx, arg in enumerate(sub_args): + if idx != 0: + arg = "-" + arg + + if arg and arg not in splitted_args: + splitted_args.append(arg) + return splitted_args + def ffmpeg_full_args( self, input_args, video_filters, audio_filters, output_args ): @@ -743,7 +764,7 @@ class ExtractReview(pyblish.api.InstancePlugin): Returns: list: Containing all arguments ready to run in subprocess. """ - output_args = split_cmd_args(output_args) + output_args = self.split_ffmpeg_args(output_args) video_args_dentifiers = ["-vf", "-filter:v"] audio_args_dentifiers = ["-af", "-filter:a"] From 840f6811345241dd4e058d2d5940847c5b31c69f Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 18:02:17 +0100 Subject: [PATCH 478/912] OP-4643 - different splitting for oiio It seems that logic in ExtractReview does different thing. --- openpype/lib/transcoding.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 982cee7a46..376297ff32 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1100,7 +1100,7 @@ def convert_colorspace( raise ValueError("Both screen and display must be set.") if additional_command_args: - oiio_cmd.extend(additional_command_args) + oiio_cmd.extend(split_cmd_args(additional_command_args)) if target_colorspace: oiio_cmd.extend(["--colorconvert", @@ -1114,3 +1114,21 @@ def convert_colorspace( logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) + + +def split_cmd_args(in_args): + """Makes sure all entered arguments are separated in individual items. + + Split each argument string with " -" to identify if string contains + one or more arguments. + Args: + in_args (list): of arguments ['-n', '-d uint10'] + Returns + (list): ['-n', '-d', 'unint10'] + """ + splitted_args = [] + for arg in in_args: + if not arg.strip(): + continue + splitted_args.extend(arg.split(" ")) + return splitted_args From 5a7e84ab90042c3565e5ba13f11cf5674f02e4f8 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 18:14:57 +0100 Subject: [PATCH 479/912] OP-4643 - allow colorspace to be empty and collected from DCC --- openpype/plugins/publish/extract_color_transcode.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 456e40008d..82b92ec93e 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -118,7 +118,8 @@ class ExtractOIIOTranscode(publish.Extractor): output_name, output_extension) - target_colorspace = output_def["colorspace"] + target_colorspace = (output_def["colorspace"] or + colorspace_data.get("colorspace")) view = output_def["view"] or colorspace_data.get("view") display = (output_def["display"] or colorspace_data.get("display")) From 4abac5ec783c29465d4eb6347ffbd87b6315c2df Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 22 Feb 2023 12:22:53 +0100 Subject: [PATCH 480/912] OP-4643 - fix colorspace from DCC representation["colorspaceData"]["colorspace"] is only input colorspace --- openpype/plugins/publish/extract_color_transcode.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 82b92ec93e..456e40008d 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -118,8 +118,7 @@ class ExtractOIIOTranscode(publish.Extractor): output_name, output_extension) - target_colorspace = (output_def["colorspace"] or - colorspace_data.get("colorspace")) + target_colorspace = output_def["colorspace"] view = output_def["view"] or colorspace_data.get("view") display = (output_def["display"] or colorspace_data.get("display")) From 6cb8cbd6fc03b2d63f09bac0b25634cb1ef3f827 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 22 Feb 2023 17:33:20 +0100 Subject: [PATCH 481/912] OP-4643 - added explicit enum for transcoding type As transcoding info (colorspace, display) might be collected from DCC, it must be explicit which should be used. --- openpype/lib/transcoding.py | 2 +- .../plugins/publish/extract_color_transcode.py | 15 +++++++++++---- .../schemas/schema_global_publish.json | 9 +++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 376297ff32..c0bda2aa37 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1052,7 +1052,7 @@ def convert_colorspace( output_path, config_path, source_colorspace, - target_colorspace, + target_colorspace=None, view=None, display=None, additional_command_args=None, diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 456e40008d..b0921688e9 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -118,10 +118,17 @@ class ExtractOIIOTranscode(publish.Extractor): output_name, output_extension) - target_colorspace = output_def["colorspace"] - view = output_def["view"] or colorspace_data.get("view") - display = (output_def["display"] or - colorspace_data.get("display")) + transcoding_type = output_def["transcoding_type"] + + target_colorspace = view = display = None + if transcoding_type == "colorspace": + target_colorspace = (output_def["colorspace"] or + colorspace_data.get("colorspace")) + else: + view = output_def["view"] or colorspace_data.get("view") + display = (output_def["display"] or + colorspace_data.get("display")) + # both could be already collected by DCC, # but could be overwritten if view: diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 3e9467af61..76574e8b9b 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -271,6 +271,15 @@ "label": "Extension", "type": "text" }, + { + "type": "enum", + "key": "transcoding_type", + "label": "Transcoding type", + "enum_items": [ + { "colorspace": "Use Colorspace" }, + { "display": "Use Display&View" } + ] + }, { "key": "colorspace", "label": "Colorspace", From 58ae146027ebe31b9fe2d7fcc6d4323efb93c883 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 22 Feb 2023 17:34:03 +0100 Subject: [PATCH 482/912] OP-4643 - added explicit enum for transcoding type As transcoding info (colorspace, display) might be collected from DCC, it must be explicit which should be used. --- .../assets/global_oiio_transcode.png | Bin 29010 -> 17936 bytes .../settings_project_global.md | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/website/docs/project_settings/assets/global_oiio_transcode.png b/website/docs/project_settings/assets/global_oiio_transcode.png index 99396d5bb3f16d434a92c6079515128488b82489..d818ecfe19f93366e5f4664734d68c7b448d7b4f 100644 GIT binary patch literal 17936 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 DbV~re literal 29010 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 diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 9e2ee187cc..6e78ee5d45 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -53,8 +53,9 @@ OIIOTools transcoder plugin with configurable output presets. Any incoming repre Notable parameters: - **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. - **`Extension`** - target extension. If left empty, original extension is used. -- **`Colorspace`** - target colorspace, which must be available in used color config. -- **`Display & View`** - transcoding into colorspace or into display and viewer space could be used. Cannot use both `Colorspace` and `Display & View` at the same time. +- **`Transcoding type`** - transcoding into colorspace or into display and viewer space could be used. Cannot use both at the same time. +- **`Colorspace`** - target colorspace, which must be available in used color config. (If `Transcoding type` is `Use Colorspace` value in configuration is used OR if empty value collected on instance from DCC). +- **`Display & View`** - display and viewer colorspace. (If `Transcoding type` is `Use Display&View` values in configuration is used OR if empty values collected on instance from DCC). - **`Arguments`** - special additional command line arguments for `oiiotool`. From aae1430904962212e3c31345eb317d74cbd2385b Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 22 Feb 2023 17:42:07 +0100 Subject: [PATCH 483/912] OP-4643 - added use case for Maya to documentation --- .../assets/global_oiio_transcode2.png | Bin 0 -> 17960 bytes .../project_settings/settings_project_global.md | 3 +++ 2 files changed, 3 insertions(+) create mode 100644 website/docs/project_settings/assets/global_oiio_transcode2.png diff --git a/website/docs/project_settings/assets/global_oiio_transcode2.png b/website/docs/project_settings/assets/global_oiio_transcode2.png new file mode 100644 index 0000000000000000000000000000000000000000..906f780830a96b4bc6f26d98484dd3f9cc3885f2 GIT binary patch literal 17960 zcmch{OO{7Z? zy-ShaJE7#e0X=8V%ri6Rogd#1O7^|`z1LdTy4Kq9S5lBAxdOfd0)a^6o=B;HKzQ`P z5C3I6pycRM4mI%Sf}@J81Sq%T_5$$XqPaLs90bY_AwDv^1bim4d!pqC0$r;+{khO& zn{EOWUVkaA`BK%^?4^sLgDFVX!PL~o(ZcqnzS?D=iFBfzl=w4O{gpB67c>L$Ne3^C z&8Z8kxXIhvR+T;Rl=f_@*>q* zo|i+XfVt(vyGUc%F&jm$3d1S5IUb7e5rGXM@m~Z2!wNU*mp(tTc%Gz)zYMAfIPN+W z-Emm#&B#3b?hzoQ<{3EQ=g}#ww)d&Jls4YTAKNy^=S2kaIZ^_H#HyJ|Kz9rl&_nr- z&+XQ#^Mr)1f_z-<_QuEKNo|H5YWf1S2hl^7XqP=nNu83Nv7LsMeo2rIh1FL7c#iP# z_4gBN3#GJ~KOVII1S)u7vw;n(7uNA0+!Zk)QKw*Q501w#Kt7TMfgZM4N*NiFsNZC3 z|2ggz2f+tDv)iLAT^p|G1ZT6WBY~k`j9&uX$r#r>otW3z#KH+cA334;pk_+6c>W5N zh}~k_K@?{VKlkC+kJJtt1Uc{s8lj_JVoLp*?Z&+al_w>?i$OR2Fi8)Z1m|W42>5QQ z@5R!~ThHYtM?KIJ6xhhI79*0|H0@%RmhPt z?&lL+u55TMS-Hn%x#Q-?r(bw4C~-nny{(vRi`%FeLv+X&C!z3bLBjkSZN#x9+uGAe zAqMhmL2BAjLiU^6iPhV~_#U`Bm!G}{iW45YH4gtJrpF9Bkb@7)?CJQD^q{o}KE=>0 zidd7Reu8V|hqlGJ?#4w#KH~}+1O+8Qenn{`cTmLc5k36Nq^kzPgq6(sylvz1>l?2jHCWyR%)C%$l)8j9K(qkK@An+uUI`ph*nbKt14qX6m+#)KO{ z;VIl^640(dOmiHR=|`ZW6^ZM?W^DJRc6$maeQf1p!L&7f_h}EHpqTo$o71Xw6*;IF z1#GK6^2?R+sZ=VooV6Uzdn|!f^g$-9;66QJ%_`sQq3B7*x@~I`Py6Wl_a$2$3jU+| zo|B0oNJ|nAjNs4U!*})7?g}+IdG0(_g-%agbEejXJx@@vYD8Z!d*~TXU`K}*54GF9 z%6t#%dvEdsDCs>j$%p!iA8y0o?LM~%M_3Kbw|cdXZz;;)8&?sI)l2>cS|B(=v}wYdFTjDU?bh>PFKbBLsN7^uW# z-y|dz-8m}H%Imm7)KYsJc*s$B(8$MDxH+uMEaw%S4JT*~#DG>&5ayCz%!|cCs6sXqo)R(C z*QgL`{Pr%>EH_^I2Tal+Gs#a8sH*mw7 z_+&D};5=E7mgC33B7t7fYB`W5!JUanWOh4fP7`6;T5Zx`)H%@N)zAT?zqCbK9tf8dHC z{PjqtocoBoJSyS7rA|9qnfOjs#C4I3V|Vt=kN<3-g?3vhW|Nz}c%T~#?D%vp6z$J( z=ZzLP(bBiZ%?s_{5$!K90Etitm(FYYq>NnPvpM-$?npOQc95~(QZ6cTM7j75F_Ks) z==rSj(Or7P(Wv4vb%H9^)7)uWxR_?;H2;H7%&4Edfx5^oi4gAu!tC5e74|nqQ zZF6b+4BwkXF5Ol5RP2Nyiq==V-xisJE@(tK+2Lr^-he2>B6}d7%xqY zEHYhEQd=A<%x=33RlP+aPv0A=cjCh8{>U)lJI0rlVEjoo9~JtM^9ZjyAe1X;vRZ$x zkkUq|m$3cmx@FXq&Vfqx zEtL#h*Q%ZuH_pGO7m5zd45%q4{$#YZ81FNP0WHts(rcUZ$Btj3IT#^q#=aRsi1rcGp3NsNV z^U(%$gN`K}1RUq2L4gpj(&;Rw>{1p`TCW;%S2k6k`e5!{_;SW@FP9Dsva6?w`(r75 z1T8s(Oj3W1AZpAkz8^)ag4qiNOShe#o;>Lv20_Ktxvl(G3}_YqXB|+>HPTghSkgkL zO$o(gP7k)NEH=aSxY#UkpUG|Zaeau5#}v&HC*pz~bOqs92ux196KCBt6VevKkFMnk z6TPUl_6(FextEZ9F2TM=D2UJDKbD%_deX;DoOPH}`%4NA+EYeGSnLFPnHsjXHSGAq z;h7O;uGQ8rYlNej+&20>ZunR+w?myP9dpMoK_f8P@s)rQ(*%kD=z;CNR9v?4@*1J9 zO7MP?GV&zA+A%*jI!uSr;8R4{LHclwHou$4E%gz1?sl7&B_iHV?+d(CrQ;}&t|VN& zAdshh-LrM{NE`RgOPzx~C@N+qS+pe8-}(XdqPjHGQe~xE=dU2bk<57WDiAgL!l*3J zD7(;{Yn5hR)nO`1hC@U}2*%nra2QJqsgLApJ*Znx$b|u{fxR}e*kZvK9eec?ut!XF~hG*w?f5hi|i`-c*Z@tJ=j6gISP(ty`LfG&=vh_vmYXR^t`*An{|3*hn`+Y>D zB;1DrfOda-Oqh938~%3>OFE1vR`wT(maMOQV{wW|Jr2zXwmm67c$5awG_%?h9dkdS z%v#%jy<>LiXYjB*eGL3ycOs7p`S9!%F9Y_ACQS5GF|W_{k9}>!hKEu0s{gJ<{DZU4 z4X3ZsDN^c<+2S^zW z)$#q6?>NvUAC*fJzu#X%gP%B2$#H9<61GYkA06pu@;V{Tbmr%NgVkD`=jze8>`6Mp z?lWS5{>RVvqrwNH{BBPeHDf{PlxX|0MXEy$bV-}8Zeny~Y8#p#vO81H&G}*&V-;it zfZfLsb-3PUeM=7li?JeIKK8xykO(MtotmMtk_0&=L!|9bo(+BwN`PP>z_F&Ufj`il=|^}N{z?ze+IP7 zT>X%`t#SK_3d2M-V)KCl zA|b2Wrvca{GPWSM*KE4Z`;NU&TqB>-tX2_a`2S#s4R=^E2Wf*Aa>Cb5HS;p>rgg+= zXdv%5zC}b7^2~?96od{7st>=v9q5ZN^N)PS7%PNW%^WB48CFK7JcN?R_ii@rSSMz_ zcF~NY9%sxy$cM9_P;ua+?kF8cCt6`fC;nSruPQ7>AW zYx53+4o*T4tVbhU7BFtU%606By7V>CjUt>2FAOLO6FA`skM8wIR zy3(R4A-2~8VC=N&50~Scn9RdvnggyH_~I;8_0=TXp6{RGHUKIwQz=P>6G(rjxFALb zU}Jxmh^-=?`K&G0Ii$CskAGI&D`@}&-a46OR05R3r8-;Gg)4wMa0T2jwJqC0p@?H@ z-p<}5YF>j$z883a7sbr5;K#1c8YdIxXChII;Q1N&=M!Gc1+Wxc>6zd$f@o#G=qtD# z8`Tv&aKM=?oVW}8Lg>>@eWvPq3}DPtd95$xta&UrXYh+15LY*}7RNPO??u2LF^DHV z=|~;@SfL9ifDohq4iNvV_@8;R|8BLLwsm?sg2C10i{INL%XPk88E~FODTm8l3a>D3*twDTkC8t;JZk z)tGn*&?HQZQs4)GEgPBl_V_EPd~2062YLM2%Wf3=vZ zJNFjDPN;@FDDMB6IvsE3ox-nzeA|a|C%Mrc`ey#Ea`e3+xfk_uJzQ?16J66Q&YB4g z2*~gXV4|z!%5Djy#D3$ggZIScrmSHbRpcZwpP7%nmXxfNS_X*#yFWei2$11P1g zutIisrW{J|2089KY6Gd`{aZB}Oiia%!J( zaj@}{tiHj3D3riW=}x|M(O`Mw@d((n+}9t|^$vEf>`(7RHVS!|<-)gTwlO9`7036e zOB@G2W^-rPUNLdlys9}Z7@F6NwdhN6!TM4U=y0@;l! z`bXYLM#~H@-~jKhfWRvxgqFNNX>EQ3 zz9ms`MKI&ruv{OeIr*q+;eu8DW6wD)q~t(OnnE`MTeWNo+ibuG%+0m;i54H|R_kh& zw=Rp+@D4NRc0~*N-z2Zi$Q*oHHKJ+D1)UB$^st~7&P@<_#E*j9+gM)Ubl6ac=g)g^ zT|ST)hi7Wl#S{xrET&$i-xXNDINvh}-RZv4^1VUluiIZA+*J?V2JNQ$&RHrIeIX?}s4pIO$c_l5Jn9;D+)!KXZs4nUlBF57=%7J}Rj?vuRtY8@ zKB<{08 zRbWkbkJvIEFlyR(6E6KUBC*Fph0M`R>4sx!DIW@=F7eD`JS6whdxAQqOyG>2?n-PH z!ckTIs=q{i!@ysdcS|ACb3fYftA^D)M@juR$F~iOlSO+DV?Ky_I|&GQ+zeVu+mZ?F zAae9qJw7`!%q4g@Ua(UcsqvS3qq&Lip)+uSBspMSYh8n?JUE9o)u9^0!sK}NR0w>o zI8tgeFiyL^KI*X;w=y{V)orY4yz=DLXn?yb;F`8FVG3Yt|3s`D5Ny*23Ws~6?J+&459YWj-zj-*m)tzpR$~ytLVH27<5)9HKEh>o;$%nB+j+Wi;%GB0@%X55 z1hEqpLQ5BwlYI=b`wLyWS>bUQT-$>%K}(O|`pKhki}5w(2Z(WiQIM0-Kd#k@^*GF~ zx?o3g>Jd7%tS+}*ZVBwW)pI~s+3EtNy1asC?4WxTx zOmJ00$Xksi=yvK7GhjfMl~#p4ihFr9+~Fyl;#J>gZ^y^xM%p@g;RG!sorrwa%=v6I z_2jTaowk~X7k`Ee$fCcH?BB{wM@FH0bQXL3CM8V3!eG+yQXOH?3DByU`3soW&>U`n+#$g3i7 zz&Pl$sPv{z{L$idM@&uRI>m=J+xP}(z%N_x1OL7Vh8W`&avxQP2SF}ZH)VPyYaeOQ zK%78F_)3eYenSB-1+gH85L0*Dc=AJm%c;V7E+db_Wy!bSE$&mVFx*&*IR>|J)(#5o zSjh=#6zMEoP8d|z_dWh@>G5IR`AEn5;Ys#iiD6jbqMF9uxq>gL7oePLm^bwKyz}tM zZr0=O{bUYfg<%v@K*mqeq(jk5f6J9dFi?itOe8=wz4SwK)L%!26WP+(0V6MEcUuSg zC7w62>Eezf!wKJ`!?cj|S*^^lW&gm9<+*}&M{v@1`|B`c~|ZkVaB# zDo4CUv01vGPqFD~w)IV@B3Bb8o~TA0$9c+WQti%^dCt4Le%S522JGrW#m1PKH=PO6 zzBDrJVfF1S2;4wV2A;iUNHQTnJdkh!9pwn`-RKakmLjxQb$td!K)fwlqsgH{#a*2? zG}-NQJfw(j@xtLruHiya{vE9w)AA3UBTkAn4PKAyc$V^b()DupZ{BE(qB~SiLpYtX zQ`f0Gy&tp!0+h8rze?*z8WaY02>T z8@m0`!olvvE&uF_ZV^G*9RV@LW&vFp1Ng}NMj!V{(hfT`8*-u^V-O(p^^5znUqiRH z&9y6FFP5Z*|B|^k&B7IYl5gv@sA1mz$UqG;;kvs#2c=*7v{{aFnaBx2tW zafcUlr53~4N<^0hAth9EEcT0Q&m~ z%%YGz^=s$2WsK@@Q^#1cO-)5@0(piK_+V}AWK|T`)9GEkr~rD-663`D6wWJxwefI$ zX~TbLzlS2sCR!lKE$a00Y!Wl7d=MkZ|C45-IAkO(_eJ_-Id8DnvKPggvtm_+p_ucg z{oxQBHF*!D5Q1B&Ii5HPLR6l#*6eYPn2JwpsX8%%zJ#|4+(1EUleN@Ai}Sa~X|rgl zZR=#@!>YoPAS%6^+@%;v=t-h z@%L=WRdl)iRu6-t1WD@Gsv;>rv*PBDWH^&hoQ3ODGotyhr%Ic^jT&3YCQ+WfuZVP3UMi_uw+7Npc zILE!l!;=m3weSkWo(t}PZfsXNhTKc9dnu%&V_~j+xO}hc)jIV(OMOl}G2X&!^7*N7 zcJBOX@5i^;87p^9WF=_kt0dGyi(tJyEdnjEjMg79t}zE1I3r8-)Z;?juT|W3;)#oY`e)Zb@@lH1HW#aLEFp^RS^synkP9u5RVpjZ6rYrpSN8;T+$CxSIwojPeJ zDA5&1>b1i$M7b7pE5Km%hz^n0FfMoGMn1vpF}G;7%@-QgZb={(7VV^&f_X1(CQ~1B zn1JkuIJmUPhdrKZI*>iEM0X2946K(aPQr>08MrOAwnU4y1s_#2^KftQq^|1fe?q3l zdGW2VUGl*K-F(GBzKKdLN;+!39_;3Sd{KuuX&dtmOY#n?;8i5eljU3cX1Oy|u;WC+gkFx}xr;btqMrz$!LH z%bU5O7!yyu6Vz1zw)c%1%7=+>#M=jlNY_zp(R0SS)rKE2)%C9Cbn*_I9FJn zBgoz>{^g_n%nL~u%xJEtA{qVZLN9<09s;5c0=1j}(Lr@kHWEN&PxT1MXZBR{{Ku#N z&`^N-69H5L0jSFpP$eXwq=PoVkpqcs#r&s+$ua05yFD)u=yKt;2>C*Q>&oDsGpIhA zZChTFusLnwWJXf}E&Mwk5(rFyGP##NY9l3$6%~ZGzNd0j^_QJaY_UxMP+l?on=?KA zNix6``(m8F7y)GF$857UGGcVC%KRAr!!nn|%39Ek27F(SwKc?gu1D!%qEX?s&2+at zwETdIA`+fB#O*0IkS&Xk3GdRa5+rQCs`PS`WpxG7bz0}l3GBMP$CQ>p=`hXBU6{9|4E3D_k5+_) znTd59jLC*#Wfmys67jT|e}wz*&J3QbpUc9r#W z(>Vnj=nM#&RQ0@3^8;M(#oicO1DpY$^#X;1Z=rcJ8M>ttNmG~gz#EglWH&H2QZX=2 z1j)@ZH)#4fnAuuWejFOsf0!cy|76~|x;Ei;GNC(Bh)oNWu335gn(Noem4I7*z2}n^7fJ^W3kx=$i0BJ+@&O^y0C}@TZHu%mzk=S# zbx7!UQQhF<3#A7t^%K_sgxF?JaYpIR5odd;?pw_JMTBEd<>^j^Gcs{FmS#)hcj<1@ za!)u!$OGJ5twRdLo}9*U%WAo{Aqmo~qlYE~g4$(6Y z>b-E;lW>B!ch??macC4nB#i26z&@rw9pJ2e4PVSQ)wiHMkZ=Mw9VxifI%hIX;;ey0 z9fm~--XHX!NQ(HHmS_66CuTESH>2aaNDt^IX-#a2$0Q4_YxgBw5=C=aDPB-NjkMlD zb$e@@nGLvYu`U0&7oy#CDXDx$*sS`OC40~*MM2(KeKfT^8n~Ay*h&KRy-kr0k!Waa z^)Cmt;*l1Bx}0JJLC1>1K2 z?2)J91OaBiBO9Wu_qs(tcROhRwo~1r77$wT4&2DryUzgSez?-t<=sPA{Xa!3nL&^_YNef}&>crVH<<;ah9=I&$Zo2z%(KU9sv zp>UBZvi>tR2%v!?1!zarr`KSl45gPm&)!8i!78gZ{Mju5#`{cw2czHfIj$oUNyt+> zBBy!7L%|X1xbv}^ZHWSLaGh=~sv$_@j#r(_ya4(Y5KVmeK@IHx;e;Qyzl9sLMp4x= zx<9;6>P7FbYL}lff1I9n8LvMZGhac4&d1!F4kxe&-r%GIe8%^4OYPX>Q9tsdZ|QYa zd>r#Z+Iw%P)pg%TrwzXrUcy||X`mw^h*bvnLoC88o7zfmqhD3%a=<3hkun3{v2IVH z@XC$#If#phb5LT>HyOCnE#Qd3(Fe~hv0q&{V%&nX)ZuTccb9vzdg6qAgMgVb!xU5o zAdN$X0`|LCiGX>C!yPcam~?Af-D!gg@vCTYLnUM!L?66U7_+`iMGR&D7-j-=i`+;| z2tbu;`4J>(33$-j2p%UNM4}*el)$5bed_p%5KURaB&}f=x)lK~^XgyBB%{)Bhk{%e zi{DPVuWmN-cxP@E(d^l(3@!`6%*^eEhUMgq&X04S`sq&5pqpuhbCbcsviG_5P*K@? z)WBkyVdGzetNO5u?Kh8GFZ&P_#h-lHYK|*LZk+W2`XvVc`2dO^j(=L0LgnB=9?a{y_Ze&3r$T%-B!4mlh!}~(fo_z* zy#bh{B4DGLNfv?FwYD@XY~sa8+p>U@M~bnHchJE{kKa$!;a|;{msoUO`&Qs1b&$z` z&rRm>#cf8%oQ5*8{x@H#&KT?Yu+Nrc){rdE+B6x$%#j7T%OB49a!<>*m4g*Vo*h$J z{02=G?T+io^4r!!pAnwdV(EEQJu2+Ejh5XOpj(5*>z7W21+0;`0#Jy;u=KoV?a2@| zC2+X9HF~4}FNY-3sK-k(l)Vm3J&$HOsTLBn=4m%)nY(8lo+>_#q#>Z6oD>23=cF7l zsa3|yT7eO`7)8tFuF;3jt3OA!P-(Tq^eG#}BMn+Rb~H@F`~rO?w&clIa&X%od@H^l z!Z+0b!m{q$pn>)vh43c~?PnknCkG%{?ZMU-)%PEV-f#M4q2T&umvN9fGiGB)>IK6v zFR#t&1P}!ZGqbtnp944IRB7MCh7Oi*L=cQ*{*{{8l$8bP#@^9RdIHKO^+TQRDUFKOCV`V)3anSYfX`q0Ugi^L`0~q)zlQTT4*FWM`V>Fwm)odqOZ_sB zm@OX2Wr!gMNH5eb#^h*HkM=`wP4{iD%ey!4=Ua!#ntL#KI$H@Xif2Qp6p>#I8N7Gf z_VG~G(}Ic!wf?v#G-x^gXt3Y@{1X}vh`rsO?01w~qsUGYWrPVxLO?J7xISTEsg^LK zm4%yHMrnr}?djBCw8!vaT%OBC&Ao*O_7+Ij@co`%4w==%k?z+n&~GVXSqQzPX_`#U z>`WAC_f|sJ7qab#%!AM^qYsUa<7B*~!^ls{5cJBS>$%H9*x{f&HigC@Ux@;e#{53P zV+s$5delq_g$ytghs0fVY+0f@m?vHEh7E;>nx!rWRE6@kz_Zy|tiMW)fH3ojz99Rn zjgn8YVR<=4DxC?YrZUYQZD(R?^$4x(r(JkYO@3OHyjPt6;G^($k$4{39h5eli!V?U zy}=vmg*3=e15c~n-;I1G3lIPKjppb;k0!%6Oul+QaVgA$m~^U}1Xog?QyfuEZ9T>D zayyLRQCFTShf#{D>=!nkThjM;do3lxZyQTsH7JF^kj5ogrQENm^T0Q-Gnyvw?~*w? zJpo0&C+|g={RsCS@=uoWq^MKWo)k7_MKC(ny$4_If6)D8B=AHoL`l%!3k}a>m9K=b zn7^7rZ)Biqkc_f}y~PrDl#%m3Hngi=lOiiQ+fTVcW)$B?7VS961BIK+uwGxic@~u( z&vU>6^8`jE8#U%&BG#3eOCbkUa&7EvxtGP@9I23#yN@5+L%M}k^C7e4sq=Rp2=;oc zlMZ!@7^^8A5;Y3SSc!PtY?HIG=s94qWz3_IOs~y+nO|SxAI7)X%8tlGDp; zA-(q=dmfe&ZX5CmL6(HxY#C3rD|z(0>~srxCFUpgTr91FnTXD!WaN8k$N6%ZRXN8$ zM6v@@dk{xXcQuiDDNB{}r|&}vE?Jud`7STf z{P<$*G}eOlb~SkzMIO~c2zaQAJkWTrw}^H?rvdM$D0X~%GGh;gVZa!9ag0lzJlV!p zRY|+N^}dHI85g>}oghuwoE4u?a}Q7!{a2WSO0_>EGRvb<8#?`YDj=;-X|R;#Qc4t$ zzWaKfsuL}Fl=oGXqMe#nmn+LBxN{J5kfL?87b__YNZZpkK`puP(8%?VfmU@|cF%M~;R!iF?ppDT;3utR!Pnu#OsEe_dJMIRP6vX^Knj0@;< z@vIdP18My;HHUdOO!{1pXV>ht0$B(zx;5^D+Uc{X*tlPxYHk8%!qeyAq}yk<$;Tn- z)Oua`@#=3LIuv_PNA7O$Y3P-~_0U(?6_#Q`1e)@4mS_sb;b*-uids2e&HK79*OXhQ z=VDuWGE4L2v7Ydu06~+w-bwpPNLA3WJ zLF79goz5FOxcSjZ7lf1_H$JzBtp?zTH@!U2Y_ZG>;_@%ytWO_)rzcKjmJlgUrrloTs$t}< zH84ByZTSmKzu3T3vIF4!Qy?&T;rX6@iWcv*HoSml^V)ZLoh0LIUL6ymOyd#X0 zlhMN9;B$n@PjYdWI&F8x9vTOD*L`hkeqvn`5C=|sS zbEffrgKJ>(wNEh7OsJ<3k?i9^ndB*co>>2E%$qF~x7kUOi=Y$CI5AjW{Pze+kXqKe z_Saa|@9d}^|J=`&RB?KpW-Fy3K0A+@kAQCD(;6Qb9j!C&vM0r;!oYp5V%`C_dNJTahGsrlj?3iuRyo3ajxxl8C|qRedWt`22!nmU}@kK z{({0I!&#w5M13XzW(Q*SSD|6#=UoGki|G7?8cRo-vHae&Gf=Vl8|PV@i!3eTkZ}dR^aab zk*>rMS%s2n2b4#r>)tF)zagGx+&>~GLHY%M4)l`1uKH3IpH9jI3y58RWPwyLq)jV} zitc~KVE+lA%~<~N^uDQeSOot^Kkwoh_VeyvzNPQ95f-fHSFt*7b9^lL-2R{O`Vl&Q zc-6$2F#mTB+;7N6(^SotMYROF0Fj^jsX50t4*3Jy;8p8v3dp;nda>?0ojA-NX!`jr zf{27aY%lt3+Xk*Mw@WpR9)Uf+a1EK93R^bm`MW`}qXDGkuXlC$(PugU(J;A%#GJv& zhz!7+!J3WC+7t%`-y&ZGWDW#?ZRHNkdjK~-XCXH=ZvR|7ADVOXtKYN8N^!j?i!dh? zu|Ld+M3vmkY)20^tMeaEirO$HU3;J2koU9jsk9PFSfdH6(g*E7%)e~d4f7laqKT)% zkE%p>1C=UOEvXzm1s=lD%D!JEC)F(z7ep_nK$@umbRS*{$rw@!{n%;liftWcB}>~M zDzs~uCQ(pmCUFwzs0d})`WG2uwT5H7706Y>ss=T6?oZuVsi(VYn}rU1`ec>=w{$X_ z!=K&V9{WP*MUVA^6x{4a`ya10TI?e(((@h3o8Nmgq`KWYb0WY=K)B`Kj%LTNE$hf zH3nZ3D=baPxYW7uzQ)`Xy%rI3t(VWK|YxC}cz!+z2T?f5mzh$E=9FsFqhW0vY zSEJnj>%rT9%E7Tg(y23pyz#HLCep82QlqmvxHcbFJeF~=bNcr=Gl3pC= zsT0-_F>7Uv*zE1$9Ccbd?k{5`ZF!RyBn&@I50N9TNjKJN*)zb^oUW}*4a`zM7^bM> zn_;4@{sKHogx1mzH*2wbbsx#LbWdec363RrXA%$GiMbONX8sL4;qO_KZA=&W$rHDO zBZh|2J@_KkW2z^`dYiSq4Q)ly;c~ylWT+ne!jmc7%uN}I{&p#{8MX=Z1cej$(b6SG zmjKBXL8r+Tww_Z|f08TChb01rbvW%zm!-XT!Ey0ketp?GrxMVjpk=1ed}r(|5#zts z9crEM&y^0&QUVXnye00Iq;OV|^JMbJTzy)FtL;thSsOdrez#fs4Drj}em|2ooMw{bOYI`Imw1W0ylBWWKIsUlbX75_P6wujn~ z!#z#3%zg`NoH1Q%&2uuoE#{!p`x;{sJs%xwU`+bp`l%9VH~R0Gij3APoUpyN9KgwR zG#Q(hXa!tSsIP>55yU1@m|GsTW)|KE4G2_4x@WIr-spAH)3@wGf-!e&gCiR!+3+-b z*fS{f!E5Y85-tX=rM4v;nm?ka9R&9)9B3phP1;SK(U;Q{TUzMb98Ra!$KJN!+VW-B zWeIY5waML|l-H3J*W;ohUYr%Dru>p4JF)3=cq26_Lcwv)cwnC&=GDeG|A8IGPHpMW z%|AKTkA9@iZ|Ii|x8@cPYtxGX;m1a8@3zyLHrE!oFdK8(Yh@@+BaPof zoeqk+d9Pc5QL|VI?XS)+p(YFK@-0}Id2_LG1WL;jDN6w8g>oIR27($^$-FbQtQF4; zyAjRIf07hM!gK35m1QzV`?aiZqidBvAB#*$LG_B5W6P-@#QzMuQJl|Yb@D4Zt$KGS zd*aJbm%??r?=nzSNtJz2O`sm(7Rgr?dGa`tfW$)}?J{4U0B?L|=y@dK{e~(qr_zwP7hb<)_7XN$+Xb_2={CEDw(Ob`P@iIQyX9wbmw%%hr1qI6R6Cg* zL3f?2!P!$a=x}esaj6UhiTXoz{R`aDeeSQTMHzbK9OVCz)N`KcJ0Ro{PGlKpkiLbK zQZr?t;K4nLbNoGxCl68Xm;U_!=mnTY%ofV#9k@`%xk#e4+8{JvIsB?$m!B(C8 z8ToW0>R=Lm=1Y8NJz7^eqn;W}yo#LQ)Q~bY)Xdk<7LfZD+VkYaX>igd<#@SbOm%YQ5$7#@!qxR9E+ptx!k6y}Dt4u*{P*sIE zopVo9k9?tho33;NlOilbwu;*Fp(n|Tsz#*@mJqvdb3EX=`$NWjCH8 zv2=2LRhKxDSq6i;cljZ{dBUE|D;4%)q5+j(2DSfcFhASd;`bPKM&A7C?6q$+G)>SOS5`Fdx zIZ`0~uCVXZ@yY=|o4EVrRjqZ_O6;qf6X{NTn2<3%Huvw!sY`Uf`N>Sjam}b=hg{Pb z{(4{;kv~Zrm@~yWm}pk{^Ji-*H11^VBbhq4sma-b)NJ9|wc5W*QbQ~H^LeZ^h7`#Z zCB6wQ%y7$-!%Cd3Dx>$?!Z8;~8}^&*5=x7ItzF0m!lcN!No zPRp%dGW^qYr=5bOsodc6~I0~*I;UDJ@J;KO8m!{;+%ocZ147{=Ivgba=Aym#CU z7iG5>ld(|xl&Iv{dR|4&pq;UYc`{*9lx^Z#zu$`~TpfgM!pSa&rheoXnw+5MsT)nXSsp8s-R5c!AVZl)8;LE$TDt)Mr~EZaE|{|1w! ze@?ytZVD&V7n1_{uY9(;*(q7wDx(9$h3=>FNbJICD1Cka^o^BiBqOBzQEAthISDTz zTDGbb(ARoq0)zkxT*G_J$xfK8JbY|sK%ZsF7Tg`J|_qh_e1)J zrSZteNIEj#veCv0nVilo8&kPE9KqoD`k&@R2{|7aBdTu?BY&ir*8ni}Y~`sLAF0I8 z0w=66O)^{iX+p-E*PSTD>~>#B?a2_ZkRb2vENiKoT|A47tS`sx;p2Y38I;-!EU!Lg z`|1kKEic@-%BaqN!L3=~0Vu*0@O^l=CI0XuY!whED8EOfKd{NVWIn*&@@(A{4kP#9 zco|Nx1Ne*_P}P_NK8Te;7r+9$18J2v&+O^>HqQK8@8+Me1|UB1r`NN9<=I`HF3>Y2 z4frr!%;NrR;<x{2Dil;Q6d-FSCei^tGtzWi|Me|j=OzxEa&ZCz+kM5ME z+CI0K#T0M&FC4nljV6gs$5u1AG%+QF{+m~PlI8*I0AR(1SZi)?a_iI3YH~sH!B@Tv z6M!0XfAlJ5$Z5C8biFuV)NOHra`o$;x0Nn%LE`&BV?t3QOfgRAIE}Mv_uIJWWxTLE z0HkA5NXX}vN(N-giUrCI;q==KPOf)t?|<4)mxg@$vW?>`Vk5)Fy$i(mpR>k9Qc$Hq(@>Tk(91!Sq;U?mYV4c1z_5*8(o~c7gTd>p9Xh z{s3vPJten$6V^JfyUYU!+T~rU*gTi16(LW7CFyrzlzFz#pWI~Ye}0LJ-wkX%^RtXy zJv-&uoiP3&bua)%epEqN?`AB$1FnVRG27o`t4{St%m2C?y%tZ-ZM$@ww$ek6AVF%s zIT+$jY#l_*UZb=HcKYwHy}y2)0{N#jHx0sv?!uMD1SkRf(Y!uu;Y@ZF<_=8Ko!Bv94YajJSM_yS?{p;J;3HP;&V zT({~8Zb8Ms1pn-A5D;qwc8nFqe`_gWc50ale8!loa@%&3$Jbji0?~`02$3=a9QliXUC}qa1Qp;dbrBsFd&Te{E6X=l_nLyFetdzg-}=)Y*wI z2UmdX@TX^02$HbCF@SOAwzntuc;V($h-TuJMmxf>&927Px5nHzb$YHQx?27U#@ z5RH_3|8j*$>)Nz)W*J_v(M5`65M_4aHg zj=Q>MfrOmLK6q54hhID++kp(AGN2aj+qmEASbyn80`1aW(1Vepos*mq?0s%w18=d_ zv*yZc9fU3`V@$RWLDC!FevTg=(uVg1;#hc>?t~y+vQEDr0Lbw9+kB$msgjbCXgA<% zMcQ>d+Q~qmr+Y`^CwMzv1c7?i_O|zSo4ifM)bcSeh8=LLe(zQd zwSWs#56ku@D@yCnpIr9u114OuyFGT?fOWnIV$S#QuF=5D_gJeNsX6l5QBre;dkXGT zkAXmSKqisLA;F?v`#uIp{1huZonrNABD`X3^)?Paa%jWl{uj&B?}P!#Nh?U@N<4r4 F{{cSxQDp!C literal 0 HcmV?d00001 diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 6e78ee5d45..f58d2c2bf2 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -62,6 +62,9 @@ Notable parameters: Example here describes use case for creation of new color coded review of png image sequence. Original representation's files are kept intact, review is created from transcoded files, but these files are removed in cleanup process. ![global_oiio_transcode](assets/global_oiio_transcode.png) +Another use case is to transcode in Maya only `beauty` render layers and use collected `Display` and `View` colorspaces from DCC. +![global_oiio_transcode_in_Maya](assets/global_oiio_transcode.png) + ## Profile filters Many of the settings are using a concept of **Profile filters** From 82e4e3e5b76d195be63bfce7017e3cc2ede23704 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 23 Feb 2023 11:05:26 +0100 Subject: [PATCH 484/912] OP-4643 - updates to documentation Co-authored-by: Roy Nieterau --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index f58d2c2bf2..d904080ad1 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -51,7 +51,7 @@ OIIOTools transcoder plugin with configurable output presets. Any incoming repre `oiiotool` is used for transcoding, eg. `oiiotool` must be present in `vendor/bin/oiio` or environment variable `OPENPYPE_OIIO_PATHS` must be provided for custom oiio installation. Notable parameters: -- **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. +- **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation loses its 'review' tag if present. - **`Extension`** - target extension. If left empty, original extension is used. - **`Transcoding type`** - transcoding into colorspace or into display and viewer space could be used. Cannot use both at the same time. - **`Colorspace`** - target colorspace, which must be available in used color config. (If `Transcoding type` is `Use Colorspace` value in configuration is used OR if empty value collected on instance from DCC). From 04109103303c436873a1898de53a54735c524f10 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 11:57:51 +0100 Subject: [PATCH 485/912] OP-4643 - added Settings for ExtractColorTranscode --- .../defaults/project_settings/global.json | 4 + .../schemas/schema_global_publish.json | 73 +++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index cedc2d6876..8485bec67b 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -68,6 +68,10 @@ "output": [] } }, + "ExtractColorTranscode": { + "enabled": true, + "profiles": [] + }, "ExtractReview": { "enabled": true, "profiles": [ diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 5388d04bc9..46ae6ba554 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -197,6 +197,79 @@ } ] }, + { + "type": "dict", + "collapsible": true, + "key": "ExtractColorTranscode", + "label": "ExtractColorTranscode", + "checkbox_key": "enabled", + "is_group": true, + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "list", + "key": "profiles", + "label": "Profiles", + "object_type": { + "type": "dict", + "children": [ + { + "key": "families", + "label": "Families", + "type": "list", + "object_type": "text" + }, + { + "key": "hosts", + "label": "Host names", + "type": "hosts-enum", + "multiselection": true + }, + { + "key": "task_types", + "label": "Task types", + "type": "task-types-enum" + }, + { + "key": "task_names", + "label": "Task names", + "type": "list", + "object_type": "text" + }, + { + "key": "subsets", + "label": "Subset names", + "type": "list", + "object_type": "text" + }, + { + "type": "splitter" + }, + { + "key": "ext", + "label": "Output extension", + "type": "text" + }, + { + "key": "output_colorspace", + "label": "Output colorspace", + "type": "text" + }, + { + "key": "custom_tags", + "label": "Custom Tags", + "type": "list", + "object_type": "text" + } + ] + } + } + ] + }, { "type": "dict", "collapsible": true, From 2f1888bbfbd8dbabcd50ed4d48ab2230d810ba53 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 11:58:51 +0100 Subject: [PATCH 486/912] OP-4643 - added ExtractColorTranscode Added method to convert from one colorspace to another to transcoding lib --- openpype/lib/transcoding.py | 53 ++++++++ .../publish/extract_color_transcode.py | 124 ++++++++++++++++++ 2 files changed, 177 insertions(+) create mode 100644 openpype/plugins/publish/extract_color_transcode.py diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 039255d937..2fc662f2a4 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1045,3 +1045,56 @@ def convert_ffprobe_fps_to_float(value): if divisor == 0.0: return 0.0 return dividend / divisor + + +def convert_colorspace_for_input_paths( + input_paths, + output_dir, + source_color_space, + target_color_space, + logger=None +): + """Convert source files from one color space to another. + + Filenames of input files are kept so make sure that output directory + is not the same directory as input files have. + - This way it can handle gaps and can keep input filenames without handling + frame template + + Args: + input_paths (str): Paths that should be converted. It is expected that + contains single file or image sequence of samy type. + output_dir (str): Path to directory where output will be rendered. + Must not be same as input's directory. + source_color_space (str): ocio valid color space of source files + target_color_space (str): ocio valid target color space + logger (logging.Logger): Logger used for logging. + + """ + if logger is None: + logger = logging.getLogger(__name__) + + input_arg = "-i" + oiio_cmd = [ + get_oiio_tools_path(), + + # Don't add any additional attributes + "--nosoftwareattrib", + "--colorconvert", source_color_space, target_color_space + ] + for input_path in input_paths: + # Prepare subprocess arguments + + oiio_cmd.extend([ + input_arg, input_path, + ]) + + # Add last argument - path to output + base_filename = os.path.basename(input_path) + output_path = os.path.join(output_dir, base_filename) + oiio_cmd.extend([ + "-o", output_path + ]) + + logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) + run_subprocess(oiio_cmd, logger=logger) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py new file mode 100644 index 0000000000..58508ab18f --- /dev/null +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -0,0 +1,124 @@ +import pyblish.api + +from openpype.pipeline import publish +from openpype.lib import ( + + is_oiio_supported, +) + +from openpype.lib.transcoding import ( + convert_colorspace_for_input_paths, + get_transcode_temp_directory, +) + +from openpype.lib.profiles_filtering import filter_profiles + + +class ExtractColorTranscode(publish.Extractor): + """ + Extractor to convert colors from one colorspace to different. + """ + + label = "Transcode color spaces" + order = pyblish.api.ExtractorOrder + 0.01 + + optional = True + + # Configurable by Settings + profiles = None + options = None + + def process(self, instance): + if not self.profiles: + self.log.warning("No profiles present for create burnin") + return + + if "representations" not in instance.data: + self.log.warning("No representations, skipping.") + return + + if not is_oiio_supported(): + self.log.warning("OIIO not supported, no transcoding possible.") + return + + colorspace_data = instance.data.get("colorspaceData") + if not colorspace_data: + # TODO get_colorspace ?? + self.log.warning("Instance has not colorspace data, skipping") + return + source_color_space = colorspace_data["colorspace"] + + host_name = instance.context.data["hostName"] + family = instance.data["family"] + task_data = instance.data["anatomyData"].get("task", {}) + task_name = task_data.get("name") + task_type = task_data.get("type") + subset = instance.data["subset"] + + filtering_criteria = { + "hosts": host_name, + "families": family, + "task_names": task_name, + "task_types": task_type, + "subset": subset + } + profile = filter_profiles(self.profiles, filtering_criteria, + logger=self.log) + + if not profile: + self.log.info(( + "Skipped instance. None of profiles in presets are for" + " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" + " | Task type \"{}\" | Subset \"{}\" " + ).format(host_name, family, task_name, task_type, subset)) + return + + self.log.debug("profile: {}".format(profile)) + + target_colorspace = profile["output_colorspace"] + if not target_colorspace: + raise RuntimeError("Target colorspace must be set") + + repres = instance.data.get("representations") or [] + for idx, repre in enumerate(repres): + self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) + if not self.repre_is_valid(repre): + continue + + new_staging_dir = get_transcode_temp_directory() + repre["stagingDir"] = new_staging_dir + files_to_remove = repre["files"] + if not isinstance(files_to_remove, list): + files_to_remove = [files_to_remove] + instance.context.data["cleanupFullPaths"].extend(files_to_remove) + + convert_colorspace_for_input_paths( + repre["files"], + new_staging_dir, + source_color_space, + target_colorspace, + self.log + ) + + def repre_is_valid(self, repre): + """Validation if representation should be processed. + + Args: + repre (dict): Representation which should be checked. + + Returns: + bool: False if can't be processed else True. + """ + + if "review" not in (repre.get("tags") or []): + self.log.info(( + "Representation \"{}\" don't have \"review\" tag. Skipped." + ).format(repre["name"])) + return False + + if not repre.get("files"): + self.log.warning(( + "Representation \"{}\" have empty files. Skipped." + ).format(repre["name"])) + return False + return True From b932994e15ab43e5df93bcf3e81e71622594c6a2 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 12:05:57 +0100 Subject: [PATCH 487/912] OP-4643 - extractor must run just before ExtractReview Nuke render local is set to 0.01 --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 58508ab18f..5163cd4045 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -20,7 +20,7 @@ class ExtractColorTranscode(publish.Extractor): """ label = "Transcode color spaces" - order = pyblish.api.ExtractorOrder + 0.01 + order = pyblish.api.ExtractorOrder + 0.019 optional = True From 48f24ef17d8929e84ac16868ad2d6a733d47b1f1 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:03:22 +0100 Subject: [PATCH 488/912] OP-4643 - fix for full file paths --- .../publish/extract_color_transcode.py | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 5163cd4045..6ad7599f2c 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -1,3 +1,4 @@ +import os import pyblish.api from openpype.pipeline import publish @@ -41,13 +42,6 @@ class ExtractColorTranscode(publish.Extractor): self.log.warning("OIIO not supported, no transcoding possible.") return - colorspace_data = instance.data.get("colorspaceData") - if not colorspace_data: - # TODO get_colorspace ?? - self.log.warning("Instance has not colorspace data, skipping") - return - source_color_space = colorspace_data["colorspace"] - host_name = instance.context.data["hostName"] family = instance.data["family"] task_data = instance.data["anatomyData"].get("task", {}) @@ -82,18 +76,32 @@ class ExtractColorTranscode(publish.Extractor): repres = instance.data.get("representations") or [] for idx, repre in enumerate(repres): self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) - if not self.repre_is_valid(repre): + # if not self.repre_is_valid(repre): + # continue + + colorspace_data = repre.get("colorspaceData") + if not colorspace_data: + # TODO get_colorspace ?? + self.log.warning("Repre has not colorspace data, skipping") + continue + source_color_space = colorspace_data["colorspace"] + config_path = colorspace_data.get("configData", {}).get("path") + if not os.path.exists(config_path): + self.log.warning("Config file doesn't exist, skipping") continue new_staging_dir = get_transcode_temp_directory() + original_staging_dir = repre["stagingDir"] repre["stagingDir"] = new_staging_dir - files_to_remove = repre["files"] - if not isinstance(files_to_remove, list): - files_to_remove = [files_to_remove] - instance.context.data["cleanupFullPaths"].extend(files_to_remove) + files_to_convert = repre["files"] + if not isinstance(files_to_convert, list): + files_to_convert = [files_to_convert] + files_to_convert = [os.path.join(original_staging_dir, path) + for path in files_to_convert] + instance.context.data["cleanupFullPaths"].extend(files_to_convert) convert_colorspace_for_input_paths( - repre["files"], + files_to_convert, new_staging_dir, source_color_space, target_colorspace, From ec299f0d3ca379f73e6f06949506148e78ca5fa1 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:04:06 +0100 Subject: [PATCH 489/912] OP-4643 - pass path for ocio config --- openpype/lib/transcoding.py | 3 +++ openpype/plugins/publish/extract_color_transcode.py | 1 + 2 files changed, 4 insertions(+) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 2fc662f2a4..ab86e44304 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1050,6 +1050,7 @@ def convert_ffprobe_fps_to_float(value): def convert_colorspace_for_input_paths( input_paths, output_dir, + config_path, source_color_space, target_color_space, logger=None @@ -1066,6 +1067,7 @@ def convert_colorspace_for_input_paths( contains single file or image sequence of samy type. output_dir (str): Path to directory where output will be rendered. Must not be same as input's directory. + config_path (str): path to OCIO config file source_color_space (str): ocio valid color space of source files target_color_space (str): ocio valid target color space logger (logging.Logger): Logger used for logging. @@ -1080,6 +1082,7 @@ def convert_colorspace_for_input_paths( # Don't add any additional attributes "--nosoftwareattrib", + "--colorconfig", config_path, "--colorconvert", source_color_space, target_color_space ] for input_path in input_paths: diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 6ad7599f2c..fdb13a47e8 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -103,6 +103,7 @@ class ExtractColorTranscode(publish.Extractor): convert_colorspace_for_input_paths( files_to_convert, new_staging_dir, + config_path, source_color_space, target_colorspace, self.log From 2bc8377dbcf856012489a49051da9952ab75546b Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:15:33 +0100 Subject: [PATCH 490/912] OP-4643 - add custom_tags --- openpype/plugins/publish/extract_color_transcode.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index fdb13a47e8..ab932b2476 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -72,6 +72,7 @@ class ExtractColorTranscode(publish.Extractor): target_colorspace = profile["output_colorspace"] if not target_colorspace: raise RuntimeError("Target colorspace must be set") + custom_tags = profile["custom_tags"] repres = instance.data.get("representations") or [] for idx, repre in enumerate(repres): @@ -109,6 +110,11 @@ class ExtractColorTranscode(publish.Extractor): self.log ) + if custom_tags: + if not repre.get("custom_tags"): + repre["custom_tags"] = [] + repre["custom_tags"].extend(custom_tags) + def repre_is_valid(self, repre): """Validation if representation should be processed. From 4a80b7bb34efdf1dbd7c8f554d42f1caff035385 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:18:38 +0100 Subject: [PATCH 491/912] OP-4643 - added docstring --- openpype/plugins/publish/extract_color_transcode.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index ab932b2476..88e2eed90f 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -18,6 +18,17 @@ from openpype.lib.profiles_filtering import filter_profiles class ExtractColorTranscode(publish.Extractor): """ Extractor to convert colors from one colorspace to different. + + Expects "colorspaceData" on representation. This dictionary is collected + previously and denotes that representation files should be converted. + This dict contains source colorspace information, collected by hosts. + + Target colorspace is selected by profiles in the Settings, based on: + - families + - host + - task types + - task names + - subset names """ label = "Transcode color spaces" From f92c74605b793db31bbee90ccbed656571e69c39 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:15:44 +0100 Subject: [PATCH 492/912] OP-4643 - updated Settings schema --- .../schemas/schema_global_publish.json | 48 +++++++++++++------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 46ae6ba554..c2c911d7d6 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -246,24 +246,44 @@ "type": "list", "object_type": "text" }, + { + "type": "boolean", + "key": "delete_original", + "label": "Delete Original Representation" + }, { "type": "splitter" }, { - "key": "ext", - "label": "Output extension", - "type": "text" - }, - { - "key": "output_colorspace", - "label": "Output colorspace", - "type": "text" - }, - { - "key": "custom_tags", - "label": "Custom Tags", - "type": "list", - "object_type": "text" + "key": "outputs", + "label": "Output Definitions", + "type": "dict-modifiable", + "highlight_content": true, + "object_type": { + "type": "dict", + "children": [ + { + "key": "output_extension", + "label": "Output extension", + "type": "text" + }, + { + "key": "output_colorspace", + "label": "Output colorspace", + "type": "text" + }, + { + "type": "schema", + "name": "schema_representation_tags" + }, + { + "key": "custom_tags", + "label": "Custom Tags", + "type": "list", + "object_type": "text" + } + ] + } } ] } From 2f79021aca117bf3ebea7a2bd1103a6c7e958525 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:17:25 +0100 Subject: [PATCH 493/912] OP-4643 - skip video files Only frames currently supported. --- .../plugins/publish/extract_color_transcode.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 88e2eed90f..a0714c9a33 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -36,6 +36,9 @@ class ExtractColorTranscode(publish.Extractor): optional = True + # Supported extensions + supported_exts = ["exr", "jpg", "jpeg", "png", "dpx"] + # Configurable by Settings profiles = None options = None @@ -88,13 +91,7 @@ class ExtractColorTranscode(publish.Extractor): repres = instance.data.get("representations") or [] for idx, repre in enumerate(repres): self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) - # if not self.repre_is_valid(repre): - # continue - - colorspace_data = repre.get("colorspaceData") - if not colorspace_data: - # TODO get_colorspace ?? - self.log.warning("Repre has not colorspace data, skipping") + if not self._repre_is_valid(repre): continue source_color_space = colorspace_data["colorspace"] config_path = colorspace_data.get("configData", {}).get("path") @@ -136,9 +133,9 @@ class ExtractColorTranscode(publish.Extractor): bool: False if can't be processed else True. """ - if "review" not in (repre.get("tags") or []): - self.log.info(( - "Representation \"{}\" don't have \"review\" tag. Skipped." + if repre.get("ext") not in self.supported_exts: + self.log.warning(( + "Representation \"{}\" of unsupported extension. Skipped." ).format(repre["name"])) return False From e63dc4075629efe7499a510742c61a0f5e9c46fd Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:19:08 +0100 Subject: [PATCH 494/912] OP-4643 - refactored profile, delete of original Implemented multiple outputs from single input representation --- .../publish/extract_color_transcode.py | 156 ++++++++++++------ 1 file changed, 109 insertions(+), 47 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index a0714c9a33..b0c851d5f4 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -1,4 +1,6 @@ import os +import copy + import pyblish.api from openpype.pipeline import publish @@ -56,13 +58,94 @@ class ExtractColorTranscode(publish.Extractor): self.log.warning("OIIO not supported, no transcoding possible.") return + profile = self._get_profile(instance) + if not profile: + return + + repres = instance.data.get("representations") or [] + for idx, repre in enumerate(list(repres)): + self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) + if not self._repre_is_valid(repre): + continue + + colorspace_data = repre["colorspaceData"] + source_color_space = colorspace_data["colorspace"] + config_path = colorspace_data.get("configData", {}).get("path") + if not os.path.exists(config_path): + self.log.warning("Config file doesn't exist, skipping") + continue + + repre = self._handle_original_repre(repre, profile) + + for _, output_def in profile.get("outputs", {}).items(): + new_repre = copy.deepcopy(repre) + + new_staging_dir = get_transcode_temp_directory() + original_staging_dir = new_repre["stagingDir"] + new_repre["stagingDir"] = new_staging_dir + files_to_convert = new_repre["files"] + if not isinstance(files_to_convert, list): + files_to_convert = [files_to_convert] + + files_to_delete = copy.deepcopy(files_to_convert) + + output_extension = output_def["output_extension"] + files_to_convert = self._rename_output_files(files_to_convert, + output_extension) + + files_to_convert = [os.path.join(original_staging_dir, path) + for path in files_to_convert] + + target_colorspace = output_def["output_colorspace"] + if not target_colorspace: + raise RuntimeError("Target colorspace must be set") + + convert_colorspace_for_input_paths( + files_to_convert, + new_staging_dir, + config_path, + source_color_space, + target_colorspace, + self.log + ) + + instance.context.data["cleanupFullPaths"].extend( + files_to_delete) + + custom_tags = output_def.get("custom_tags") + if custom_tags: + if not new_repre.get("custom_tags"): + new_repre["custom_tags"] = [] + new_repre["custom_tags"].extend(custom_tags) + + # Add additional tags from output definition to representation + for tag in output_def["tags"]: + if tag not in new_repre["tags"]: + new_repre["tags"].append(tag) + + instance.data["representations"].append(new_repre) + + def _rename_output_files(self, files_to_convert, output_extension): + """Change extension of converted files.""" + if output_extension: + output_extension = output_extension.replace('.', '') + renamed_files = [] + for file_name in files_to_convert: + file_name, _ = os.path.splitext(file_name) + new_file_name = '{}.{}'.format(file_name, + output_extension) + renamed_files.append(new_file_name) + files_to_convert = renamed_files + return files_to_convert + + def _get_profile(self, instance): + """Returns profile if and how repre should be color transcoded.""" host_name = instance.context.data["hostName"] family = instance.data["family"] task_data = instance.data["anatomyData"].get("task", {}) task_name = task_data.get("name") task_type = task_data.get("type") subset = instance.data["subset"] - filtering_criteria = { "hosts": host_name, "families": family, @@ -75,55 +158,15 @@ class ExtractColorTranscode(publish.Extractor): if not profile: self.log.info(( - "Skipped instance. None of profiles in presets are for" - " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" - " | Task type \"{}\" | Subset \"{}\" " - ).format(host_name, family, task_name, task_type, subset)) - return + "Skipped instance. None of profiles in presets are for" + " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" + " | Task type \"{}\" | Subset \"{}\" " + ).format(host_name, family, task_name, task_type, subset)) self.log.debug("profile: {}".format(profile)) + return profile - target_colorspace = profile["output_colorspace"] - if not target_colorspace: - raise RuntimeError("Target colorspace must be set") - custom_tags = profile["custom_tags"] - - repres = instance.data.get("representations") or [] - for idx, repre in enumerate(repres): - self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) - if not self._repre_is_valid(repre): - continue - source_color_space = colorspace_data["colorspace"] - config_path = colorspace_data.get("configData", {}).get("path") - if not os.path.exists(config_path): - self.log.warning("Config file doesn't exist, skipping") - continue - - new_staging_dir = get_transcode_temp_directory() - original_staging_dir = repre["stagingDir"] - repre["stagingDir"] = new_staging_dir - files_to_convert = repre["files"] - if not isinstance(files_to_convert, list): - files_to_convert = [files_to_convert] - files_to_convert = [os.path.join(original_staging_dir, path) - for path in files_to_convert] - instance.context.data["cleanupFullPaths"].extend(files_to_convert) - - convert_colorspace_for_input_paths( - files_to_convert, - new_staging_dir, - config_path, - source_color_space, - target_colorspace, - self.log - ) - - if custom_tags: - if not repre.get("custom_tags"): - repre["custom_tags"] = [] - repre["custom_tags"].extend(custom_tags) - - def repre_is_valid(self, repre): + def _repre_is_valid(self, repre): """Validation if representation should be processed. Args: @@ -144,4 +187,23 @@ class ExtractColorTranscode(publish.Extractor): "Representation \"{}\" have empty files. Skipped." ).format(repre["name"])) return False + + if not repre.get("colorspaceData"): + self.log.warning("Repre has not colorspace data, skipping") + return False + return True + + def _handle_original_repre(self, repre, profile): + delete_original = profile["delete_original"] + + if delete_original: + if not repre.get("tags"): + repre["tags"] = [] + + if "review" in repre["tags"]: + repre["tags"].remove("review") + if "delete" not in repre["tags"]: + repre["tags"].append("delete") + + return repre From 7341c618274ccdc8f469473ff05698499f6d5b72 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:23:01 +0100 Subject: [PATCH 495/912] OP-4643 - switched logging levels Do not use warning unnecessary. --- openpype/plugins/publish/extract_color_transcode.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index b0c851d5f4..4d38514b8b 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -47,11 +47,11 @@ class ExtractColorTranscode(publish.Extractor): def process(self, instance): if not self.profiles: - self.log.warning("No profiles present for create burnin") + self.log.debug("No profiles present for color transcode") return if "representations" not in instance.data: - self.log.warning("No representations, skipping.") + self.log.debug("No representations, skipping.") return if not is_oiio_supported(): @@ -177,19 +177,19 @@ class ExtractColorTranscode(publish.Extractor): """ if repre.get("ext") not in self.supported_exts: - self.log.warning(( + self.log.debug(( "Representation \"{}\" of unsupported extension. Skipped." ).format(repre["name"])) return False if not repre.get("files"): - self.log.warning(( + self.log.debug(( "Representation \"{}\" have empty files. Skipped." ).format(repre["name"])) return False if not repre.get("colorspaceData"): - self.log.warning("Repre has not colorspace data, skipping") + self.log.debug("Repre has no colorspace data. Skipped.") return False return True From d5cc450e9cd18f7360d65140e48ea5eab810c8e2 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:46:14 +0100 Subject: [PATCH 496/912] OP-4643 - propagate new extension to representation --- .../publish/extract_color_transcode.py | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 4d38514b8b..62cf8f0dee 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -90,8 +90,13 @@ class ExtractColorTranscode(publish.Extractor): files_to_delete = copy.deepcopy(files_to_convert) output_extension = output_def["output_extension"] - files_to_convert = self._rename_output_files(files_to_convert, - output_extension) + output_extension = output_extension.replace('.', '') + if output_extension: + new_repre["name"] = output_extension + new_repre["ext"] = output_extension + + files_to_convert = self._rename_output_files( + files_to_convert, output_extension) files_to_convert = [os.path.join(original_staging_dir, path) for path in files_to_convert] @@ -127,15 +132,13 @@ class ExtractColorTranscode(publish.Extractor): def _rename_output_files(self, files_to_convert, output_extension): """Change extension of converted files.""" - if output_extension: - output_extension = output_extension.replace('.', '') - renamed_files = [] - for file_name in files_to_convert: - file_name, _ = os.path.splitext(file_name) - new_file_name = '{}.{}'.format(file_name, - output_extension) - renamed_files.append(new_file_name) - files_to_convert = renamed_files + renamed_files = [] + for file_name in files_to_convert: + file_name, _ = os.path.splitext(file_name) + new_file_name = '{}.{}'.format(file_name, + output_extension) + renamed_files.append(new_file_name) + files_to_convert = renamed_files return files_to_convert def _get_profile(self, instance): From 65b454c42c77fb75afc06dd34cf36c40ea52a751 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 18:46:35 +0100 Subject: [PATCH 497/912] OP-4643 - added label to Settings --- .../projects_schema/schemas/schema_global_publish.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index c2c911d7d6..7155510fef 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -201,10 +201,14 @@ "type": "dict", "collapsible": true, "key": "ExtractColorTranscode", - "label": "ExtractColorTranscode", + "label": "ExtractColorTranscode (ImageIO)", "checkbox_key": "enabled", "is_group": true, "children": [ + { + "type": "label", + "label": "Configure output format(s) and color spaces for matching representations. Empty 'Output extension' denotes keeping source extension." + }, { "type": "boolean", "key": "enabled", From 9fc4070e066499a89898c450263119dbf8e2f99a Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 16 Jan 2023 18:22:08 +0100 Subject: [PATCH 498/912] OP-4643 - refactored according to review Function turned into single filepath input. --- openpype/lib/transcoding.py | 43 ++++++----- .../publish/extract_color_transcode.py | 72 ++++++++++--------- 2 files changed, 57 insertions(+), 58 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index ab86e44304..e1bd22d109 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1047,12 +1047,12 @@ def convert_ffprobe_fps_to_float(value): return dividend / divisor -def convert_colorspace_for_input_paths( - input_paths, - output_dir, +def convert_colorspace( + input_path, + out_filepath, config_path, - source_color_space, - target_color_space, + source_colorspace, + target_colorspace, logger=None ): """Convert source files from one color space to another. @@ -1063,13 +1063,13 @@ def convert_colorspace_for_input_paths( frame template Args: - input_paths (str): Paths that should be converted. It is expected that + input_path (str): Paths that should be converted. It is expected that contains single file or image sequence of samy type. - output_dir (str): Path to directory where output will be rendered. + out_filepath (str): Path to directory where output will be rendered. Must not be same as input's directory. config_path (str): path to OCIO config file - source_color_space (str): ocio valid color space of source files - target_color_space (str): ocio valid target color space + source_colorspace (str): ocio valid color space of source files + target_colorspace (str): ocio valid target color space logger (logging.Logger): Logger used for logging. """ @@ -1083,21 +1083,18 @@ def convert_colorspace_for_input_paths( # Don't add any additional attributes "--nosoftwareattrib", "--colorconfig", config_path, - "--colorconvert", source_color_space, target_color_space + "--colorconvert", source_colorspace, target_colorspace ] - for input_path in input_paths: - # Prepare subprocess arguments + # Prepare subprocess arguments - oiio_cmd.extend([ - input_arg, input_path, - ]) + oiio_cmd.extend([ + input_arg, input_path, + ]) - # Add last argument - path to output - base_filename = os.path.basename(input_path) - output_path = os.path.join(output_dir, base_filename) - oiio_cmd.extend([ - "-o", output_path - ]) + # Add last argument - path to output + oiio_cmd.extend([ + "-o", out_filepath + ]) - logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) - run_subprocess(oiio_cmd, logger=logger) + logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) + run_subprocess(oiio_cmd, logger=logger) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 62cf8f0dee..3a05426432 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -10,7 +10,7 @@ from openpype.lib import ( ) from openpype.lib.transcoding import ( - convert_colorspace_for_input_paths, + convert_colorspace, get_transcode_temp_directory, ) @@ -69,7 +69,7 @@ class ExtractColorTranscode(publish.Extractor): continue colorspace_data = repre["colorspaceData"] - source_color_space = colorspace_data["colorspace"] + source_colorspace = colorspace_data["colorspace"] config_path = colorspace_data.get("configData", {}).get("path") if not os.path.exists(config_path): self.log.warning("Config file doesn't exist, skipping") @@ -80,8 +80,8 @@ class ExtractColorTranscode(publish.Extractor): for _, output_def in profile.get("outputs", {}).items(): new_repre = copy.deepcopy(repre) - new_staging_dir = get_transcode_temp_directory() original_staging_dir = new_repre["stagingDir"] + new_staging_dir = get_transcode_temp_directory() new_repre["stagingDir"] = new_staging_dir files_to_convert = new_repre["files"] if not isinstance(files_to_convert, list): @@ -92,27 +92,28 @@ class ExtractColorTranscode(publish.Extractor): output_extension = output_def["output_extension"] output_extension = output_extension.replace('.', '') if output_extension: - new_repre["name"] = output_extension + if new_repre["name"] == new_repre["ext"]: + new_repre["name"] = output_extension new_repre["ext"] = output_extension - files_to_convert = self._rename_output_files( - files_to_convert, output_extension) - - files_to_convert = [os.path.join(original_staging_dir, path) - for path in files_to_convert] - target_colorspace = output_def["output_colorspace"] if not target_colorspace: raise RuntimeError("Target colorspace must be set") - convert_colorspace_for_input_paths( - files_to_convert, - new_staging_dir, - config_path, - source_color_space, - target_colorspace, - self.log - ) + for file_name in files_to_convert: + input_filepath = os.path.join(original_staging_dir, + file_name) + output_path = self._get_output_file_path(input_filepath, + new_staging_dir, + output_extension) + convert_colorspace( + input_filepath, + output_path, + config_path, + source_colorspace, + target_colorspace, + self.log + ) instance.context.data["cleanupFullPaths"].extend( files_to_delete) @@ -130,16 +131,16 @@ class ExtractColorTranscode(publish.Extractor): instance.data["representations"].append(new_repre) - def _rename_output_files(self, files_to_convert, output_extension): - """Change extension of converted files.""" - renamed_files = [] - for file_name in files_to_convert: - file_name, _ = os.path.splitext(file_name) - new_file_name = '{}.{}'.format(file_name, - output_extension) - renamed_files.append(new_file_name) - files_to_convert = renamed_files - return files_to_convert + def _get_output_file_path(self, input_filepath, output_dir, + output_extension): + """Create output file name path.""" + file_name = os.path.basename(input_filepath) + file_name, input_extension = os.path.splitext(file_name) + if not output_extension: + output_extension = input_extension + new_file_name = '{}.{}'.format(file_name, + output_extension) + return os.path.join(output_dir, new_file_name) def _get_profile(self, instance): """Returns profile if and how repre should be color transcoded.""" @@ -161,10 +162,10 @@ class ExtractColorTranscode(publish.Extractor): if not profile: self.log.info(( - "Skipped instance. None of profiles in presets are for" - " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" - " | Task type \"{}\" | Subset \"{}\" " - ).format(host_name, family, task_name, task_type, subset)) + "Skipped instance. None of profiles in presets are for" + " Host: \"{}\" | Families: \"{}\" | Task \"{}\"" + " | Task type \"{}\" | Subset \"{}\" " + ).format(host_name, family, task_name, task_type, subset)) self.log.debug("profile: {}".format(profile)) return profile @@ -181,18 +182,19 @@ class ExtractColorTranscode(publish.Extractor): if repre.get("ext") not in self.supported_exts: self.log.debug(( - "Representation \"{}\" of unsupported extension. Skipped." + "Representation '{}' of unsupported extension. Skipped." ).format(repre["name"])) return False if not repre.get("files"): self.log.debug(( - "Representation \"{}\" have empty files. Skipped." + "Representation '{}' have empty files. Skipped." ).format(repre["name"])) return False if not repre.get("colorspaceData"): - self.log.debug("Repre has no colorspace data. Skipped.") + self.log.debug("Representation '{}' has no colorspace data. " + "Skipped.") return False return True From 5eb771333b9d0b0a7b2abf5a2487284f5043f478 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 12:53:02 +0100 Subject: [PATCH 499/912] OP-4643 - updated schema Co-authored-by: Toke Jepsen --- .../projects_schema/schemas/schema_global_publish.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 7155510fef..80c18ce118 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -267,8 +267,8 @@ "type": "dict", "children": [ { - "key": "output_extension", - "label": "Output extension", + "key": "extension", + "label": "Extension", "type": "text" }, { From 49a06f873bc1a77e1dde35a9e6c7f1603508e6e4 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 12:54:46 +0100 Subject: [PATCH 500/912] OP-4643 - updated plugin name in schema MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jakub Ježek --- .../projects_schema/schemas/schema_global_publish.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 80c18ce118..357cbfb287 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -200,8 +200,8 @@ { "type": "dict", "collapsible": true, - "key": "ExtractColorTranscode", - "label": "ExtractColorTranscode (ImageIO)", + "key": "ExtractOIIOTranscode", + "label": "Extract OIIO Transcode", "checkbox_key": "enabled", "is_group": true, "children": [ From 2ec5221b282b4222f5ac179f63f5650050f3b331 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 12:55:57 +0100 Subject: [PATCH 501/912] OP-4643 - updated key in schema Co-authored-by: Toke Jepsen --- .../projects_schema/schemas/schema_global_publish.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 357cbfb287..0281b0ded6 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -272,8 +272,8 @@ "type": "text" }, { - "key": "output_colorspace", - "label": "Output colorspace", + "key": "colorspace", + "label": "Colorspace", "type": "text" }, { From 83d21d9d7793350d6374c2c240f4f70e688c2e88 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 12:57:03 +0100 Subject: [PATCH 502/912] OP-4643 - changed oiio_cmd creation Co-authored-by: Toke Jepsen --- openpype/lib/transcoding.py | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index e1bd22d109..f22628dd28 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1076,25 +1076,15 @@ def convert_colorspace( if logger is None: logger = logging.getLogger(__name__) - input_arg = "-i" oiio_cmd = [ get_oiio_tools_path(), - + input_path, # Don't add any additional attributes "--nosoftwareattrib", "--colorconfig", config_path, - "--colorconvert", source_colorspace, target_colorspace - ] - # Prepare subprocess arguments - - oiio_cmd.extend([ - input_arg, input_path, - ]) - - # Add last argument - path to output - oiio_cmd.extend([ + "--colorconvert", source_colorspace, target_colorspace, "-o", out_filepath - ]) + ] logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) From 40f8cd4a93bfe76dcb91ee683c78033417f40525 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 13:44:45 +0100 Subject: [PATCH 503/912] OP-4643 - updated new keys into settings --- .../settings/defaults/project_settings/global.json | 2 +- .../projects_schema/schemas/schema_global_publish.json | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index 8485bec67b..a5e2d25a88 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -68,7 +68,7 @@ "output": [] } }, - "ExtractColorTranscode": { + "ExtractOIIOTranscode": { "enabled": true, "profiles": [] }, diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 0281b0ded6..74b81b13af 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -276,6 +276,16 @@ "label": "Colorspace", "type": "text" }, + { + "key": "display", + "label": "Display", + "type": "text" + }, + { + "key": "view", + "label": "View", + "type": "text" + }, { "type": "schema", "name": "schema_representation_tags" From e64389f11be2d072e9d8d59dce5334eebb727776 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 13:45:42 +0100 Subject: [PATCH 504/912] OP-4643 - renanmed plugin, added new keys into outputs --- openpype/plugins/publish/extract_color_transcode.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 3a05426432..cc63b35988 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -17,7 +17,7 @@ from openpype.lib.transcoding import ( from openpype.lib.profiles_filtering import filter_profiles -class ExtractColorTranscode(publish.Extractor): +class ExtractOIIOTranscode(publish.Extractor): """ Extractor to convert colors from one colorspace to different. @@ -89,14 +89,14 @@ class ExtractColorTranscode(publish.Extractor): files_to_delete = copy.deepcopy(files_to_convert) - output_extension = output_def["output_extension"] + output_extension = output_def["extension"] output_extension = output_extension.replace('.', '') if output_extension: if new_repre["name"] == new_repre["ext"]: new_repre["name"] = output_extension new_repre["ext"] = output_extension - target_colorspace = output_def["output_colorspace"] + target_colorspace = output_def["colorspace"] if not target_colorspace: raise RuntimeError("Target colorspace must be set") From 99d687c9a1366984116b5ef43d65cab465886b12 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 18:03:13 +0100 Subject: [PATCH 505/912] OP-4643 - fixed config path key --- openpype/plugins/publish/extract_color_transcode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index cc63b35988..245faeb306 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -70,8 +70,8 @@ class ExtractOIIOTranscode(publish.Extractor): colorspace_data = repre["colorspaceData"] source_colorspace = colorspace_data["colorspace"] - config_path = colorspace_data.get("configData", {}).get("path") - if not os.path.exists(config_path): + config_path = colorspace_data.get("config", {}).get("path") + if not config_path or not os.path.exists(config_path): self.log.warning("Config file doesn't exist, skipping") continue From 2a7fd01aada28eebf603e6bd8cc6d6b1a8a560a6 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 18:03:42 +0100 Subject: [PATCH 506/912] OP-4643 - fixed renaming files --- openpype/plugins/publish/extract_color_transcode.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 245faeb306..c079dcf70e 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -96,6 +96,14 @@ class ExtractOIIOTranscode(publish.Extractor): new_repre["name"] = output_extension new_repre["ext"] = output_extension + renamed_files = [] + _, orig_ext = os.path.splitext(files_to_convert[0]) + for file_name in files_to_convert: + file_name = file_name.replace(orig_ext, + "."+output_extension) + renamed_files.append(file_name) + new_repre["files"] = renamed_files + target_colorspace = output_def["colorspace"] if not target_colorspace: raise RuntimeError("Target colorspace must be set") From 34d519524e9998c5436baf5b53f8740bf2eceff3 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 18:04:44 +0100 Subject: [PATCH 507/912] OP-4643 - updated to calculate sequence format --- .../publish/extract_color_transcode.py | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index c079dcf70e..09c86909cb 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -1,5 +1,6 @@ import os import copy +import clique import pyblish.api @@ -108,6 +109,8 @@ class ExtractOIIOTranscode(publish.Extractor): if not target_colorspace: raise RuntimeError("Target colorspace must be set") + files_to_convert = self._translate_to_sequence( + files_to_convert) for file_name in files_to_convert: input_filepath = os.path.join(original_staging_dir, file_name) @@ -139,6 +142,40 @@ class ExtractOIIOTranscode(publish.Extractor): instance.data["representations"].append(new_repre) + def _translate_to_sequence(self, files_to_convert): + """Returns original list of files or single sequence format filename. + + Uses clique to find frame sequence, in this case it merges all frames + into sequence format (%0X) and returns it. + If sequence not found, it returns original list + + Args: + files_to_convert (list): list of file names + Returns: + (list) of [file.%04.exr] or [fileA.exr, fileB.exr] + """ + pattern = [clique.PATTERNS["frames"]] + collections, remainder = clique.assemble( + files_to_convert, patterns=pattern, + assume_padded_when_ambiguous=True) + + if collections: + if len(collections) > 1: + raise ValueError( + "Too many collections {}".format(collections)) + + collection = collections[0] + padding = collection.padding + padding_str = "%0{}".format(padding) + frames = list(collection.indexes) + frame_str = "{}-{}#".format(frames[0], frames[-1]) + file_name = "{}{}{}".format(collection.head, frame_str, + collection.tail) + + files_to_convert = [file_name] + + return files_to_convert + def _get_output_file_path(self, input_filepath, output_dir, output_extension): """Create output file name path.""" From be176bbeb2feb40751be9c208fb4b0dd236f66ae Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 18:54:02 +0100 Subject: [PATCH 508/912] OP-4643 - implemented display and viewer color space --- openpype/lib/transcoding.py | 23 +++++++++++++++++-- .../publish/extract_color_transcode.py | 13 +++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index f22628dd28..cc9cd4e1eb 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1053,6 +1053,8 @@ def convert_colorspace( config_path, source_colorspace, target_colorspace, + view, + display, logger=None ): """Convert source files from one color space to another. @@ -1070,8 +1072,11 @@ def convert_colorspace( config_path (str): path to OCIO config file source_colorspace (str): ocio valid color space of source files target_colorspace (str): ocio valid target color space + view (str): name for viewer space (ocio valid) + display (str): name for display-referred reference space (ocio valid) logger (logging.Logger): Logger used for logging. - + Raises: + ValueError: if misconfigured """ if logger is None: logger = logging.getLogger(__name__) @@ -1082,9 +1087,23 @@ def convert_colorspace( # Don't add any additional attributes "--nosoftwareattrib", "--colorconfig", config_path, - "--colorconvert", source_colorspace, target_colorspace, "-o", out_filepath ] + if all([target_colorspace, view, display]): + raise ValueError("Colorspace and both screen and display" + " cannot be set together." + "Choose colorspace or screen and display") + if not target_colorspace and not all([view, display]): + raise ValueError("Both screen and display must be set.") + + if target_colorspace: + oiio_cmd.extend(["--colorconvert", + source_colorspace, + target_colorspace]) + if view and display: + oiio_cmd.extend(["--iscolorspace", source_colorspace]) + oiio_cmd.extend(["--ociodisplay", display, view]) + logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 09c86909cb..cd8421c0cd 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -106,8 +106,15 @@ class ExtractOIIOTranscode(publish.Extractor): new_repre["files"] = renamed_files target_colorspace = output_def["colorspace"] - if not target_colorspace: - raise RuntimeError("Target colorspace must be set") + view = output_def["view"] or colorspace_data.get("view") + display = (output_def["display"] or + colorspace_data.get("display")) + # both could be already collected by DCC, + # but could be overwritten + if view: + new_repre["colorspaceData"]["view"] = view + if display: + new_repre["colorspaceData"]["view"] = display files_to_convert = self._translate_to_sequence( files_to_convert) @@ -123,6 +130,8 @@ class ExtractOIIOTranscode(publish.Extractor): config_path, source_colorspace, target_colorspace, + view, + display, self.log ) From 3dba4f3eb14c545038bb340614023f974c2c405a Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 26 Jan 2023 19:03:10 +0100 Subject: [PATCH 509/912] OP-4643 - fix wrong order of deletion of representation --- openpype/plugins/publish/extract_color_transcode.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index cd8421c0cd..9cca5cc969 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -69,6 +69,8 @@ class ExtractOIIOTranscode(publish.Extractor): if not self._repre_is_valid(repre): continue + added_representations = False + colorspace_data = repre["colorspaceData"] source_colorspace = colorspace_data["colorspace"] config_path = colorspace_data.get("config", {}).get("path") @@ -76,8 +78,6 @@ class ExtractOIIOTranscode(publish.Extractor): self.log.warning("Config file doesn't exist, skipping") continue - repre = self._handle_original_repre(repre, profile) - for _, output_def in profile.get("outputs", {}).items(): new_repre = copy.deepcopy(repre) @@ -150,6 +150,10 @@ class ExtractOIIOTranscode(publish.Extractor): new_repre["tags"].append(tag) instance.data["representations"].append(new_repre) + added_representations = True + + if added_representations: + self._mark_original_repre_for_deletion(repre, profile) def _translate_to_sequence(self, files_to_convert): """Returns original list of files or single sequence format filename. @@ -253,7 +257,8 @@ class ExtractOIIOTranscode(publish.Extractor): return True - def _handle_original_repre(self, repre, profile): + def _mark_original_repre_for_deletion(self, repre, profile): + """If new transcoded representation created, delete old.""" delete_original = profile["delete_original"] if delete_original: @@ -264,5 +269,3 @@ class ExtractOIIOTranscode(publish.Extractor): repre["tags"].remove("review") if "delete" not in repre["tags"]: repre["tags"].append("delete") - - return repre From 7e9d707226dd1956e457e1d29a0d2df58334e26d Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 11:26:27 +0100 Subject: [PATCH 510/912] OP-4643 - updated docstring, standardized arguments --- openpype/lib/transcoding.py | 19 +++++++---------- .../publish/extract_color_transcode.py | 21 +++++++++---------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index cc9cd4e1eb..0f6d35affe 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1049,7 +1049,7 @@ def convert_ffprobe_fps_to_float(value): def convert_colorspace( input_path, - out_filepath, + output_path, config_path, source_colorspace, target_colorspace, @@ -1057,18 +1057,13 @@ def convert_colorspace( display, logger=None ): - """Convert source files from one color space to another. - - Filenames of input files are kept so make sure that output directory - is not the same directory as input files have. - - This way it can handle gaps and can keep input filenames without handling - frame template + """Convert source file from one color space to another. Args: - input_path (str): Paths that should be converted. It is expected that - contains single file or image sequence of samy type. - out_filepath (str): Path to directory where output will be rendered. - Must not be same as input's directory. + input_path (str): Path that should be converted. It is expected that + contains single file or image sequence of same type + (sequence in format 'file.FRAMESTART-FRAMEEND#.exr', see oiio docs) + output_path (str): Path to output filename. config_path (str): path to OCIO config file source_colorspace (str): ocio valid color space of source files target_colorspace (str): ocio valid target color space @@ -1087,7 +1082,7 @@ def convert_colorspace( # Don't add any additional attributes "--nosoftwareattrib", "--colorconfig", config_path, - "-o", out_filepath + "-o", output_path ] if all([target_colorspace, view, display]): diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 9cca5cc969..c4cef15ea6 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -119,13 +119,13 @@ class ExtractOIIOTranscode(publish.Extractor): files_to_convert = self._translate_to_sequence( files_to_convert) for file_name in files_to_convert: - input_filepath = os.path.join(original_staging_dir, - file_name) - output_path = self._get_output_file_path(input_filepath, + input_path = os.path.join(original_staging_dir, + file_name) + output_path = self._get_output_file_path(input_path, new_staging_dir, output_extension) convert_colorspace( - input_filepath, + input_path, output_path, config_path, source_colorspace, @@ -156,16 +156,17 @@ class ExtractOIIOTranscode(publish.Extractor): self._mark_original_repre_for_deletion(repre, profile) def _translate_to_sequence(self, files_to_convert): - """Returns original list of files or single sequence format filename. + """Returns original list or list with filename formatted in single + sequence format. Uses clique to find frame sequence, in this case it merges all frames - into sequence format (%0X) and returns it. + into sequence format (FRAMESTART-FRAMEEND#) and returns it. If sequence not found, it returns original list Args: files_to_convert (list): list of file names Returns: - (list) of [file.%04.exr] or [fileA.exr, fileB.exr] + (list) of [file.1001-1010#.exr] or [fileA.exr, fileB.exr] """ pattern = [clique.PATTERNS["frames"]] collections, remainder = clique.assemble( @@ -178,8 +179,6 @@ class ExtractOIIOTranscode(publish.Extractor): "Too many collections {}".format(collections)) collection = collections[0] - padding = collection.padding - padding_str = "%0{}".format(padding) frames = list(collection.indexes) frame_str = "{}-{}#".format(frames[0], frames[-1]) file_name = "{}{}{}".format(collection.head, frame_str, @@ -189,10 +188,10 @@ class ExtractOIIOTranscode(publish.Extractor): return files_to_convert - def _get_output_file_path(self, input_filepath, output_dir, + def _get_output_file_path(self, input_path, output_dir, output_extension): """Create output file name path.""" - file_name = os.path.basename(input_filepath) + file_name = os.path.basename(input_path) file_name, input_extension = os.path.splitext(file_name) if not output_extension: output_extension = input_extension From c50d9917a4428270db3cc0797da1c4f941d2022e Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 11:27:06 +0100 Subject: [PATCH 511/912] OP-4643 - fix wrong assignment --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index c4cef15ea6..4e899a519c 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -114,7 +114,7 @@ class ExtractOIIOTranscode(publish.Extractor): if view: new_repre["colorspaceData"]["view"] = view if display: - new_repre["colorspaceData"]["view"] = display + new_repre["colorspaceData"]["display"] = display files_to_convert = self._translate_to_sequence( files_to_convert) From f226dc60cf055d836614b540b0eca31611f568ce Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 11:59:13 +0100 Subject: [PATCH 512/912] OP-4643 - fix files to delete --- .../publish/extract_color_transcode.py | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 4e899a519c..99e684ba21 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -84,26 +84,18 @@ class ExtractOIIOTranscode(publish.Extractor): original_staging_dir = new_repre["stagingDir"] new_staging_dir = get_transcode_temp_directory() new_repre["stagingDir"] = new_staging_dir - files_to_convert = new_repre["files"] - if not isinstance(files_to_convert, list): - files_to_convert = [files_to_convert] - files_to_delete = copy.deepcopy(files_to_convert) + if isinstance(new_repre["files"], list): + files_to_convert = copy.deepcopy(new_repre["files"]) + else: + files_to_convert = [new_repre["files"]] output_extension = output_def["extension"] output_extension = output_extension.replace('.', '') if output_extension: - if new_repre["name"] == new_repre["ext"]: - new_repre["name"] = output_extension - new_repre["ext"] = output_extension - - renamed_files = [] - _, orig_ext = os.path.splitext(files_to_convert[0]) - for file_name in files_to_convert: - file_name = file_name.replace(orig_ext, - "."+output_extension) - renamed_files.append(file_name) - new_repre["files"] = renamed_files + self._rename_in_representation(new_repre, + files_to_convert, + output_extension) target_colorspace = output_def["colorspace"] view = output_def["view"] or colorspace_data.get("view") @@ -135,8 +127,12 @@ class ExtractOIIOTranscode(publish.Extractor): self.log ) - instance.context.data["cleanupFullPaths"].extend( - files_to_delete) + # cleanup temporary transcoded files + for file_name in new_repre["files"]: + transcoded_file_path = os.path.join(new_staging_dir, + file_name) + instance.context.data["cleanupFullPaths"].append( + transcoded_file_path) custom_tags = output_def.get("custom_tags") if custom_tags: @@ -155,6 +151,21 @@ class ExtractOIIOTranscode(publish.Extractor): if added_representations: self._mark_original_repre_for_deletion(repre, profile) + def _rename_in_representation(self, new_repre, files_to_convert, + output_extension): + """Replace old extension with new one everywhere in representation.""" + if new_repre["name"] == new_repre["ext"]: + new_repre["name"] = output_extension + new_repre["ext"] = output_extension + + renamed_files = [] + for file_name in files_to_convert: + file_name, _ = os.path.splitext(file_name) + file_name = '{}.{}'.format(file_name, + output_extension) + renamed_files.append(file_name) + new_repre["files"] = renamed_files + def _translate_to_sequence(self, files_to_convert): """Returns original list or list with filename formatted in single sequence format. From 97a2014c125d7b8f766754e14ac4d74889a5f469 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 13:17:59 +0100 Subject: [PATCH 513/912] OP-4643 - moved output argument to the end --- openpype/lib/transcoding.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 0f6d35affe..e74dab4ccc 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1081,8 +1081,7 @@ def convert_colorspace( input_path, # Don't add any additional attributes "--nosoftwareattrib", - "--colorconfig", config_path, - "-o", output_path + "--colorconfig", config_path ] if all([target_colorspace, view, display]): @@ -1100,5 +1099,7 @@ def convert_colorspace( oiio_cmd.extend(["--iscolorspace", source_colorspace]) oiio_cmd.extend(["--ociodisplay", display, view]) + oiio_cmd.extend(["-o", output_path]) + logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) From 3d2f4319369d6459263cd79e69bec3898ee86efa Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 13:18:33 +0100 Subject: [PATCH 514/912] OP-4643 - fix no tags in repre --- openpype/plugins/publish/extract_color_transcode.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 99e684ba21..3d897c6d9f 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -142,6 +142,8 @@ class ExtractOIIOTranscode(publish.Extractor): # Add additional tags from output definition to representation for tag in output_def["tags"]: + if not new_repre.get("tags"): + new_repre["tags"] = [] if tag not in new_repre["tags"]: new_repre["tags"].append(tag) From 016111ab3381e2ba6c9b5b47fe361a25208c1a6b Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 13:26:07 +0100 Subject: [PATCH 515/912] OP-4643 - changed docstring Elaborated more that 'target_colorspace' and ('view', 'display') are disjunctive. --- openpype/lib/transcoding.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index e74dab4ccc..f7d5e222c8 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1053,8 +1053,8 @@ def convert_colorspace( config_path, source_colorspace, target_colorspace, - view, - display, + view=None, + display=None, logger=None ): """Convert source file from one color space to another. @@ -1067,7 +1067,9 @@ def convert_colorspace( config_path (str): path to OCIO config file source_colorspace (str): ocio valid color space of source files target_colorspace (str): ocio valid target color space + if filled, 'view' and 'display' must be empty view (str): name for viewer space (ocio valid) + both 'view' and 'display' must be filled (if 'target_colorspace') display (str): name for display-referred reference space (ocio valid) logger (logging.Logger): Logger used for logging. Raises: From e1d68ec387572f180844ca8677110cc32d8cf9df Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 1 Feb 2023 11:14:07 +0100 Subject: [PATCH 516/912] OP-4663 - fix double dots in extension Co-authored-by: Toke Jepsen --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 3d897c6d9f..bfed69c300 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -207,7 +207,7 @@ class ExtractOIIOTranscode(publish.Extractor): file_name = os.path.basename(input_path) file_name, input_extension = os.path.splitext(file_name) if not output_extension: - output_extension = input_extension + output_extension = input_extension.replace(".", "") new_file_name = '{}.{}'.format(file_name, output_extension) return os.path.join(output_dir, new_file_name) From b5246cdf6587975cec5638666e82196e84854de3 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 1 Feb 2023 16:11:45 +0100 Subject: [PATCH 517/912] OP-4643 - update documentation in Settings schema --- .../schemas/projects_schema/schemas/schema_global_publish.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 74b81b13af..3956f403f4 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -207,7 +207,7 @@ "children": [ { "type": "label", - "label": "Configure output format(s) and color spaces for matching representations. Empty 'Output extension' denotes keeping source extension." + "label": "Configure Output Definition(s) for new representation(s). \nEmpty 'Extension' denotes keeping source extension. \nName(key) of output definition will be used as new representation name \nunless 'passthrough' value is used to keep existing name. \nFill either 'Colorspace' (for target colorspace) or \nboth 'Display' and 'View' (for display and viewer colorspaces)." }, { "type": "boolean", From b4085288c34f0a035f5be5a536bb6cfdcc4f1a2c Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 1 Feb 2023 16:13:59 +0100 Subject: [PATCH 518/912] OP-4643 - name of new representation from output definition key --- .../publish/extract_color_transcode.py | 49 +++++++++++++++---- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index bfed69c300..e39ea3add9 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -32,6 +32,25 @@ class ExtractOIIOTranscode(publish.Extractor): - task types - task names - subset names + + Can produce one or more representations (with different extensions) based + on output definition in format: + "output_name: { + "extension": "png", + "colorspace": "ACES - ACEScg", + "display": "", + "view": "", + "tags": [], + "custom_tags": [] + } + + If 'extension' is empty original representation extension is used. + 'output_name' will be used as name of new representation. In case of value + 'passthrough' name of original representation will be used. + + 'colorspace' denotes target colorspace to be transcoded into. Could be + empty if transcoding should be only into display and viewer colorspace. + (In that case both 'display' and 'view' must be filled.) """ label = "Transcode color spaces" @@ -78,7 +97,7 @@ class ExtractOIIOTranscode(publish.Extractor): self.log.warning("Config file doesn't exist, skipping") continue - for _, output_def in profile.get("outputs", {}).items(): + for output_name, output_def in profile.get("outputs", {}).items(): new_repre = copy.deepcopy(repre) original_staging_dir = new_repre["stagingDir"] @@ -92,10 +111,10 @@ class ExtractOIIOTranscode(publish.Extractor): output_extension = output_def["extension"] output_extension = output_extension.replace('.', '') - if output_extension: - self._rename_in_representation(new_repre, - files_to_convert, - output_extension) + self._rename_in_representation(new_repre, + files_to_convert, + output_name, + output_extension) target_colorspace = output_def["colorspace"] view = output_def["view"] or colorspace_data.get("view") @@ -154,10 +173,22 @@ class ExtractOIIOTranscode(publish.Extractor): self._mark_original_repre_for_deletion(repre, profile) def _rename_in_representation(self, new_repre, files_to_convert, - output_extension): - """Replace old extension with new one everywhere in representation.""" - if new_repre["name"] == new_repre["ext"]: - new_repre["name"] = output_extension + output_name, output_extension): + """Replace old extension with new one everywhere in representation. + + Args: + new_repre (dict) + files_to_convert (list): of filenames from repre["files"], + standardized to always list + output_name (str): key of output definition from Settings, + if "" token used, keep original repre name + output_extension (str): extension from output definition + """ + if output_name != "passthrough": + new_repre["name"] = output_name + if not output_extension: + return + new_repre["ext"] = output_extension renamed_files = [] From 925c7a9564fa1e2c8cc61d025de35d75af155939 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 1 Feb 2023 16:42:48 +0100 Subject: [PATCH 519/912] OP-4643 - updated docstring for convert_colorspace --- openpype/lib/transcoding.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index f7d5e222c8..b6edd863f8 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1062,8 +1062,11 @@ def convert_colorspace( Args: input_path (str): Path that should be converted. It is expected that contains single file or image sequence of same type - (sequence in format 'file.FRAMESTART-FRAMEEND#.exr', see oiio docs) + (sequence in format 'file.FRAMESTART-FRAMEEND#.ext', see oiio docs, + eg `big.1-3#.tif`) output_path (str): Path to output filename. + (must follow format of 'input_path', eg. single file or + sequence in 'file.FRAMESTART-FRAMEEND#.ext', `output.1-3#.tif`) config_path (str): path to OCIO config file source_colorspace (str): ocio valid color space of source files target_colorspace (str): ocio valid target color space From d96775867a333566ff0681dbdb86688c3bda7f3d Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 7 Feb 2023 18:22:10 +0100 Subject: [PATCH 520/912] OP-4643 - remove review from old representation If new representation gets created and adds 'review' tag it becomes new reviewable representation. --- .../publish/extract_color_transcode.py | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index e39ea3add9..d10b887a0b 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -89,6 +89,7 @@ class ExtractOIIOTranscode(publish.Extractor): continue added_representations = False + added_review = False colorspace_data = repre["colorspaceData"] source_colorspace = colorspace_data["colorspace"] @@ -166,11 +167,15 @@ class ExtractOIIOTranscode(publish.Extractor): if tag not in new_repre["tags"]: new_repre["tags"].append(tag) + if tag == "review": + added_review = True + instance.data["representations"].append(new_repre) added_representations = True if added_representations: - self._mark_original_repre_for_deletion(repre, profile) + self._mark_original_repre_for_deletion(repre, profile, + added_review) def _rename_in_representation(self, new_repre, files_to_convert, output_name, output_extension): @@ -300,15 +305,16 @@ class ExtractOIIOTranscode(publish.Extractor): return True - def _mark_original_repre_for_deletion(self, repre, profile): + def _mark_original_repre_for_deletion(self, repre, profile, added_review): """If new transcoded representation created, delete old.""" + if not repre.get("tags"): + repre["tags"] = [] + delete_original = profile["delete_original"] if delete_original: - if not repre.get("tags"): - repre["tags"] = [] - - if "review" in repre["tags"]: - repre["tags"].remove("review") if "delete" not in repre["tags"]: repre["tags"].append("delete") + + if added_review and "review" in repre["tags"]: + repre["tags"].remove("review") From 7540f61791958b6043ad1a466900a41fc8b27e4c Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 7 Feb 2023 18:23:42 +0100 Subject: [PATCH 521/912] OP-4643 - remove representation that should be deleted Or old revieable representation would be reviewed too. --- openpype/plugins/publish/extract_color_transcode.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index d10b887a0b..93ee1ec44d 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -177,6 +177,11 @@ class ExtractOIIOTranscode(publish.Extractor): self._mark_original_repre_for_deletion(repre, profile, added_review) + for repre in tuple(instance.data["representations"]): + tags = repre.get("tags") or [] + if "delete" in tags and "thumbnail" not in tags: + instance.data["representations"].remove(repre) + def _rename_in_representation(self, new_repre, files_to_convert, output_name, output_extension): """Replace old extension with new one everywhere in representation. From 82b44da739625242d4e2a0ffddec317cad25e806 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 14 Feb 2023 14:54:25 +0100 Subject: [PATCH 522/912] OP-4643 - fix logging Wrong variable used --- openpype/plugins/publish/extract_review.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py index dcb43d7fa2..0f6dacba18 100644 --- a/openpype/plugins/publish/extract_review.py +++ b/openpype/plugins/publish/extract_review.py @@ -169,7 +169,7 @@ class ExtractReview(pyblish.api.InstancePlugin): "Skipped representation. All output definitions from" " selected profile does not match to representation's" " custom tags. \"{}\"" - ).format(str(tags))) + ).format(str(custom_tags))) continue outputs_per_representations.append((repre, outputs)) From 1d12316ee18889a2b18e02db06edf082e6a61d70 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 14 Feb 2023 15:14:14 +0100 Subject: [PATCH 523/912] OP-4643 - allow new repre to stay One might want to delete outputs with 'delete' tag, but repre must stay there at least until extract_review. More universal new tag might be created for this. --- openpype/plugins/publish/extract_color_transcode.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 93ee1ec44d..4a03e623fd 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -161,15 +161,17 @@ class ExtractOIIOTranscode(publish.Extractor): new_repre["custom_tags"].extend(custom_tags) # Add additional tags from output definition to representation + if not new_repre.get("tags"): + new_repre["tags"] = [] for tag in output_def["tags"]: - if not new_repre.get("tags"): - new_repre["tags"] = [] if tag not in new_repre["tags"]: new_repre["tags"].append(tag) if tag == "review": added_review = True + new_repre["tags"].append("newly_added") + instance.data["representations"].append(new_repre) added_representations = True @@ -179,6 +181,12 @@ class ExtractOIIOTranscode(publish.Extractor): for repre in tuple(instance.data["representations"]): tags = repre.get("tags") or [] + # TODO implement better way, for now do not delete new repre + # new repre might have 'delete' tag to removed, but it first must + # be there for review to be created + if "newly_added" in tags: + tags.remove("newly_added") + continue if "delete" in tags and "thumbnail" not in tags: instance.data["representations"].remove(repre) From b5c3e0931e0dc1d13d09cd2b8579e1fc86b0169e Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 15 Feb 2023 16:04:59 +0100 Subject: [PATCH 524/912] OP-4642 - added additional command arguments to Settings --- .../schemas/schema_global_publish.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 3956f403f4..5333d514b5 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -286,6 +286,20 @@ "label": "View", "type": "text" }, + { + "key": "oiiotool_args", + "label": "OIIOtool arguments", + "type": "dict", + "highlight_content": true, + "children": [ + { + "key": "additional_command_args", + "label": "Additional command line arguments", + "type": "list", + "object_type": "text" + } + ] + }, { "type": "schema", "name": "schema_representation_tags" From 3921982365792bb92912777c0cc130462c0e6e14 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 15 Feb 2023 16:08:06 +0100 Subject: [PATCH 525/912] OP-4642 - added additional command arguments for oiiotool Some extension requires special command line arguments (.dpx and binary depth). --- openpype/lib/transcoding.py | 6 ++++++ openpype/plugins/publish/extract_color_transcode.py | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index b6edd863f8..982cee7a46 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1055,6 +1055,7 @@ def convert_colorspace( target_colorspace, view=None, display=None, + additional_command_args=None, logger=None ): """Convert source file from one color space to another. @@ -1074,6 +1075,8 @@ def convert_colorspace( view (str): name for viewer space (ocio valid) both 'view' and 'display' must be filled (if 'target_colorspace') display (str): name for display-referred reference space (ocio valid) + additional_command_args (list): arguments for oiiotool (like binary + depth for .dpx) logger (logging.Logger): Logger used for logging. Raises: ValueError: if misconfigured @@ -1096,6 +1099,9 @@ def convert_colorspace( if not target_colorspace and not all([view, display]): raise ValueError("Both screen and display must be set.") + if additional_command_args: + oiio_cmd.extend(additional_command_args) + if target_colorspace: oiio_cmd.extend(["--colorconvert", source_colorspace, diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 4a03e623fd..3de404125d 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -128,6 +128,9 @@ class ExtractOIIOTranscode(publish.Extractor): if display: new_repre["colorspaceData"]["display"] = display + additional_command_args = (output_def["oiiotool_args"] + ["additional_command_args"]) + files_to_convert = self._translate_to_sequence( files_to_convert) for file_name in files_to_convert: @@ -144,6 +147,7 @@ class ExtractOIIOTranscode(publish.Extractor): target_colorspace, view, display, + additional_command_args, self.log ) From 0834b7564b842832cba47a80a2b8c933d8bce918 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 15 Feb 2023 16:21:25 +0100 Subject: [PATCH 526/912] OP-4642 - refactored newly added representations --- openpype/plugins/publish/extract_color_transcode.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 3de404125d..8c4ef59de9 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -82,6 +82,7 @@ class ExtractOIIOTranscode(publish.Extractor): if not profile: return + new_representations = [] repres = instance.data.get("representations") or [] for idx, repre in enumerate(list(repres)): self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) @@ -174,9 +175,7 @@ class ExtractOIIOTranscode(publish.Extractor): if tag == "review": added_review = True - new_repre["tags"].append("newly_added") - - instance.data["representations"].append(new_repre) + new_representations.append(new_repre) added_representations = True if added_representations: @@ -185,15 +184,11 @@ class ExtractOIIOTranscode(publish.Extractor): for repre in tuple(instance.data["representations"]): tags = repre.get("tags") or [] - # TODO implement better way, for now do not delete new repre - # new repre might have 'delete' tag to removed, but it first must - # be there for review to be created - if "newly_added" in tags: - tags.remove("newly_added") - continue if "delete" in tags and "thumbnail" not in tags: instance.data["representations"].remove(repre) + instance.data["representations"].extend(new_representations) + def _rename_in_representation(self, new_repre, files_to_convert, output_name, output_extension): """Replace old extension with new one everywhere in representation. From 263d3dccc2bb2f2ddc3d18d725a9d16101404cbb Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 15 Feb 2023 16:24:53 +0100 Subject: [PATCH 527/912] OP-4642 - refactored query of representations line 73 returns if no representations. --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 8c4ef59de9..de36ea7d5f 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -83,7 +83,7 @@ class ExtractOIIOTranscode(publish.Extractor): return new_representations = [] - repres = instance.data.get("representations") or [] + repres = instance.data["representations"] for idx, repre in enumerate(list(repres)): self.log.debug("repre ({}): `{}`".format(idx + 1, repre["name"])) if not self._repre_is_valid(repre): From cf066d1441d5d356e4be59591aa8fadfc24bcd0b Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 10:44:10 +0100 Subject: [PATCH 528/912] OP-4643 - fixed subset filtering Co-authored-by: Toke Jepsen --- openpype/plugins/publish/extract_color_transcode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index de36ea7d5f..71124b527a 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -273,7 +273,7 @@ class ExtractOIIOTranscode(publish.Extractor): "families": family, "task_names": task_name, "task_types": task_type, - "subset": subset + "subsets": subset } profile = filter_profiles(self.profiles, filtering_criteria, logger=self.log) From 984974d7e01a48ebcd704e167c1e3fef42418d82 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 12:12:35 +0100 Subject: [PATCH 529/912] OP-4643 - split command line arguments to separate items Reuse existing method from ExtractReview, put it into transcoding.py --- openpype/lib/transcoding.py | 29 +++++++++++++++++++++- openpype/plugins/publish/extract_review.py | 27 +++----------------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 982cee7a46..4d2f72fc41 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1100,7 +1100,7 @@ def convert_colorspace( raise ValueError("Both screen and display must be set.") if additional_command_args: - oiio_cmd.extend(additional_command_args) + oiio_cmd.extend(split_cmd_args(additional_command_args)) if target_colorspace: oiio_cmd.extend(["--colorconvert", @@ -1114,3 +1114,30 @@ def convert_colorspace( logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) + + +def split_cmd_args(in_args): + """Makes sure all entered arguments are separated in individual items. + + Split each argument string with " -" to identify if string contains + one or more arguments. + Args: + in_args (list): of arguments ['-n', '-d uint10'] + Returns + (list): ['-n', '-d', 'unint10'] + """ + splitted_args = [] + for arg in in_args: + sub_args = arg.split(" -") + if len(sub_args) == 1: + if arg and arg not in splitted_args: + splitted_args.append(arg) + continue + + for idx, arg in enumerate(sub_args): + if idx != 0: + arg = "-" + arg + + if arg and arg not in splitted_args: + splitted_args.append(arg) + return splitted_args diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py index 0f6dacba18..e80141fc4a 100644 --- a/openpype/plugins/publish/extract_review.py +++ b/openpype/plugins/publish/extract_review.py @@ -22,6 +22,7 @@ from openpype.lib.transcoding import ( should_convert_for_ffmpeg, convert_input_paths_for_ffmpeg, get_transcode_temp_directory, + split_cmd_args ) @@ -670,7 +671,7 @@ class ExtractReview(pyblish.api.InstancePlugin): res_filters = self.rescaling_filters(temp_data, output_def, new_repre) ffmpeg_video_filters.extend(res_filters) - ffmpeg_input_args = self.split_ffmpeg_args(ffmpeg_input_args) + ffmpeg_input_args = split_cmd_args(ffmpeg_input_args) lut_filters = self.lut_filters(new_repre, instance, ffmpeg_input_args) ffmpeg_video_filters.extend(lut_filters) @@ -723,28 +724,6 @@ class ExtractReview(pyblish.api.InstancePlugin): ffmpeg_output_args ) - def split_ffmpeg_args(self, in_args): - """Makes sure all entered arguments are separated in individual items. - - Split each argument string with " -" to identify if string contains - one or more arguments. - """ - splitted_args = [] - for arg in in_args: - sub_args = arg.split(" -") - if len(sub_args) == 1: - if arg and arg not in splitted_args: - splitted_args.append(arg) - continue - - for idx, arg in enumerate(sub_args): - if idx != 0: - arg = "-" + arg - - if arg and arg not in splitted_args: - splitted_args.append(arg) - return splitted_args - def ffmpeg_full_args( self, input_args, video_filters, audio_filters, output_args ): @@ -764,7 +743,7 @@ class ExtractReview(pyblish.api.InstancePlugin): Returns: list: Containing all arguments ready to run in subprocess. """ - output_args = self.split_ffmpeg_args(output_args) + output_args = split_cmd_args(output_args) video_args_dentifiers = ["-vf", "-filter:v"] audio_args_dentifiers = ["-af", "-filter:a"] From 51c54e1aa1bf602fe4cc2ba0ff1110dcfe5f5539 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 13:02:41 +0100 Subject: [PATCH 530/912] OP-4643 - refactor - changed existence check --- openpype/plugins/publish/extract_color_transcode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 71124b527a..456e40008d 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -161,12 +161,12 @@ class ExtractOIIOTranscode(publish.Extractor): custom_tags = output_def.get("custom_tags") if custom_tags: - if not new_repre.get("custom_tags"): + if new_repre.get("custom_tags") is None: new_repre["custom_tags"] = [] new_repre["custom_tags"].extend(custom_tags) # Add additional tags from output definition to representation - if not new_repre.get("tags"): + if new_repre.get("tags") is None: new_repre["tags"] = [] for tag in output_def["tags"]: if tag not in new_repre["tags"]: From cb551fe83acde2ea43e61706273bf33fec1c37d3 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 13:11:11 +0100 Subject: [PATCH 531/912] Revert "Fix - added missed scopes for Slack bot" This reverts commit 5e0c4a3ab1432e120b8f0c324f899070f1a5f831. --- openpype/modules/slack/manifest.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/openpype/modules/slack/manifest.yml b/openpype/modules/slack/manifest.yml index 233c39fbaf..7a65cc5915 100644 --- a/openpype/modules/slack/manifest.yml +++ b/openpype/modules/slack/manifest.yml @@ -19,8 +19,6 @@ oauth_config: - chat:write.public - files:write - channels:read - - users:read - - usergroups:read settings: org_deploy_enabled: false socket_mode_enabled: false From e2ebbae14772b4f24b169c104cdabfcabfab6b66 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 13:10:11 +0100 Subject: [PATCH 532/912] OP-4643 - changed label MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jakub Ježek --- .../schemas/projects_schema/schemas/schema_global_publish.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 5333d514b5..3e9467af61 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -294,7 +294,7 @@ "children": [ { "key": "additional_command_args", - "label": "Additional command line arguments", + "label": "Arguments", "type": "list", "object_type": "text" } From 4e755e193a6c1e6f2d074d98d2684b3e18cf5282 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 15:06:16 +0100 Subject: [PATCH 533/912] OP-4643 - added documentation --- .../assets/global_oiio_transcode.png | Bin 0 -> 29010 bytes .../project_settings/settings_project_global.md | 15 +++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 website/docs/project_settings/assets/global_oiio_transcode.png diff --git a/website/docs/project_settings/assets/global_oiio_transcode.png b/website/docs/project_settings/assets/global_oiio_transcode.png new file mode 100644 index 0000000000000000000000000000000000000000..99396d5bb3f16d434a92c6079515128488b82489 GIT binary patch literal 29010 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 literal 0 HcmV?d00001 diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 37fed93e69..52671d2db6 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -45,6 +45,21 @@ The _input pattern_ matching uses REGEX expression syntax (try [regexr.com](http The **colorspace name** value is a raw string input and no validation is run after saving project settings. We recommend to open the specified `config.ocio` file and copy pasting the exact colorspace names. ::: +### Extract OIIO Transcode +There is profile configurable (see lower) plugin which allows to transcode any incoming representation to one or multiple new representations (configured in `Output Definitions`) with different target colorspaces. +Plugin expects instances with filled dictionary `colorspaceData` on a representation. This data contains information about source colorspace and must be collected for transcoding. +`oiiotool` is used for transcoding, eg. `oiiotool` must be present in `vendor/bin/oiio` or environment variable `OPENPYPE_OIIO_PATHS` must be provided for custom oiio installation. + +Notable parameters: +- **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. +- **`Extension`** - target extension, could be empty - original extension is used +- **`Colorspace`** - target colorspace - must be available in used color config +- **`Display & View`** - transcoding into colorspace OR into display and viewer space could be used. (It is disjunctive: Colorspace & nothing in Display and View or opposite) +- **`Arguments`** - special additional command line arguments for `oiiotool` + + +Example here describes use case for creation of new color coded review of png image sequence. Original representation's files are kept intact, review is created from transcoded files, but these files are removed in cleanup process. +![global_oiio_transcode](assets/global_oiio_transcode.png) ## Profile filters From 54e92f02b9f1a31fd9b05005864b6f1e8e5b99ff Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 16:41:42 +0100 Subject: [PATCH 534/912] OP-4643 - updates to documentation Co-authored-by: Toke Jepsen --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 52671d2db6..cc661a21fa 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -46,7 +46,7 @@ The **colorspace name** value is a raw string input and no validation is run aft ::: ### Extract OIIO Transcode -There is profile configurable (see lower) plugin which allows to transcode any incoming representation to one or multiple new representations (configured in `Output Definitions`) with different target colorspaces. +There is profile configurable plugin which allows to transcode any incoming representation to one or multiple new representations (configured in `Output Definitions`) with different target colorspaces. Plugin expects instances with filled dictionary `colorspaceData` on a representation. This data contains information about source colorspace and must be collected for transcoding. `oiiotool` is used for transcoding, eg. `oiiotool` must be present in `vendor/bin/oiio` or environment variable `OPENPYPE_OIIO_PATHS` must be provided for custom oiio installation. From 665132d9feb19a6d566e2541ccb1207bef1dcc53 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 16:42:06 +0100 Subject: [PATCH 535/912] OP-4643 - updates to documentation Co-authored-by: Toke Jepsen --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index cc661a21fa..8e557a381c 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -52,7 +52,7 @@ Plugin expects instances with filled dictionary `colorspaceData` on a representa Notable parameters: - **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. -- **`Extension`** - target extension, could be empty - original extension is used +- **`Extension`** - target extension. If left empty, original extension is used. - **`Colorspace`** - target colorspace - must be available in used color config - **`Display & View`** - transcoding into colorspace OR into display and viewer space could be used. (It is disjunctive: Colorspace & nothing in Display and View or opposite) - **`Arguments`** - special additional command line arguments for `oiiotool` From ceca9a5bb89c8da7915d7c4772cbd23448b49714 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 16:42:29 +0100 Subject: [PATCH 536/912] OP-4643 - updates to documentation Co-authored-by: Toke Jepsen --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 8e557a381c..166400cb7f 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -53,7 +53,7 @@ Plugin expects instances with filled dictionary `colorspaceData` on a representa Notable parameters: - **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. - **`Extension`** - target extension. If left empty, original extension is used. -- **`Colorspace`** - target colorspace - must be available in used color config +- **`Colorspace`** - target colorspace, which must be available in used color config. - **`Display & View`** - transcoding into colorspace OR into display and viewer space could be used. (It is disjunctive: Colorspace & nothing in Display and View or opposite) - **`Arguments`** - special additional command line arguments for `oiiotool` From 0a4cae9db2eaf3beea496e57065240a7b4eec1c1 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 16:42:48 +0100 Subject: [PATCH 537/912] OP-4643 - updates to documentation Co-authored-by: Toke Jepsen --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 166400cb7f..908191f122 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -54,7 +54,7 @@ Notable parameters: - **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. - **`Extension`** - target extension. If left empty, original extension is used. - **`Colorspace`** - target colorspace, which must be available in used color config. -- **`Display & View`** - transcoding into colorspace OR into display and viewer space could be used. (It is disjunctive: Colorspace & nothing in Display and View or opposite) +- **`Display & View`** - transcoding into colorspace or into display and viewer space could be used. Cannot use both `Colorspace` and `Display & View` at the same time. - **`Arguments`** - special additional command line arguments for `oiiotool` From 3a0e9dc78ce48bf9d964eed90b5afea24853e8a7 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 16:43:06 +0100 Subject: [PATCH 538/912] OP-4643 - updates to documentation Co-authored-by: Toke Jepsen --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 908191f122..0a73868d2d 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -55,7 +55,7 @@ Notable parameters: - **`Extension`** - target extension. If left empty, original extension is used. - **`Colorspace`** - target colorspace, which must be available in used color config. - **`Display & View`** - transcoding into colorspace or into display and viewer space could be used. Cannot use both `Colorspace` and `Display & View` at the same time. -- **`Arguments`** - special additional command line arguments for `oiiotool` +- **`Arguments`** - special additional command line arguments for `oiiotool`. Example here describes use case for creation of new color coded review of png image sequence. Original representation's files are kept intact, review is created from transcoded files, but these files are removed in cleanup process. From 7f8a766c6a294991c379a356e63ab3b2fd9e53a7 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 17:21:20 +0100 Subject: [PATCH 539/912] OP-4643 - updates to documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jakub Ježek --- website/docs/project_settings/settings_project_global.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 0a73868d2d..9e2ee187cc 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -46,8 +46,8 @@ The **colorspace name** value is a raw string input and no validation is run aft ::: ### Extract OIIO Transcode -There is profile configurable plugin which allows to transcode any incoming representation to one or multiple new representations (configured in `Output Definitions`) with different target colorspaces. -Plugin expects instances with filled dictionary `colorspaceData` on a representation. This data contains information about source colorspace and must be collected for transcoding. +OIIOTools transcoder plugin with configurable output presets. Any incoming representation with `colorspaceData` is convertable to single or multiple representations with different target colorspaces or display and viewer names found in linked **config.ocio** file. + `oiiotool` is used for transcoding, eg. `oiiotool` must be present in `vendor/bin/oiio` or environment variable `OPENPYPE_OIIO_PATHS` must be provided for custom oiio installation. Notable parameters: From 559d54c3a1b061f3234b0491f6abbb8b22aee6c8 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 17:56:21 +0100 Subject: [PATCH 540/912] Revert "OP-4643 - split command line arguments to separate items" This reverts commit deaad39437501f18fc3ba4be8b1fc5f0ee3be65d. --- openpype/lib/transcoding.py | 29 +--------------------- openpype/plugins/publish/extract_review.py | 27 +++++++++++++++++--- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 4d2f72fc41..982cee7a46 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1100,7 +1100,7 @@ def convert_colorspace( raise ValueError("Both screen and display must be set.") if additional_command_args: - oiio_cmd.extend(split_cmd_args(additional_command_args)) + oiio_cmd.extend(additional_command_args) if target_colorspace: oiio_cmd.extend(["--colorconvert", @@ -1114,30 +1114,3 @@ def convert_colorspace( logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) - - -def split_cmd_args(in_args): - """Makes sure all entered arguments are separated in individual items. - - Split each argument string with " -" to identify if string contains - one or more arguments. - Args: - in_args (list): of arguments ['-n', '-d uint10'] - Returns - (list): ['-n', '-d', 'unint10'] - """ - splitted_args = [] - for arg in in_args: - sub_args = arg.split(" -") - if len(sub_args) == 1: - if arg and arg not in splitted_args: - splitted_args.append(arg) - continue - - for idx, arg in enumerate(sub_args): - if idx != 0: - arg = "-" + arg - - if arg and arg not in splitted_args: - splitted_args.append(arg) - return splitted_args diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py index e80141fc4a..0f6dacba18 100644 --- a/openpype/plugins/publish/extract_review.py +++ b/openpype/plugins/publish/extract_review.py @@ -22,7 +22,6 @@ from openpype.lib.transcoding import ( should_convert_for_ffmpeg, convert_input_paths_for_ffmpeg, get_transcode_temp_directory, - split_cmd_args ) @@ -671,7 +670,7 @@ class ExtractReview(pyblish.api.InstancePlugin): res_filters = self.rescaling_filters(temp_data, output_def, new_repre) ffmpeg_video_filters.extend(res_filters) - ffmpeg_input_args = split_cmd_args(ffmpeg_input_args) + ffmpeg_input_args = self.split_ffmpeg_args(ffmpeg_input_args) lut_filters = self.lut_filters(new_repre, instance, ffmpeg_input_args) ffmpeg_video_filters.extend(lut_filters) @@ -724,6 +723,28 @@ class ExtractReview(pyblish.api.InstancePlugin): ffmpeg_output_args ) + def split_ffmpeg_args(self, in_args): + """Makes sure all entered arguments are separated in individual items. + + Split each argument string with " -" to identify if string contains + one or more arguments. + """ + splitted_args = [] + for arg in in_args: + sub_args = arg.split(" -") + if len(sub_args) == 1: + if arg and arg not in splitted_args: + splitted_args.append(arg) + continue + + for idx, arg in enumerate(sub_args): + if idx != 0: + arg = "-" + arg + + if arg and arg not in splitted_args: + splitted_args.append(arg) + return splitted_args + def ffmpeg_full_args( self, input_args, video_filters, audio_filters, output_args ): @@ -743,7 +764,7 @@ class ExtractReview(pyblish.api.InstancePlugin): Returns: list: Containing all arguments ready to run in subprocess. """ - output_args = split_cmd_args(output_args) + output_args = self.split_ffmpeg_args(output_args) video_args_dentifiers = ["-vf", "-filter:v"] audio_args_dentifiers = ["-af", "-filter:a"] From 5678bdbf065922d1e065782ce419149bdd29cbae Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 18:02:17 +0100 Subject: [PATCH 541/912] OP-4643 - different splitting for oiio It seems that logic in ExtractReview does different thing. --- openpype/lib/transcoding.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 982cee7a46..376297ff32 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1100,7 +1100,7 @@ def convert_colorspace( raise ValueError("Both screen and display must be set.") if additional_command_args: - oiio_cmd.extend(additional_command_args) + oiio_cmd.extend(split_cmd_args(additional_command_args)) if target_colorspace: oiio_cmd.extend(["--colorconvert", @@ -1114,3 +1114,21 @@ def convert_colorspace( logger.debug("Conversion command: {}".format(" ".join(oiio_cmd))) run_subprocess(oiio_cmd, logger=logger) + + +def split_cmd_args(in_args): + """Makes sure all entered arguments are separated in individual items. + + Split each argument string with " -" to identify if string contains + one or more arguments. + Args: + in_args (list): of arguments ['-n', '-d uint10'] + Returns + (list): ['-n', '-d', 'unint10'] + """ + splitted_args = [] + for arg in in_args: + if not arg.strip(): + continue + splitted_args.extend(arg.split(" ")) + return splitted_args From f30b3c52307e4db5e6715a56ba9532c89dcfceb8 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 18:14:57 +0100 Subject: [PATCH 542/912] OP-4643 - allow colorspace to be empty and collected from DCC --- openpype/plugins/publish/extract_color_transcode.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 456e40008d..82b92ec93e 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -118,7 +118,8 @@ class ExtractOIIOTranscode(publish.Extractor): output_name, output_extension) - target_colorspace = output_def["colorspace"] + target_colorspace = (output_def["colorspace"] or + colorspace_data.get("colorspace")) view = output_def["view"] or colorspace_data.get("view") display = (output_def["display"] or colorspace_data.get("display")) From 7ecf6fde48aebc705f13ac965e2a9819239b2c87 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 22 Feb 2023 12:22:53 +0100 Subject: [PATCH 543/912] OP-4643 - fix colorspace from DCC representation["colorspaceData"]["colorspace"] is only input colorspace --- openpype/plugins/publish/extract_color_transcode.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 82b92ec93e..456e40008d 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -118,8 +118,7 @@ class ExtractOIIOTranscode(publish.Extractor): output_name, output_extension) - target_colorspace = (output_def["colorspace"] or - colorspace_data.get("colorspace")) + target_colorspace = output_def["colorspace"] view = output_def["view"] or colorspace_data.get("view") display = (output_def["display"] or colorspace_data.get("display")) From 945f1dfe55ad1f150cf0f71baacaea80857a0e4e Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 22 Feb 2023 17:33:20 +0100 Subject: [PATCH 544/912] OP-4643 - added explicit enum for transcoding type As transcoding info (colorspace, display) might be collected from DCC, it must be explicit which should be used. --- openpype/lib/transcoding.py | 2 +- .../plugins/publish/extract_color_transcode.py | 15 +++++++++++---- .../schemas/schema_global_publish.json | 9 +++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index 376297ff32..c0bda2aa37 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1052,7 +1052,7 @@ def convert_colorspace( output_path, config_path, source_colorspace, - target_colorspace, + target_colorspace=None, view=None, display=None, additional_command_args=None, diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 456e40008d..b0921688e9 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -118,10 +118,17 @@ class ExtractOIIOTranscode(publish.Extractor): output_name, output_extension) - target_colorspace = output_def["colorspace"] - view = output_def["view"] or colorspace_data.get("view") - display = (output_def["display"] or - colorspace_data.get("display")) + transcoding_type = output_def["transcoding_type"] + + target_colorspace = view = display = None + if transcoding_type == "colorspace": + target_colorspace = (output_def["colorspace"] or + colorspace_data.get("colorspace")) + else: + view = output_def["view"] or colorspace_data.get("view") + display = (output_def["display"] or + colorspace_data.get("display")) + # both could be already collected by DCC, # but could be overwritten if view: diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 3e9467af61..76574e8b9b 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -271,6 +271,15 @@ "label": "Extension", "type": "text" }, + { + "type": "enum", + "key": "transcoding_type", + "label": "Transcoding type", + "enum_items": [ + { "colorspace": "Use Colorspace" }, + { "display": "Use Display&View" } + ] + }, { "key": "colorspace", "label": "Colorspace", From 25fb38bd4c210770c711d725ed1b88f0c1b8731b Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 22 Feb 2023 17:34:03 +0100 Subject: [PATCH 545/912] OP-4643 - added explicit enum for transcoding type As transcoding info (colorspace, display) might be collected from DCC, it must be explicit which should be used. --- .../assets/global_oiio_transcode.png | Bin 29010 -> 17936 bytes .../settings_project_global.md | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/website/docs/project_settings/assets/global_oiio_transcode.png b/website/docs/project_settings/assets/global_oiio_transcode.png index 99396d5bb3f16d434a92c6079515128488b82489..d818ecfe19f93366e5f4664734d68c7b448d7b4f 100644 GIT binary patch literal 17936 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 DbV~re literal 29010 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 diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 9e2ee187cc..6e78ee5d45 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -53,8 +53,9 @@ OIIOTools transcoder plugin with configurable output presets. Any incoming repre Notable parameters: - **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. - **`Extension`** - target extension. If left empty, original extension is used. -- **`Colorspace`** - target colorspace, which must be available in used color config. -- **`Display & View`** - transcoding into colorspace or into display and viewer space could be used. Cannot use both `Colorspace` and `Display & View` at the same time. +- **`Transcoding type`** - transcoding into colorspace or into display and viewer space could be used. Cannot use both at the same time. +- **`Colorspace`** - target colorspace, which must be available in used color config. (If `Transcoding type` is `Use Colorspace` value in configuration is used OR if empty value collected on instance from DCC). +- **`Display & View`** - display and viewer colorspace. (If `Transcoding type` is `Use Display&View` values in configuration is used OR if empty values collected on instance from DCC). - **`Arguments`** - special additional command line arguments for `oiiotool`. From b8f8fd9a5a5342376b28b18f4a9d394ddf3d6b42 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 22 Feb 2023 17:42:07 +0100 Subject: [PATCH 546/912] OP-4643 - added use case for Maya to documentation --- .../assets/global_oiio_transcode2.png | Bin 0 -> 17960 bytes .../project_settings/settings_project_global.md | 3 +++ 2 files changed, 3 insertions(+) create mode 100644 website/docs/project_settings/assets/global_oiio_transcode2.png diff --git a/website/docs/project_settings/assets/global_oiio_transcode2.png b/website/docs/project_settings/assets/global_oiio_transcode2.png new file mode 100644 index 0000000000000000000000000000000000000000..906f780830a96b4bc6f26d98484dd3f9cc3885f2 GIT binary patch literal 17960 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 F{{cSxQDp!C literal 0 HcmV?d00001 diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index 6e78ee5d45..f58d2c2bf2 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -62,6 +62,9 @@ Notable parameters: Example here describes use case for creation of new color coded review of png image sequence. Original representation's files are kept intact, review is created from transcoded files, but these files are removed in cleanup process. ![global_oiio_transcode](assets/global_oiio_transcode.png) +Another use case is to transcode in Maya only `beauty` render layers and use collected `Display` and `View` colorspaces from DCC. +![global_oiio_transcode_in_Maya](assets/global_oiio_transcode.png) + ## Profile filters Many of the settings are using a concept of **Profile filters** From 539ba60eb4c21e310e716a806683acbc7a0284a5 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 23 Feb 2023 11:05:26 +0100 Subject: [PATCH 547/912] OP-4643 - updates to documentation Co-authored-by: Roy Nieterau --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index f58d2c2bf2..d904080ad1 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -51,7 +51,7 @@ OIIOTools transcoder plugin with configurable output presets. Any incoming repre `oiiotool` is used for transcoding, eg. `oiiotool` must be present in `vendor/bin/oiio` or environment variable `OPENPYPE_OIIO_PATHS` must be provided for custom oiio installation. Notable parameters: -- **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation looses its 'review' tag if present. +- **`Delete Original Representation`** - keep or remove original representation. If old representation is kept, but there is new transcoded representation with 'Create review' tag, original representation loses its 'review' tag if present. - **`Extension`** - target extension. If left empty, original extension is used. - **`Transcoding type`** - transcoding into colorspace or into display and viewer space could be used. Cannot use both at the same time. - **`Colorspace`** - target colorspace, which must be available in used color config. (If `Transcoding type` is `Use Colorspace` value in configuration is used OR if empty value collected on instance from DCC). From 6ad3421f7f4c6aa7d3cd21d7e63dca19df3d8e41 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 22 Feb 2023 15:40:55 +0100 Subject: [PATCH 548/912] improving deprecation --- openpype/hosts/nuke/api/lib.py | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index 0325838e78..b13c592fbf 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -214,8 +214,9 @@ def update_node_data(node, knobname, data): knob.setValue(knob_value) +@deprecated class Knobby(object): - """[DEPRICATED] For creating knob which it's type isn't + """[DEPRECATED] For creating knob which it's type isn't mapped in `create_knobs` Args: @@ -248,8 +249,9 @@ class Knobby(object): return " ".join(words) +@deprecated def create_knobs(data, tab=None): - """[DEPRICATED] Create knobs by data + """[DEPRECATED] Create knobs by data Depending on the type of each dict value and creates the correct Knob. @@ -342,8 +344,9 @@ def create_knobs(data, tab=None): return knobs +@deprecated def imprint(node, data, tab=None): - """[DEPRICATED] Store attributes with value on node + """[DEPRECATED] Store attributes with value on node Parse user data into Node knobs. Use `collections.OrderedDict` to ensure knob order. @@ -398,8 +401,9 @@ def imprint(node, data, tab=None): node.addKnob(knob) +@deprecated def add_publish_knob(node): - """[DEPRICATED] Add Publish knob to node + """[DEPRECATED] Add Publish knob to node Arguments: node (nuke.Node): nuke node to be processed @@ -416,8 +420,9 @@ def add_publish_knob(node): return node +@deprecated def set_avalon_knob_data(node, data=None, prefix="avalon:"): - """[DEPRICATED] Sets data into nodes's avalon knob + """[DEPRECATED] Sets data into nodes's avalon knob Arguments: node (nuke.Node): Nuke node to imprint with data, @@ -478,8 +483,9 @@ def set_avalon_knob_data(node, data=None, prefix="avalon:"): return node +@deprecated def get_avalon_knob_data(node, prefix="avalon:", create=True): - """[DEPRICATED] Gets a data from nodes's avalon knob + """[DEPRECATED] Gets a data from nodes's avalon knob Arguments: node (obj): Nuke node to search for data, @@ -521,8 +527,9 @@ def get_avalon_knob_data(node, prefix="avalon:", create=True): return data +@deprecated def fix_data_for_node_create(data): - """[DEPRICATED] Fixing data to be used for nuke knobs + """[DEPRECATED] Fixing data to be used for nuke knobs """ for k, v in data.items(): if isinstance(v, six.text_type): @@ -532,8 +539,9 @@ def fix_data_for_node_create(data): return data +@deprecated def add_write_node_legacy(name, **kwarg): - """[DEPRICATED] Adding nuke write node + """[DEPRECATED] Adding nuke write node Arguments: name (str): nuke node name kwarg (attrs): data for nuke knobs @@ -697,7 +705,7 @@ def get_nuke_imageio_settings(): @deprecated("openpype.hosts.nuke.api.lib.get_nuke_imageio_settings") def get_created_node_imageio_setting_legacy(nodeclass, creator, subset): - '''[DEPRICATED] Get preset data for dataflow (fileType, compression, bitDepth) + '''[DEPRECATED] Get preset data for dataflow (fileType, compression, bitDepth) ''' assert any([creator, nodeclass]), nuke.message( From 2e07aa33fa398148dd51ed103cf4da553c4f2379 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 22 Feb 2023 17:21:17 +0100 Subject: [PATCH 549/912] Nuke: baking with multiple reposition nodes also with settings and defaults --- openpype/hosts/nuke/api/plugin.py | 96 ++++++++++++------- .../defaults/project_settings/nuke.json | 35 +++++++ .../schemas/schema_nuke_publish.json | 47 +++++++++ 3 files changed, 144 insertions(+), 34 deletions(-) diff --git a/openpype/hosts/nuke/api/plugin.py b/openpype/hosts/nuke/api/plugin.py index d3f8357f7d..5521db99c0 100644 --- a/openpype/hosts/nuke/api/plugin.py +++ b/openpype/hosts/nuke/api/plugin.py @@ -558,9 +558,7 @@ class ExporterReview(object): self.path_in = self.instance.data.get("path", None) self.staging_dir = self.instance.data["stagingDir"] self.collection = self.instance.data.get("collection", None) - self.data = dict({ - "representations": list() - }) + self.data = {"representations": []} def get_file_info(self): if self.collection: @@ -626,7 +624,7 @@ class ExporterReview(object): nuke_imageio = opnlib.get_nuke_imageio_settings() # TODO: this is only securing backward compatibility lets remove - # this once all projects's anotomy are updated to newer config + # this once all projects's anatomy are updated to newer config if "baking" in nuke_imageio.keys(): return nuke_imageio["baking"]["viewerProcess"] else: @@ -823,8 +821,41 @@ class ExporterReviewMov(ExporterReview): add_tags = [] self.publish_on_farm = farm read_raw = kwargs["read_raw"] + + # TODO: remove this when `reformat_nodes_config` + # is changed in settings reformat_node_add = kwargs["reformat_node_add"] reformat_node_config = kwargs["reformat_node_config"] + + # TODO: make this required in future + reformat_nodes_config = kwargs.get("reformat_nodes_config", {}) + + # TODO: remove this once deprecated is removed + # make sure only reformat_nodes_config is used in future + if reformat_node_add and reformat_nodes_config.get("enabled"): + self.log.warning( + "`reformat_node_add` is deprecated. " + "Please use only `reformat_nodes_config` instead.") + reformat_nodes_config = None + + # TODO: reformat code when backward compatibility is not needed + # warning if reformat_nodes_config is not set + if not reformat_nodes_config: + self.log.warning( + "Please set `reformat_nodes_config` in settings.") + self.log.warning( + "Using `reformat_node_config` instead.") + reformat_nodes_config = { + "enabled": reformat_node_add, + "reposition_nodes": [ + { + "node_class": "Reformat", + "knobs": reformat_node_config + } + ] + } + + bake_viewer_process = kwargs["bake_viewer_process"] bake_viewer_input_process_node = kwargs[ "bake_viewer_input_process"] @@ -846,7 +877,6 @@ class ExporterReviewMov(ExporterReview): subset = self.instance.data["subset"] self._temp_nodes[subset] = [] - # ---------- start nodes creation # Read node r_node = nuke.createNode("Read") @@ -860,44 +890,39 @@ class ExporterReviewMov(ExporterReview): if read_raw: r_node["raw"].setValue(1) - # connect - self._temp_nodes[subset].append(r_node) - self.previous_node = r_node - self.log.debug("Read... `{}`".format(self._temp_nodes[subset])) + # connect to Read node + self._shift_to_previous_node_and_temp(subset, r_node, "Read... `{}`") # add reformat node - if reformat_node_add: + if reformat_nodes_config["enabled"]: + reposition_nodes = reformat_nodes_config["reposition_nodes"] + for reposition_node in reposition_nodes: + node_class = reposition_node["node_class"] + knobs = reposition_node["knobs"] + node = nuke.createNode(node_class) + set_node_knobs_from_settings(node, knobs) + + # connect in order + self._connect_to_above_nodes( + node, subset, "Reposition node... `{}`" + ) # append reformated tag add_tags.append("reformated") - rf_node = nuke.createNode("Reformat") - set_node_knobs_from_settings(rf_node, reformat_node_config) - - # connect - rf_node.setInput(0, self.previous_node) - self._temp_nodes[subset].append(rf_node) - self.previous_node = rf_node - self.log.debug( - "Reformat... `{}`".format(self._temp_nodes[subset])) - # only create colorspace baking if toggled on if bake_viewer_process: if bake_viewer_input_process_node: # View Process node ipn = get_view_process_node() if ipn is not None: - # connect - ipn.setInput(0, self.previous_node) - self._temp_nodes[subset].append(ipn) - self.previous_node = ipn - self.log.debug( - "ViewProcess... `{}`".format( - self._temp_nodes[subset])) + # connect to ViewProcess node + self._connect_to_above_nodes(ipn, subset, "ViewProcess... `{}`") if not self.viewer_lut_raw: # OCIODisplay dag_node = nuke.createNode("OCIODisplay") + # assign display display, viewer = get_viewer_config_from_string( str(baking_view_profile) ) @@ -907,13 +932,7 @@ class ExporterReviewMov(ExporterReview): # assign viewer dag_node["view"].setValue(viewer) - # connect - dag_node.setInput(0, self.previous_node) - self._temp_nodes[subset].append(dag_node) - self.previous_node = dag_node - self.log.debug("OCIODisplay... `{}`".format( - self._temp_nodes[subset])) - + self._connect_to_above_nodes(dag_node, subset, "OCIODisplay... `{}`") # Write node write_node = nuke.createNode("Write") self.log.debug("Path: {}".format(self.path)) @@ -967,6 +986,15 @@ class ExporterReviewMov(ExporterReview): return self.data + def _shift_to_previous_node_and_temp(self, subset, node, message): + self._temp_nodes[subset].append(node) + self.previous_node = node + self.log.debug(message.format(self._temp_nodes[subset])) + + def _connect_to_above_nodes(self, node, subset, message): + node.setInput(0, self.previous_node) + self._shift_to_previous_node_and_temp(subset, node, message) + @deprecated("openpype.hosts.nuke.api.plugin.NukeWriteCreator") class AbstractWriteRender(OpenPypeCreator): diff --git a/openpype/settings/defaults/project_settings/nuke.json b/openpype/settings/defaults/project_settings/nuke.json index d475c337d9..2545411e0a 100644 --- a/openpype/settings/defaults/project_settings/nuke.json +++ b/openpype/settings/defaults/project_settings/nuke.json @@ -446,6 +446,41 @@ "value": false } ], + "reformat_nodes_config": { + "enabled": false, + "reposition_nodes": [ + { + "node_class": "Reformat", + "knobs": [ + { + "type": "text", + "name": "type", + "value": "to format" + }, + { + "type": "text", + "name": "format", + "value": "HD_1080" + }, + { + "type": "text", + "name": "filter", + "value": "Lanczos6" + }, + { + "type": "bool", + "name": "black_outside", + "value": true + }, + { + "type": "bool", + "name": "pbb", + "value": false + } + ] + } + ] + }, "extension": "mov", "add_custom_tags": [] } diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json index 5b9145e7d9..1c542279fc 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json @@ -271,6 +271,10 @@ { "type": "separator" }, + { + "type": "label", + "label": "Currently we are supporting also multiple reposition nodes.
Older single reformat node is still supported
and if it is activated then preference will
be on it. If you want to use multiple reformat
nodes then you need to disable single reformat
node and enable multiple Reformat nodes here." + }, { "type": "boolean", "key": "reformat_node_add", @@ -287,6 +291,49 @@ } ] }, + { + "key": "reformat_nodes_config", + "type": "dict", + "label": "Reformat Nodes", + "collapsible": true, + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "label", + "label": "Reposition knobs supported only.
You can add multiple reformat nodes
and set their knobs. Order of reformat
nodes is important. First reformat node
will be applied first and last reformat
node will be applied last." + }, + { + "key": "reposition_nodes", + "type": "list", + "label": "Reposition nodes", + "object_type": { + "type": "dict", + "children": [ + { + "key": "node_class", + "label": "Node class", + "type": "text" + }, + { + "type": "schema_template", + "name": "template_nuke_knob_inputs", + "template_data": [ + { + "label": "Node knobs", + "key": "knobs" + } + ] + } + ] + } + } + ] + }, { "type": "separator" }, From fb3bda7c80c908dc052f50092e6d94a62947a3ad Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 23 Feb 2023 10:57:00 +0100 Subject: [PATCH 550/912] little fixes --- openpype/hosts/nuke/api/lib.py | 9 +++------ openpype/hosts/nuke/api/plugin.py | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index b13c592fbf..73d4986b64 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -214,7 +214,6 @@ def update_node_data(node, knobname, data): knob.setValue(knob_value) -@deprecated class Knobby(object): """[DEPRECATED] For creating knob which it's type isn't mapped in `create_knobs` @@ -249,9 +248,8 @@ class Knobby(object): return " ".join(words) -@deprecated def create_knobs(data, tab=None): - """[DEPRECATED] Create knobs by data + """Create knobs by data Depending on the type of each dict value and creates the correct Knob. @@ -344,9 +342,8 @@ def create_knobs(data, tab=None): return knobs -@deprecated def imprint(node, data, tab=None): - """[DEPRECATED] Store attributes with value on node + """Store attributes with value on node Parse user data into Node knobs. Use `collections.OrderedDict` to ensure knob order. @@ -1249,7 +1246,7 @@ def create_write_node( nodes to be created before write with dependency review (bool)[optional]: adding review knob farm (bool)[optional]: rendering workflow target - kwargs (dict)[optional]: additional key arguments for formating + kwargs (dict)[optional]: additional key arguments for formatting Example: prenodes = { diff --git a/openpype/hosts/nuke/api/plugin.py b/openpype/hosts/nuke/api/plugin.py index 5521db99c0..160ca820a4 100644 --- a/openpype/hosts/nuke/api/plugin.py +++ b/openpype/hosts/nuke/api/plugin.py @@ -842,9 +842,9 @@ class ExporterReviewMov(ExporterReview): # warning if reformat_nodes_config is not set if not reformat_nodes_config: self.log.warning( - "Please set `reformat_nodes_config` in settings.") - self.log.warning( - "Using `reformat_node_config` instead.") + "Please set `reformat_nodes_config` in settings. " + "Using `reformat_node_config` instead." + ) reformat_nodes_config = { "enabled": reformat_node_add, "reposition_nodes": [ From b4541d29fe823416c27b9a07424d431a738d3e8a Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 21 Feb 2023 11:47:32 +0100 Subject: [PATCH 551/912] nuke assist kickoff --- .../system_settings/applications.json | 128 ++++++++++++++++++ .../system_schema/schema_applications.json | 8 ++ 2 files changed, 136 insertions(+) diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json index f84d99e36b..5fd9b926fb 100644 --- a/openpype/settings/defaults/system_settings/applications.json +++ b/openpype/settings/defaults/system_settings/applications.json @@ -337,6 +337,134 @@ } } }, + "nukeassist": { + "enabled": true, + "label": "Nuke Assist", + "icon": "{}/app_icons/nuke.png", + "host_name": "nuke", + "environment": { + "NUKE_PATH": [ + "{NUKE_PATH}", + "{OPENPYPE_STUDIO_PLUGINS}/nuke" + ] + }, + "variants": { + "13-2": { + "use_python_2": false, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke13.2v1/Nuke13.2" + ] + }, + "arguments": { + "windows": ["--nukeassist"], + "darwin": ["--nukeassist"], + "linux": ["--nukeassist"] + }, + "environment": {} + }, + "13-0": { + "use_python_2": false, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke13.0v1/Nuke13.0" + ] + }, + "arguments": { + "windows": ["--nukeassist"], + "darwin": ["--nukeassist"], + "linux": ["--nukeassist"] + }, + "environment": {} + }, + "12-2": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke12.2v3Nuke12.2" + ] + }, + "arguments": { + "windows": ["--nukeassist"], + "darwin": ["--nukeassist"], + "linux": ["--nukeassist"] + }, + "environment": {} + }, + "12-0": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke12.0v1/Nuke12.0" + ] + }, + "arguments": { + "windows": ["--nukeassist"], + "darwin": ["--nukeassist"], + "linux": ["--nukeassist"] + }, + "environment": {} + }, + "11-3": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke11.3v5/Nuke11.3" + ] + }, + "arguments": { + "windows": ["--nukeassist"], + "darwin": ["--nukeassist"], + "linux": ["--nukeassist"] + }, + "environment": {} + }, + "11-2": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke11.2v2\\Nuke11.2.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": ["--nukeassist"], + "darwin": ["--nukeassist"], + "linux": ["--nukeassist"] + }, + "environment": {} + }, + "__dynamic_keys_labels__": { + "13-2": "13.2", + "13-0": "13.0", + "12-2": "12.2", + "12-0": "12.0", + "11-3": "11.3", + "11-2": "11.2" + } + } + }, "nukex": { "enabled": true, "label": "Nuke X", diff --git a/openpype/settings/entities/schemas/system_schema/schema_applications.json b/openpype/settings/entities/schemas/system_schema/schema_applications.json index 36c5811496..b17687cf71 100644 --- a/openpype/settings/entities/schemas/system_schema/schema_applications.json +++ b/openpype/settings/entities/schemas/system_schema/schema_applications.json @@ -25,6 +25,14 @@ "nuke_label": "Nuke" } }, + { + "type": "schema_template", + "name": "template_nuke", + "template_data": { + "nuke_type": "nukeassist", + "nuke_label": "Nuke Assist" + } + }, { "type": "schema_template", "name": "template_nuke", From e57c9e8dd6dc9b08d914f43805b3583e5c3bbe1c Mon Sep 17 00:00:00 2001 From: ynput Date: Tue, 21 Feb 2023 14:23:26 +0200 Subject: [PATCH 552/912] adding appgroup to prelaunch hook --- openpype/hooks/pre_foundry_apps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hooks/pre_foundry_apps.py b/openpype/hooks/pre_foundry_apps.py index 85f68c6b60..2092d5025d 100644 --- a/openpype/hooks/pre_foundry_apps.py +++ b/openpype/hooks/pre_foundry_apps.py @@ -13,7 +13,7 @@ class LaunchFoundryAppsWindows(PreLaunchHook): # Should be as last hook because must change launch arguments to string order = 1000 - app_groups = ["nuke", "nukex", "hiero", "nukestudio"] + app_groups = ["nuke", "nukeassist", "nukex", "hiero", "nukestudio"] platforms = ["windows"] def execute(self): From fc6e5ca854fad80a6687befba10422a187724bfd Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 21 Feb 2023 13:39:02 +0100 Subject: [PATCH 553/912] adding nukeassist hook --- openpype/hosts/nuke/hooks/__init__.py | 0 openpype/hosts/nuke/hooks/pre_nukeassist_setup.py | 10 ++++++++++ 2 files changed, 10 insertions(+) create mode 100644 openpype/hosts/nuke/hooks/__init__.py create mode 100644 openpype/hosts/nuke/hooks/pre_nukeassist_setup.py diff --git a/openpype/hosts/nuke/hooks/__init__.py b/openpype/hosts/nuke/hooks/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py new file mode 100644 index 0000000000..80696c34e5 --- /dev/null +++ b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py @@ -0,0 +1,10 @@ +from openpype.lib import PreLaunchHook + +class PrelaunchNukeAssistHook(PreLaunchHook): + """ + Adding flag when nukeassist + """ + app_groups = ["nukeassist"] + + def execute(self): + self.launch_context.env["NUKEASSIST"] = True From a1c9e396640e9d6691af68e21ac1fa3ff78e9bf3 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 21 Feb 2023 13:56:17 +0100 Subject: [PATCH 554/912] adding hook to host --- openpype/hosts/nuke/addon.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/openpype/hosts/nuke/addon.py b/openpype/hosts/nuke/addon.py index 9d25afe2b6..6a4b91a76d 100644 --- a/openpype/hosts/nuke/addon.py +++ b/openpype/hosts/nuke/addon.py @@ -63,5 +63,12 @@ class NukeAddon(OpenPypeModule, IHostAddon): path_paths.append(quick_time_path) env["PATH"] = os.pathsep.join(path_paths) + def get_launch_hook_paths(self, app): + if app.host_name != self.host_name: + return [] + return [ + os.path.join(NUKE_ROOT_DIR, "hooks") + ] + def get_workfile_extensions(self): return [".nk"] From 71745e185cae75de715a0962fcf34262d4d7df9d Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 21 Feb 2023 14:54:51 +0100 Subject: [PATCH 555/912] adding menu assist variant conditions --- openpype/hosts/nuke/api/pipeline.py | 50 +++++++++++-------- openpype/hosts/nuke/hooks/__init__.py | 0 .../hosts/nuke/hooks/pre_nukeassist_setup.py | 2 +- 3 files changed, 30 insertions(+), 22 deletions(-) delete mode 100644 openpype/hosts/nuke/hooks/__init__.py diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index d5289010cb..306fa50de9 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -71,7 +71,7 @@ CREATE_PATH = os.path.join(PLUGINS_DIR, "create") INVENTORY_PATH = os.path.join(PLUGINS_DIR, "inventory") MENU_LABEL = os.environ["AVALON_LABEL"] - +ASSIST = bool(os.getenv("NUKEASSIST")) # registering pyblish gui regarding settings in presets if os.getenv("PYBLISH_GUI", None): @@ -207,6 +207,7 @@ def _show_workfiles(): def _install_menu(): + # uninstall original avalon menu main_window = get_main_window() menubar = nuke.menu("Nuke") @@ -217,7 +218,9 @@ def _install_menu(): ) Context.context_label = label context_action = menu.addCommand(label) - context_action.setEnabled(False) + + if not ASSIST: + context_action.setEnabled(False) menu.addSeparator() menu.addCommand( @@ -226,18 +229,20 @@ def _install_menu(): ) menu.addSeparator() - menu.addCommand( - "Create...", - lambda: host_tools.show_publisher( - tab="create" + if not ASSIST: + menu.addCommand( + "Create...", + lambda: host_tools.show_publisher( + tab="create" + ) ) - ) - menu.addCommand( - "Publish...", - lambda: host_tools.show_publisher( - tab="publish" + menu.addCommand( + "Publish...", + lambda: host_tools.show_publisher( + tab="publish" + ) ) - ) + menu.addCommand( "Load...", lambda: host_tools.show_loader( @@ -285,15 +290,18 @@ def _install_menu(): "Build Workfile from template", lambda: build_workfile_template() ) - menu_template.addSeparator() - menu_template.addCommand( - "Create Place Holder", - lambda: create_placeholder() - ) - menu_template.addCommand( - "Update Place Holder", - lambda: update_placeholder() - ) + + if not ASSIST: + menu_template.addSeparator() + menu_template.addCommand( + "Create Place Holder", + lambda: create_placeholder() + ) + menu_template.addCommand( + "Update Place Holder", + lambda: update_placeholder() + ) + menu.addSeparator() menu.addCommand( "Experimental tools...", diff --git a/openpype/hosts/nuke/hooks/__init__.py b/openpype/hosts/nuke/hooks/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py index 80696c34e5..054bd677a7 100644 --- a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py +++ b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py @@ -7,4 +7,4 @@ class PrelaunchNukeAssistHook(PreLaunchHook): app_groups = ["nukeassist"] def execute(self): - self.launch_context.env["NUKEASSIST"] = True + self.launch_context.env["NUKEASSIST"] = "1" From f3431c62792cea3a65c95366d105bd782fe46376 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 21 Feb 2023 15:26:07 +0100 Subject: [PATCH 556/912] moving Assist switch to api level condition for updating nodes --- openpype/hosts/nuke/api/__init__.py | 7 ++++++- openpype/hosts/nuke/api/lib.py | 21 ++++++++++++--------- openpype/hosts/nuke/api/pipeline.py | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/openpype/hosts/nuke/api/__init__.py b/openpype/hosts/nuke/api/__init__.py index 1af5ff365d..7766a94140 100644 --- a/openpype/hosts/nuke/api/__init__.py +++ b/openpype/hosts/nuke/api/__init__.py @@ -1,3 +1,4 @@ +import os from .workio import ( file_extensions, has_unsaved_changes, @@ -50,6 +51,8 @@ from .utils import ( get_colorspace_list ) +ASSIST = bool(os.getenv("NUKEASSIST")) + __all__ = ( "file_extensions", "has_unsaved_changes", @@ -92,5 +95,7 @@ __all__ = ( "create_write_node", "colorspace_exists_on_node", - "get_colorspace_list" + "get_colorspace_list", + + "ASSIST" ) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index 73d4986b64..ec5bc58f9f 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -49,7 +49,7 @@ from openpype.pipeline.colorspace import ( ) from openpype.pipeline.workfile import BuildWorkfile -from . import gizmo_menu +from . import gizmo_menu, ASSIST from .workio import ( save_file, @@ -2263,14 +2263,17 @@ class WorkfileSettings(object): node['frame_range'].setValue(range) node['frame_range_lock'].setValue(True) - set_node_data( - self._root_node, - INSTANCE_DATA_KNOB, - { - "handleStart": int(handle_start), - "handleEnd": int(handle_end) - } - ) + if not ASSIST: + set_node_data( + self._root_node, + INSTANCE_DATA_KNOB, + { + "handleStart": int(handle_start), + "handleEnd": int(handle_end) + } + ) + else: + log.warning("NukeAssist mode is not allowing updating custom knobs...") def reset_resolution(self): """Set resolution to project resolution.""" diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index 306fa50de9..94c4518664 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -60,6 +60,7 @@ from .workio import ( work_root, current_file ) +from . import ASSIST log = Logger.get_logger(__name__) @@ -71,7 +72,6 @@ CREATE_PATH = os.path.join(PLUGINS_DIR, "create") INVENTORY_PATH = os.path.join(PLUGINS_DIR, "inventory") MENU_LABEL = os.environ["AVALON_LABEL"] -ASSIST = bool(os.getenv("NUKEASSIST")) # registering pyblish gui regarding settings in presets if os.getenv("PYBLISH_GUI", None): From fe163ab19b43bbde9c9ee297cf02ca2d42d998b5 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 21 Feb 2023 16:06:39 +0100 Subject: [PATCH 557/912] moving ASSIST switch to utils --- openpype/hosts/nuke/api/__init__.py | 7 +------ openpype/hosts/nuke/api/lib.py | 3 ++- openpype/hosts/nuke/api/pipeline.py | 2 +- openpype/hosts/nuke/api/utils.py | 1 + 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/nuke/api/__init__.py b/openpype/hosts/nuke/api/__init__.py index 7766a94140..1af5ff365d 100644 --- a/openpype/hosts/nuke/api/__init__.py +++ b/openpype/hosts/nuke/api/__init__.py @@ -1,4 +1,3 @@ -import os from .workio import ( file_extensions, has_unsaved_changes, @@ -51,8 +50,6 @@ from .utils import ( get_colorspace_list ) -ASSIST = bool(os.getenv("NUKEASSIST")) - __all__ = ( "file_extensions", "has_unsaved_changes", @@ -95,7 +92,5 @@ __all__ = ( "create_write_node", "colorspace_exists_on_node", - "get_colorspace_list", - - "ASSIST" + "get_colorspace_list" ) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index ec5bc58f9f..dfc647872b 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -49,7 +49,8 @@ from openpype.pipeline.colorspace import ( ) from openpype.pipeline.workfile import BuildWorkfile -from . import gizmo_menu, ASSIST +from . import gizmo_menu +from .utils import ASSIST from .workio import ( save_file, diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index 94c4518664..55cb77bafe 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -60,7 +60,7 @@ from .workio import ( work_root, current_file ) -from . import ASSIST +from .utils import ASSIST log = Logger.get_logger(__name__) diff --git a/openpype/hosts/nuke/api/utils.py b/openpype/hosts/nuke/api/utils.py index 6bcb752dd1..261eba8401 100644 --- a/openpype/hosts/nuke/api/utils.py +++ b/openpype/hosts/nuke/api/utils.py @@ -4,6 +4,7 @@ import nuke from openpype import resources from .lib import maintained_selection +ASSIST = bool(os.getenv("NUKEASSIST")) def set_context_favorites(favorites=None): """ Adding favorite folders to nuke's browser From 360a5b3b68de7e3f735078173c897e21196adec4 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 21 Feb 2023 16:38:54 +0100 Subject: [PATCH 558/912] move ASSIST to constant --- openpype/hosts/nuke/api/constants.py | 4 ++++ openpype/hosts/nuke/api/lib.py | 2 +- openpype/hosts/nuke/api/pipeline.py | 2 +- openpype/hosts/nuke/api/utils.py | 1 - 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 openpype/hosts/nuke/api/constants.py diff --git a/openpype/hosts/nuke/api/constants.py b/openpype/hosts/nuke/api/constants.py new file mode 100644 index 0000000000..110199720f --- /dev/null +++ b/openpype/hosts/nuke/api/constants.py @@ -0,0 +1,4 @@ +import os + + +ASSIST = bool(os.getenv("NUKEASSIST")) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index dfc647872b..9e36fb147b 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -50,7 +50,7 @@ from openpype.pipeline.colorspace import ( from openpype.pipeline.workfile import BuildWorkfile from . import gizmo_menu -from .utils import ASSIST +from .constants import ASSIST from .workio import ( save_file, diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index 55cb77bafe..f07d150ba5 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -60,7 +60,7 @@ from .workio import ( work_root, current_file ) -from .utils import ASSIST +from .constants import ASSIST log = Logger.get_logger(__name__) diff --git a/openpype/hosts/nuke/api/utils.py b/openpype/hosts/nuke/api/utils.py index 261eba8401..6bcb752dd1 100644 --- a/openpype/hosts/nuke/api/utils.py +++ b/openpype/hosts/nuke/api/utils.py @@ -4,7 +4,6 @@ import nuke from openpype import resources from .lib import maintained_selection -ASSIST = bool(os.getenv("NUKEASSIST")) def set_context_favorites(favorites=None): """ Adding favorite folders to nuke's browser From 132b616f1f9b4c802f7c985b5eb73948d3ae22a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Je=C5=BEek?= Date: Wed, 22 Feb 2023 14:41:36 +0100 Subject: [PATCH 559/912] Update openpype/hosts/nuke/hooks/pre_nukeassist_setup.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- openpype/hosts/nuke/hooks/pre_nukeassist_setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py index 054bd677a7..3a0f00413a 100644 --- a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py +++ b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py @@ -8,3 +8,4 @@ class PrelaunchNukeAssistHook(PreLaunchHook): def execute(self): self.launch_context.env["NUKEASSIST"] = "1" + From b3b488c2a6235d71d1e15eb2d058d22c439f5303 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 22 Feb 2023 14:44:22 +0100 Subject: [PATCH 560/912] removing line --- openpype/hosts/nuke/hooks/pre_nukeassist_setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py index 3a0f00413a..054bd677a7 100644 --- a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py +++ b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py @@ -8,4 +8,3 @@ class PrelaunchNukeAssistHook(PreLaunchHook): def execute(self): self.launch_context.env["NUKEASSIST"] = "1" - From 363551af73a5703a08af4a5881448e9bc61885d3 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 22 Feb 2023 14:52:57 +0100 Subject: [PATCH 561/912] context label is not needed in nukeassist --- openpype/hosts/nuke/api/pipeline.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index f07d150ba5..4c0f169ade 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -207,22 +207,25 @@ def _show_workfiles(): def _install_menu(): + """Install Avalon menu into Nuke's main menu bar.""" # uninstall original avalon menu main_window = get_main_window() menubar = nuke.menu("Nuke") menu = menubar.addMenu(MENU_LABEL) - label = "{0}, {1}".format( - os.environ["AVALON_ASSET"], os.environ["AVALON_TASK"] - ) - Context.context_label = label - context_action = menu.addCommand(label) if not ASSIST: + label = "{0}, {1}".format( + os.environ["AVALON_ASSET"], os.environ["AVALON_TASK"] + ) + Context.context_label = label + context_action = menu.addCommand(label) context_action.setEnabled(False) - menu.addSeparator() + # add separator after context label + menu.addSeparator() + menu.addCommand( "Work Files...", _show_workfiles From cb87097f74af6d6c616486867e89a9c0afada6c0 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 22 Feb 2023 14:56:27 +0100 Subject: [PATCH 562/912] adding empty lines --- openpype/hosts/nuke/api/pipeline.py | 1 - openpype/hosts/nuke/hooks/pre_nukeassist_setup.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index 4c0f169ade..2496d66c1d 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -214,7 +214,6 @@ def _install_menu(): menubar = nuke.menu("Nuke") menu = menubar.addMenu(MENU_LABEL) - if not ASSIST: label = "{0}, {1}".format( os.environ["AVALON_ASSET"], os.environ["AVALON_TASK"] diff --git a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py index 054bd677a7..3948a665c6 100644 --- a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py +++ b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py @@ -1,5 +1,6 @@ from openpype.lib import PreLaunchHook + class PrelaunchNukeAssistHook(PreLaunchHook): """ Adding flag when nukeassist From 3218dd021ad1f471215fd9e7b1f2ce1972e42d74 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 22 Feb 2023 14:59:30 +0100 Subject: [PATCH 563/912] hound comments --- openpype/hosts/nuke/api/lib.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index 9e36fb147b..c08db978d3 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -2274,7 +2274,10 @@ class WorkfileSettings(object): } ) else: - log.warning("NukeAssist mode is not allowing updating custom knobs...") + log.warning( + "NukeAssist mode is not allowing " + "updating custom knobs..." + ) def reset_resolution(self): """Set resolution to project resolution.""" From 7ec1cb77a46675a2e986a78f6081594d67f996a5 Mon Sep 17 00:00:00 2001 From: Kayla Man <64118225+moonyuet@users.noreply.github.com> Date: Thu, 23 Feb 2023 23:00:16 +0800 Subject: [PATCH 564/912] maya gltf texture convertor and validator (#4261) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com> --- .../maya/plugins/publish/extract_gltf.py | 3 + .../plugins/publish/validate_glsl_material.py | 207 ++++++++++++++++++ .../plugins/publish/validate_glsl_plugin.py | 31 +++ .../defaults/project_settings/maya.json | 15 ++ .../schemas/schema_maya_publish.json | 32 +++ 5 files changed, 288 insertions(+) create mode 100644 openpype/hosts/maya/plugins/publish/validate_glsl_material.py create mode 100644 openpype/hosts/maya/plugins/publish/validate_glsl_plugin.py diff --git a/openpype/hosts/maya/plugins/publish/extract_gltf.py b/openpype/hosts/maya/plugins/publish/extract_gltf.py index f5ceed5f33..ac258ffb3d 100644 --- a/openpype/hosts/maya/plugins/publish/extract_gltf.py +++ b/openpype/hosts/maya/plugins/publish/extract_gltf.py @@ -22,6 +22,8 @@ class ExtractGLB(publish.Extractor): self.log.info("Extracting GLB to: {}".format(path)) + cmds.loadPlugin("maya2glTF", quiet=True) + nodes = instance[:] self.log.info("Instance: {0}".format(nodes)) @@ -45,6 +47,7 @@ class ExtractGLB(publish.Extractor): "glb": True, "vno": True # visibleNodeOnly } + with lib.maintained_selection(): cmds.select(nodes, hi=True, noExpand=True) extract_gltf(staging_dir, diff --git a/openpype/hosts/maya/plugins/publish/validate_glsl_material.py b/openpype/hosts/maya/plugins/publish/validate_glsl_material.py new file mode 100644 index 0000000000..10c48da404 --- /dev/null +++ b/openpype/hosts/maya/plugins/publish/validate_glsl_material.py @@ -0,0 +1,207 @@ +import os +from maya import cmds + +import pyblish.api +from openpype.pipeline.publish import ( + RepairAction, + ValidateContentsOrder +) +from openpype.pipeline import PublishValidationError + + +class ValidateGLSLMaterial(pyblish.api.InstancePlugin): + """ + Validate if the asset uses GLSL Shader + """ + + order = ValidateContentsOrder + 0.1 + families = ['gltf'] + hosts = ['maya'] + label = 'GLSL Shader for GLTF' + actions = [RepairAction] + optional = True + active = True + + def process(self, instance): + shading_grp = self.get_material_from_shapes(instance) + if not shading_grp: + raise PublishValidationError("No shading group found") + invalid = self.get_texture_shader_invalid(instance) + if invalid: + raise PublishValidationError("Non GLSL Shader found: " + "{0}".format(invalid)) + + def get_material_from_shapes(self, instance): + shapes = cmds.ls(instance, type="mesh", long=True) + for shape in shapes: + shading_grp = cmds.listConnections(shape, + destination=True, + type="shadingEngine") + + return shading_grp or [] + + def get_texture_shader_invalid(self, instance): + + invalid = set() + shading_grp = self.get_material_from_shapes(instance) + for shading_group in shading_grp: + material_name = "{}.surfaceShader".format(shading_group) + material = cmds.listConnections(material_name, + source=True, + destination=False, + type="GLSLShader") + + if not material: + # add material name + material = cmds.listConnections(material_name)[0] + invalid.add(material) + + return list(invalid) + + @classmethod + def repair(cls, instance): + """ + Repair instance by assigning GLSL Shader + to the material + """ + cls.assign_glsl_shader(instance) + return + + @classmethod + def assign_glsl_shader(cls, instance): + """ + Converting StingrayPBS material to GLSL Shaders + for the glb export through Maya2GLTF plugin + """ + + meshes = cmds.ls(instance, type="mesh", long=True) + cls.log.info("meshes: {}".format(meshes)) + # load the glsl shader plugin + cmds.loadPlugin("glslShader", quiet=True) + + for mesh in meshes: + # create glsl shader + glsl = cmds.createNode('GLSLShader') + glsl_shading_grp = cmds.sets(name=glsl + "SG", empty=True, + renderable=True, noSurfaceShader=True) + cmds.connectAttr(glsl + ".outColor", + glsl_shading_grp + ".surfaceShader") + + # load the maya2gltf shader + ogsfx_path = instance.context.data["project_settings"]["maya"]["publish"]["ExtractGLB"]["ogsfx_path"] # noqa + if not os.path.exists(ogsfx_path): + if ogsfx_path: + # if custom ogsfx path is not specified + # the log below is the warning for the user + cls.log.warning("ogsfx shader file " + "not found in {}".format(ogsfx_path)) + + cls.log.info("Find the ogsfx shader file in " + "default maya directory...") + # re-direct to search the ogsfx path in maya_dir + ogsfx_path = os.getenv("MAYA_APP_DIR") + ogsfx_path + if not os.path.exists(ogsfx_path): + raise PublishValidationError("The ogsfx shader file does not " # noqa + "exist: {}".format(ogsfx_path)) # noqa + + cmds.setAttr(glsl + ".shader", ogsfx_path, typ="string") + # list the materials used for the assets + shading_grp = cmds.listConnections(mesh, + destination=True, + type="shadingEngine") + + # get the materials related to the selected assets + for material in shading_grp: + pbs_shader = cmds.listConnections(material, + destination=True, + type="StingrayPBS") + if pbs_shader: + cls.pbs_shader_conversion(pbs_shader, glsl) + # setting up to relink the texture if + # the mesh is with aiStandardSurface + arnold_shader = cmds.listConnections(material, + destination=True, + type="aiStandardSurface") + if arnold_shader: + cls.arnold_shader_conversion(arnold_shader, glsl) + + cmds.sets(mesh, forceElement=str(glsl_shading_grp)) + + @classmethod + def pbs_shader_conversion(cls, main_shader, glsl): + + cls.log.info("StringrayPBS detected " + "-> Can do texture conversion") + + for shader in main_shader: + # get the file textures related to the PBS Shader + albedo = cmds.listConnections(shader + + ".TEX_color_map") + if albedo: + dif_output = albedo[0] + ".outColor" + # get the glsl_shader input + # reconnect the file nodes to maya2gltf shader + glsl_dif = glsl + ".u_BaseColorTexture" + cmds.connectAttr(dif_output, glsl_dif) + + # connect orm map if there is one + orm_packed = cmds.listConnections(shader + + ".TEX_ao_map") + if orm_packed: + orm_output = orm_packed[0] + ".outColor" + + mtl = glsl + ".u_MetallicTexture" + ao = glsl + ".u_OcclusionTexture" + rough = glsl + ".u_RoughnessTexture" + + cmds.connectAttr(orm_output, mtl) + cmds.connectAttr(orm_output, ao) + cmds.connectAttr(orm_output, rough) + + # connect nrm map if there is one + nrm = cmds.listConnections(shader + + ".TEX_normal_map") + if nrm: + nrm_output = nrm[0] + ".outColor" + glsl_nrm = glsl + ".u_NormalTexture" + cmds.connectAttr(nrm_output, glsl_nrm) + + @classmethod + def arnold_shader_conversion(cls, main_shader, glsl): + cls.log.info("aiStandardSurface detected " + "-> Can do texture conversion") + + for shader in main_shader: + # get the file textures related to the PBS Shader + albedo = cmds.listConnections(shader + ".baseColor") + if albedo: + dif_output = albedo[0] + ".outColor" + # get the glsl_shader input + # reconnect the file nodes to maya2gltf shader + glsl_dif = glsl + ".u_BaseColorTexture" + cmds.connectAttr(dif_output, glsl_dif) + + orm_packed = cmds.listConnections(shader + + ".specularRoughness") + if orm_packed: + orm_output = orm_packed[0] + ".outColor" + + mtl = glsl + ".u_MetallicTexture" + ao = glsl + ".u_OcclusionTexture" + rough = glsl + ".u_RoughnessTexture" + + cmds.connectAttr(orm_output, mtl) + cmds.connectAttr(orm_output, ao) + cmds.connectAttr(orm_output, rough) + + # connect nrm map if there is one + bump_node = cmds.listConnections(shader + + ".normalCamera") + if bump_node: + for bump in bump_node: + nrm = cmds.listConnections(bump + + ".bumpValue") + if nrm: + nrm_output = nrm[0] + ".outColor" + glsl_nrm = glsl + ".u_NormalTexture" + cmds.connectAttr(nrm_output, glsl_nrm) diff --git a/openpype/hosts/maya/plugins/publish/validate_glsl_plugin.py b/openpype/hosts/maya/plugins/publish/validate_glsl_plugin.py new file mode 100644 index 0000000000..53c2cf548a --- /dev/null +++ b/openpype/hosts/maya/plugins/publish/validate_glsl_plugin.py @@ -0,0 +1,31 @@ + +from maya import cmds + +import pyblish.api +from openpype.pipeline.publish import ( + RepairAction, + ValidateContentsOrder +) + + +class ValidateGLSLPlugin(pyblish.api.InstancePlugin): + """ + Validate if the asset uses GLSL Shader + """ + + order = ValidateContentsOrder + 0.15 + families = ['gltf'] + hosts = ['maya'] + label = 'maya2glTF plugin' + actions = [RepairAction] + + def process(self, instance): + if not cmds.pluginInfo("maya2glTF", query=True, loaded=True): + raise RuntimeError("maya2glTF is not loaded") + + @classmethod + def repair(cls, instance): + """ + Repair instance by enabling the plugin + """ + return cmds.loadPlugin("maya2glTF", quiet=True) diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index b590a56da6..32b141566b 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -407,6 +407,16 @@ "optional": false, "active": true }, + "ValidateGLSLMaterial": { + "enabled": true, + "optional": false, + "active": true + }, + "ValidateGLSLPlugin": { + "enabled": true, + "optional": false, + "active": true + }, "ValidateRenderImageRule": { "enabled": true, "optional": false, @@ -898,6 +908,11 @@ "optional": true, "active": true, "bake_attributes": [] + }, + "ExtractGLB": { + "enabled": true, + "active": true, + "ogsfx_path": "/maya2glTF/PBR/shaders/glTF_PBR.ogsfx" } }, "load": { diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json index 873bb79c95..994e2d0032 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json @@ -408,6 +408,14 @@ "key": "ValidateCurrentRenderLayerIsRenderable", "label": "Validate Current Render Layer Has Renderable Camera" }, + { + "key": "ValidateGLSLMaterial", + "label": "Validate GLSL Material" + }, + { + "key": "ValidateGLSLPlugin", + "label": "Validate GLSL Plugin" + }, { "key": "ValidateRenderImageRule", "label": "Validate Images File Rule (Workspace)" @@ -956,6 +964,30 @@ "is_list": true } ] + }, + { + "type": "dict", + "collapsible": true, + "key": "ExtractGLB", + "label": "Extract GLB", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "active", + "label": "Active" + }, + { + "type": "text", + "key": "ogsfx_path", + "label": "GLSL Shader Directory" + } + ] } ] } From 64a142ef6482b61eb0967806882ccb6c70ecd91c Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 6 Jan 2023 14:03:22 +0100 Subject: [PATCH 565/912] OP-4643 - fix for full file paths --- openpype/plugins/publish/extract_color_transcode.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index b0921688e9..99c8c87e51 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -1,7 +1,6 @@ import os import copy import clique - import pyblish.api from openpype.pipeline import publish From fad36c75a9e485b765a83a24a459540a9d9e7aed Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 23 Feb 2023 16:11:33 +0100 Subject: [PATCH 566/912] nuke: rendersettins lib with farm rendering class --- openpype/hosts/nuke/api/lib_rendersettings.py | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 openpype/hosts/nuke/api/lib_rendersettings.py diff --git a/openpype/hosts/nuke/api/lib_rendersettings.py b/openpype/hosts/nuke/api/lib_rendersettings.py new file mode 100644 index 0000000000..959b461c29 --- /dev/null +++ b/openpype/hosts/nuke/api/lib_rendersettings.py @@ -0,0 +1,86 @@ + +from openpype.lib import Logger +from openpype.settings import ( + get_current_project_settings, + get_system_settings +) + + +class RenderFarmSettings: + """ Class for getting farm settings from project settings + """ + log = Logger.get_logger("RenderFarmSettings") + + _active_farm_module: str = None + _farm_modules: list = [ + "deadline", "muster", "royalrender"] + _farm_plugins: dict = { + "deadline": "NukeSubmitDeadline" + } + _creator_farm_keys: list = [ + "chunk_size", "priority", "concurrent_tasks"] + + def __init__(self, project_settings=None): + """ Get project settings and active farm module + """ + self._project_settings = ( + project_settings or get_current_project_settings() + ) + # Get active farm module from system settings + self._get_active_farm_module_from_system_settings() + + def _get_active_farm_module_from_system_settings(self): + """ Get active farm module from system settings + """ + active_modules = [ + module_ + for module_ in self._farm_modules + if get_system_settings()["modules"][module_]["enabled"] + ] + if not active_modules: + raise ValueError(( + "No active farm module found in system settings." + )) + if len(active_modules) > 1: + raise ValueError(( + "Multiple active farm modules " + "found in system settings. {}".format(active_modules) + )) + + self._active_farm_module = active_modules.pop() + + @property + def active_farm_module(self): + return self._active_farm_module + + def get_rendering_attributes(self): + ''' Get rendering attributes from project settings + + Returns: + dict: rendering attributes + ''' + return_dict = {} + farm_plugin = self._farm_plugins.get(self.active_farm_module) + + if farm_plugin: + raise ValueError(( + "Farm plugin \"{}\" not found in farm plugins." + ).format(farm_plugin)) + + # Get farm module settings + module_settings = self._project_settings[self.active_farm_module] + + # Get farm plugin settings + farm_plugin_settings = ( + module_settings["publish"][farm_plugin]) + + # Get all keys from farm_plugin_settings + for key in self._creator_farm_keys: + if key not in farm_plugin_settings: + self.log.warning(( + "Key \"{}\" not found in farm plugin \"{}\" settings." + ).format(key, farm_plugin)) + continue + return_dict[key] = farm_plugin_settings[key] + + return return_dict From 073f0be7f706fd6ae222c3900cb1c02c523d1c04 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 23 Feb 2023 16:12:49 +0100 Subject: [PATCH 567/912] nuke: creators with new RenderFarmSettings class --- openpype/hosts/nuke/api/plugin.py | 2 +- .../nuke/plugins/create/create_write_prerender.py | 13 ++++++++----- .../nuke/plugins/create/create_write_render.py | 13 ++++++++----- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/openpype/hosts/nuke/api/plugin.py b/openpype/hosts/nuke/api/plugin.py index d3f8357f7d..ef77e029ad 100644 --- a/openpype/hosts/nuke/api/plugin.py +++ b/openpype/hosts/nuke/api/plugin.py @@ -1236,7 +1236,7 @@ def convert_to_valid_instaces(): creator_attr["farm_chunk"] = ( node["deadlineChunkSize"].value()) if "deadlineConcurrentTasks" in node.knobs(): - creator_attr["farm_concurency"] = ( + creator_attr["farm_concurrency"] = ( node["deadlineConcurrentTasks"].value()) _remove_old_knobs(node) diff --git a/openpype/hosts/nuke/plugins/create/create_write_prerender.py b/openpype/hosts/nuke/plugins/create/create_write_prerender.py index a15f362dd1..a99bd0c4ab 100644 --- a/openpype/hosts/nuke/plugins/create/create_write_prerender.py +++ b/openpype/hosts/nuke/plugins/create/create_write_prerender.py @@ -12,6 +12,7 @@ from openpype.lib import ( UILabelDef ) from openpype.hosts.nuke import api as napi +from openpype.hosts.nuke.api.lib_rendersettings import RenderFarmSettings class CreateWritePrerender(napi.NukeWriteCreator): @@ -50,6 +51,8 @@ class CreateWritePrerender(napi.NukeWriteCreator): self._get_reviewable_bool() ] if "farm_rendering" in self.instance_attributes: + render_farm_settings = RenderFarmSettings().get_rendering_attributes() + attr_defs.extend([ UISeparatorDef(), UILabelDef("Farm rendering attributes"), @@ -59,21 +62,21 @@ class CreateWritePrerender(napi.NukeWriteCreator): label="Priority", minimum=1, maximum=99, - default=50 + default=render_farm_settings.get("priority", 50) ), NumberDef( "farm_chunk", label="Chunk size", minimum=1, maximum=99, - default=10 + default=render_farm_settings.get("chunk_size", 10) ), NumberDef( - "farm_concurency", - label="Concurent tasks", + "farm_concurrency", + label="Concurrent tasks", minimum=1, maximum=10, - default=1 + default=render_farm_settings.get("concurrent_tasks", 1) ) ]) return attr_defs diff --git a/openpype/hosts/nuke/plugins/create/create_write_render.py b/openpype/hosts/nuke/plugins/create/create_write_render.py index 481d1d2201..bbaba212c2 100644 --- a/openpype/hosts/nuke/plugins/create/create_write_render.py +++ b/openpype/hosts/nuke/plugins/create/create_write_render.py @@ -12,6 +12,7 @@ from openpype.lib import ( UILabelDef ) from openpype.hosts.nuke import api as napi +from openpype.hosts.nuke.api.lib_rendersettings import RenderFarmSettings class CreateWriteRender(napi.NukeWriteCreator): @@ -47,6 +48,8 @@ class CreateWriteRender(napi.NukeWriteCreator): self._get_reviewable_bool() ] if "farm_rendering" in self.instance_attributes: + render_farm_settings = RenderFarmSettings().get_rendering_attributes() + attr_defs.extend([ UISeparatorDef(), UILabelDef("Farm rendering attributes"), @@ -56,21 +59,21 @@ class CreateWriteRender(napi.NukeWriteCreator): label="Priority", minimum=1, maximum=99, - default=50 + default=render_farm_settings.get("priority", 50) ), NumberDef( "farm_chunk", label="Chunk size", minimum=1, maximum=99, - default=10 + default=render_farm_settings.get("chunk_size", 10) ), NumberDef( - "farm_concurency", - label="Concurent tasks", + "farm_concurrency", + label="Concurrent tasks", minimum=1, maximum=10, - default=1 + default=render_farm_settings.get("concurrent_tasks", 1) ) ]) return attr_defs From 5aaf8eb18a021b76249c561d499e3e664c983886 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 23 Feb 2023 16:13:10 +0100 Subject: [PATCH 568/912] nuke: publishing with new settings --- .../hosts/nuke/plugins/publish/collect_writes.py | 16 ++++++++-------- .../plugins/publish/submit_nuke_deadline.py | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py index 3054e5a30c..0aa044f06d 100644 --- a/openpype/hosts/nuke/plugins/publish/collect_writes.py +++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py @@ -132,14 +132,14 @@ class CollectNukeWrites(pyblish.api.InstancePlugin): self.log.info("Publishing rendered frames ...") elif render_target == "farm": - farm_priority = creator_attributes.get("farm_priority") - farm_chunk = creator_attributes.get("farm_chunk") - farm_concurency = creator_attributes.get("farm_concurency") - instance.data.update({ - "deadlineChunkSize": farm_chunk or 1, - "deadlinePriority": farm_priority or 50, - "deadlineConcurrentTasks": farm_concurency or 0 - }) + farm_keys = ["farm_chunk", "farm_priority", "farm_concurrency"] + for key in farm_keys: + # Skip if key is not in creator attributes + if key not in creator_attributes: + continue + # Add farm attributes to instance + instance.data[key] = creator_attributes[key] + # Farm rendering instance.data["transfer"] = False instance.data["farm"] = True diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py index faa66effbd..0f8c69629e 100644 --- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py @@ -162,16 +162,16 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): pass # define chunk and priority - chunk_size = instance.data["deadlineChunkSize"] - if chunk_size == 0 and self.chunk_size: + chunk_size = instance.data.get("farm_chunk") + if not chunk_size: chunk_size = self.chunk_size # define chunk and priority - concurrent_tasks = instance.data["deadlineConcurrentTasks"] - if concurrent_tasks == 0 and self.concurrent_tasks: + concurrent_tasks = instance.data.get("farm_concurrency") + if not concurrent_tasks: concurrent_tasks = self.concurrent_tasks - priority = instance.data["deadlinePriority"] + priority = instance.data.get("farm_priority") if not priority: priority = self.priority From d2f8407111905b621e29b27202ef3e59afa63983 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 11:59:13 +0100 Subject: [PATCH 569/912] OP-4643 - fix files to delete --- .../plugins/publish/extract_color_transcode.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 99c8c87e51..61e29697d6 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -222,6 +222,21 @@ class ExtractOIIOTranscode(publish.Extractor): renamed_files.append(file_name) new_repre["files"] = renamed_files + def _rename_in_representation(self, new_repre, files_to_convert, + output_extension): + """Replace old extension with new one everywhere in representation.""" + if new_repre["name"] == new_repre["ext"]: + new_repre["name"] = output_extension + new_repre["ext"] = output_extension + + renamed_files = [] + for file_name in files_to_convert: + file_name, _ = os.path.splitext(file_name) + file_name = '{}.{}'.format(file_name, + output_extension) + renamed_files.append(file_name) + new_repre["files"] = renamed_files + def _translate_to_sequence(self, files_to_convert): """Returns original list or list with filename formatted in single sequence format. From c038fbf884f872ec717588290b9ba9273f219d36 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 27 Jan 2023 13:18:33 +0100 Subject: [PATCH 570/912] OP-4643 - fix no tags in repre --- openpype/plugins/publish/extract_color_transcode.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 61e29697d6..aca4adc40c 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -175,6 +175,8 @@ class ExtractOIIOTranscode(publish.Extractor): if new_repre.get("tags") is None: new_repre["tags"] = [] for tag in output_def["tags"]: + if not new_repre.get("tags"): + new_repre["tags"] = [] if tag not in new_repre["tags"]: new_repre["tags"].append(tag) From 195e9b436047a797bd9c99ac37ba5080690e3943 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 1 Feb 2023 16:13:59 +0100 Subject: [PATCH 571/912] OP-4643 - name of new representation from output definition key --- .../publish/extract_color_transcode.py | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index aca4adc40c..bd81dd6087 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -225,10 +225,22 @@ class ExtractOIIOTranscode(publish.Extractor): new_repre["files"] = renamed_files def _rename_in_representation(self, new_repre, files_to_convert, - output_extension): - """Replace old extension with new one everywhere in representation.""" - if new_repre["name"] == new_repre["ext"]: - new_repre["name"] = output_extension + output_name, output_extension): + """Replace old extension with new one everywhere in representation. + + Args: + new_repre (dict) + files_to_convert (list): of filenames from repre["files"], + standardized to always list + output_name (str): key of output definition from Settings, + if "" token used, keep original repre name + output_extension (str): extension from output definition + """ + if output_name != "passthrough": + new_repre["name"] = output_name + if not output_extension: + return + new_repre["ext"] = output_extension renamed_files = [] From 4a70ec9c54fbf7caec8ac8bd1f17adecbd9dd6b0 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 8 Feb 2023 12:07:00 +0100 Subject: [PATCH 572/912] Fix - added missed scopes for Slack bot --- openpype/modules/slack/manifest.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openpype/modules/slack/manifest.yml b/openpype/modules/slack/manifest.yml index 7a65cc5915..233c39fbaf 100644 --- a/openpype/modules/slack/manifest.yml +++ b/openpype/modules/slack/manifest.yml @@ -19,6 +19,8 @@ oauth_config: - chat:write.public - files:write - channels:read + - users:read + - usergroups:read settings: org_deploy_enabled: false socket_mode_enabled: false From 7f94f7ef7183a51bdfa1bd40078a9183ee50e1bd Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 14 Feb 2023 15:14:14 +0100 Subject: [PATCH 573/912] OP-4643 - allow new repre to stay One might want to delete outputs with 'delete' tag, but repre must stay there at least until extract_review. More universal new tag might be created for this. --- openpype/plugins/publish/extract_color_transcode.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index bd81dd6087..4892a00fbe 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -175,8 +175,6 @@ class ExtractOIIOTranscode(publish.Extractor): if new_repre.get("tags") is None: new_repre["tags"] = [] for tag in output_def["tags"]: - if not new_repre.get("tags"): - new_repre["tags"] = [] if tag not in new_repre["tags"]: new_repre["tags"].append(tag) @@ -192,6 +190,12 @@ class ExtractOIIOTranscode(publish.Extractor): for repre in tuple(instance.data["representations"]): tags = repre.get("tags") or [] + # TODO implement better way, for now do not delete new repre + # new repre might have 'delete' tag to removed, but it first must + # be there for review to be created + if "newly_added" in tags: + tags.remove("newly_added") + continue if "delete" in tags and "thumbnail" not in tags: instance.data["representations"].remove(repre) From cce048fd3e0f50441fa9f893dfb9efebe43d95a8 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 15 Feb 2023 16:21:25 +0100 Subject: [PATCH 574/912] OP-4642 - refactored newly added representations --- openpype/plugins/publish/extract_color_transcode.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index 4892a00fbe..a6fa710425 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -190,12 +190,6 @@ class ExtractOIIOTranscode(publish.Extractor): for repre in tuple(instance.data["representations"]): tags = repre.get("tags") or [] - # TODO implement better way, for now do not delete new repre - # new repre might have 'delete' tag to removed, but it first must - # be there for review to be created - if "newly_added" in tags: - tags.remove("newly_added") - continue if "delete" in tags and "thumbnail" not in tags: instance.data["representations"].remove(repre) From 9eaa0d1ff8e0882a2778fce44f09fba3f2cccecd Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 12:12:35 +0100 Subject: [PATCH 575/912] OP-4643 - split command line arguments to separate items Reuse existing method from ExtractReview, put it into transcoding.py --- openpype/plugins/publish/extract_review.py | 27 +++------------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py index 0f6dacba18..e80141fc4a 100644 --- a/openpype/plugins/publish/extract_review.py +++ b/openpype/plugins/publish/extract_review.py @@ -22,6 +22,7 @@ from openpype.lib.transcoding import ( should_convert_for_ffmpeg, convert_input_paths_for_ffmpeg, get_transcode_temp_directory, + split_cmd_args ) @@ -670,7 +671,7 @@ class ExtractReview(pyblish.api.InstancePlugin): res_filters = self.rescaling_filters(temp_data, output_def, new_repre) ffmpeg_video_filters.extend(res_filters) - ffmpeg_input_args = self.split_ffmpeg_args(ffmpeg_input_args) + ffmpeg_input_args = split_cmd_args(ffmpeg_input_args) lut_filters = self.lut_filters(new_repre, instance, ffmpeg_input_args) ffmpeg_video_filters.extend(lut_filters) @@ -723,28 +724,6 @@ class ExtractReview(pyblish.api.InstancePlugin): ffmpeg_output_args ) - def split_ffmpeg_args(self, in_args): - """Makes sure all entered arguments are separated in individual items. - - Split each argument string with " -" to identify if string contains - one or more arguments. - """ - splitted_args = [] - for arg in in_args: - sub_args = arg.split(" -") - if len(sub_args) == 1: - if arg and arg not in splitted_args: - splitted_args.append(arg) - continue - - for idx, arg in enumerate(sub_args): - if idx != 0: - arg = "-" + arg - - if arg and arg not in splitted_args: - splitted_args.append(arg) - return splitted_args - def ffmpeg_full_args( self, input_args, video_filters, audio_filters, output_args ): @@ -764,7 +743,7 @@ class ExtractReview(pyblish.api.InstancePlugin): Returns: list: Containing all arguments ready to run in subprocess. """ - output_args = self.split_ffmpeg_args(output_args) + output_args = split_cmd_args(output_args) video_args_dentifiers = ["-vf", "-filter:v"] audio_args_dentifiers = ["-af", "-filter:a"] From 751586fd415ea6aa10327cca8fb57f2f1657b9d7 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 13:11:11 +0100 Subject: [PATCH 576/912] Revert "Fix - added missed scopes for Slack bot" This reverts commit 5e0c4a3ab1432e120b8f0c324f899070f1a5f831. --- openpype/modules/slack/manifest.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/openpype/modules/slack/manifest.yml b/openpype/modules/slack/manifest.yml index 233c39fbaf..7a65cc5915 100644 --- a/openpype/modules/slack/manifest.yml +++ b/openpype/modules/slack/manifest.yml @@ -19,8 +19,6 @@ oauth_config: - chat:write.public - files:write - channels:read - - users:read - - usergroups:read settings: org_deploy_enabled: false socket_mode_enabled: false From 84ccfa60f43c1fa5a575b62c79779d66dfc2951d Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 15:06:16 +0100 Subject: [PATCH 577/912] OP-4643 - added documentation --- website/docs/project_settings/settings_project_global.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index d904080ad1..b320b5502f 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -63,7 +63,7 @@ Example here describes use case for creation of new color coded review of png im ![global_oiio_transcode](assets/global_oiio_transcode.png) Another use case is to transcode in Maya only `beauty` render layers and use collected `Display` and `View` colorspaces from DCC. -![global_oiio_transcode_in_Maya](assets/global_oiio_transcode.png) +![global_oiio_transcode_in_Maya](assets/global_oiio_transcode.png)n ## Profile filters From 72a3572d9527093290ebd600b538e2375e690861 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 21 Feb 2023 17:56:21 +0100 Subject: [PATCH 578/912] Revert "OP-4643 - split command line arguments to separate items" This reverts commit deaad39437501f18fc3ba4be8b1fc5f0ee3be65d. --- openpype/lib/transcoding.py | 3 ++- openpype/plugins/publish/extract_review.py | 27 +++++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py index c0bda2aa37..e5e21195e5 100644 --- a/openpype/lib/transcoding.py +++ b/openpype/lib/transcoding.py @@ -1100,7 +1100,7 @@ def convert_colorspace( raise ValueError("Both screen and display must be set.") if additional_command_args: - oiio_cmd.extend(split_cmd_args(additional_command_args)) + oiio_cmd.extend(additional_command_args) if target_colorspace: oiio_cmd.extend(["--colorconvert", @@ -1132,3 +1132,4 @@ def split_cmd_args(in_args): continue splitted_args.extend(arg.split(" ")) return splitted_args + diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py index e80141fc4a..0f6dacba18 100644 --- a/openpype/plugins/publish/extract_review.py +++ b/openpype/plugins/publish/extract_review.py @@ -22,7 +22,6 @@ from openpype.lib.transcoding import ( should_convert_for_ffmpeg, convert_input_paths_for_ffmpeg, get_transcode_temp_directory, - split_cmd_args ) @@ -671,7 +670,7 @@ class ExtractReview(pyblish.api.InstancePlugin): res_filters = self.rescaling_filters(temp_data, output_def, new_repre) ffmpeg_video_filters.extend(res_filters) - ffmpeg_input_args = split_cmd_args(ffmpeg_input_args) + ffmpeg_input_args = self.split_ffmpeg_args(ffmpeg_input_args) lut_filters = self.lut_filters(new_repre, instance, ffmpeg_input_args) ffmpeg_video_filters.extend(lut_filters) @@ -724,6 +723,28 @@ class ExtractReview(pyblish.api.InstancePlugin): ffmpeg_output_args ) + def split_ffmpeg_args(self, in_args): + """Makes sure all entered arguments are separated in individual items. + + Split each argument string with " -" to identify if string contains + one or more arguments. + """ + splitted_args = [] + for arg in in_args: + sub_args = arg.split(" -") + if len(sub_args) == 1: + if arg and arg not in splitted_args: + splitted_args.append(arg) + continue + + for idx, arg in enumerate(sub_args): + if idx != 0: + arg = "-" + arg + + if arg and arg not in splitted_args: + splitted_args.append(arg) + return splitted_args + def ffmpeg_full_args( self, input_args, video_filters, audio_filters, output_args ): @@ -743,7 +764,7 @@ class ExtractReview(pyblish.api.InstancePlugin): Returns: list: Containing all arguments ready to run in subprocess. """ - output_args = split_cmd_args(output_args) + output_args = self.split_ffmpeg_args(output_args) video_args_dentifiers = ["-vf", "-filter:v"] audio_args_dentifiers = ["-af", "-filter:a"] From 656318f122fe4cdc167e780b7737c8780890582b Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 23 Feb 2023 16:59:40 +0100 Subject: [PATCH 579/912] adding log to render farm settings class init --- openpype/hosts/nuke/api/lib_rendersettings.py | 10 ++++++++-- .../nuke/plugins/create/create_write_prerender.py | 4 +++- .../hosts/nuke/plugins/create/create_write_render.py | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/nuke/api/lib_rendersettings.py b/openpype/hosts/nuke/api/lib_rendersettings.py index 959b461c29..4d5440fe48 100644 --- a/openpype/hosts/nuke/api/lib_rendersettings.py +++ b/openpype/hosts/nuke/api/lib_rendersettings.py @@ -20,9 +20,12 @@ class RenderFarmSettings: _creator_farm_keys: list = [ "chunk_size", "priority", "concurrent_tasks"] - def __init__(self, project_settings=None): + def __init__(self, project_settings=None, log=None): """ Get project settings and active farm module """ + if log: + self.log = log + self._project_settings = ( project_settings or get_current_project_settings() ) @@ -61,8 +64,9 @@ class RenderFarmSettings: ''' return_dict = {} farm_plugin = self._farm_plugins.get(self.active_farm_module) + self.log.debug("Farm plugin: \"{}\"".format(farm_plugin)) - if farm_plugin: + if not farm_plugin: raise ValueError(( "Farm plugin \"{}\" not found in farm plugins." ).format(farm_plugin)) @@ -73,6 +77,8 @@ class RenderFarmSettings: # Get farm plugin settings farm_plugin_settings = ( module_settings["publish"][farm_plugin]) + self.log.debug( + "Farm plugin settings: \"{}\"".format(farm_plugin_settings)) # Get all keys from farm_plugin_settings for key in self._creator_farm_keys: diff --git a/openpype/hosts/nuke/plugins/create/create_write_prerender.py b/openpype/hosts/nuke/plugins/create/create_write_prerender.py index a99bd0c4ab..411a79dbf4 100644 --- a/openpype/hosts/nuke/plugins/create/create_write_prerender.py +++ b/openpype/hosts/nuke/plugins/create/create_write_prerender.py @@ -51,7 +51,9 @@ class CreateWritePrerender(napi.NukeWriteCreator): self._get_reviewable_bool() ] if "farm_rendering" in self.instance_attributes: - render_farm_settings = RenderFarmSettings().get_rendering_attributes() + render_farm_settings = RenderFarmSettings( + log=self.log).get_rendering_attributes() + attr_defs.extend([ UISeparatorDef(), diff --git a/openpype/hosts/nuke/plugins/create/create_write_render.py b/openpype/hosts/nuke/plugins/create/create_write_render.py index bbaba212c2..a51661425f 100644 --- a/openpype/hosts/nuke/plugins/create/create_write_render.py +++ b/openpype/hosts/nuke/plugins/create/create_write_render.py @@ -48,7 +48,8 @@ class CreateWriteRender(napi.NukeWriteCreator): self._get_reviewable_bool() ] if "farm_rendering" in self.instance_attributes: - render_farm_settings = RenderFarmSettings().get_rendering_attributes() + render_farm_settings = RenderFarmSettings( + log=self.log).get_rendering_attributes() attr_defs.extend([ UISeparatorDef(), From b09bc8d4a3e85eb3187b08b1672ca8bd0528dd99 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 23 Feb 2023 17:00:19 +0100 Subject: [PATCH 580/912] removing unused items from settings --- openpype/settings/defaults/project_settings/deadline.json | 1 - .../schemas/projects_schema/schema_project_deadline.json | 5 ----- 2 files changed, 6 deletions(-) diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json index 7183603c4b..6b6f2d465b 100644 --- a/openpype/settings/defaults/project_settings/deadline.json +++ b/openpype/settings/defaults/project_settings/deadline.json @@ -52,7 +52,6 @@ "enabled": true, "optional": false, "active": true, - "use_published": true, "priority": 50, "chunk_size": 10, "concurrent_tasks": 1, diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json index a320dfca4f..bb5a65e1b7 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json @@ -285,11 +285,6 @@ "key": "active", "label": "Active" }, - { - "type": "boolean", - "key": "use_published", - "label": "Use Published scene" - }, { "type": "splitter" }, From f2274ec2e963e6eb5e10233ff593804e02ab1f5c Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 23 Feb 2023 17:00:51 +0100 Subject: [PATCH 581/912] removing none existent host also fix typo --- .../plugins/publish/submit_nuke_deadline.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py index 0f8c69629e..b4b59c4c77 100644 --- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py @@ -23,7 +23,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): label = "Submit to Deadline" order = pyblish.api.IntegratorOrder + 0.1 - hosts = ["nuke", "nukestudio"] + hosts = ["nuke"] families = ["render.farm", "prerender.farm"] optional = True targets = ["local"] @@ -141,7 +141,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): exe_node_name, start_frame, end_frame, - responce_data=None + response_data=None ): render_dir = os.path.normpath(os.path.dirname(render_path)) batch_name = os.path.basename(script_path) @@ -152,8 +152,8 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): output_filename_0 = self.preview_fname(render_path) - if not responce_data: - responce_data = {} + if not response_data: + response_data = {} try: # Ensure render folder exists @@ -244,11 +244,11 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): "AuxFiles": [] } - if responce_data.get("_id"): + if response_data.get("_id"): payload["JobInfo"].update({ "JobType": "Normal", - "BatchName": responce_data["Props"]["Batch"], - "JobDependency0": responce_data["_id"], + "BatchName": response_data["Props"]["Batch"], + "JobDependency0": response_data["_id"], "ChunkSize": 99999999 }) From 59c3510a0219fe726e52816e4d1ff20015455794 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 11:26:06 +0100 Subject: [PATCH 582/912] don't add opacity to layers info --- openpype/hosts/tvpaint/api/lib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/tvpaint/api/lib.py b/openpype/hosts/tvpaint/api/lib.py index 312a211d49..a0cf761870 100644 --- a/openpype/hosts/tvpaint/api/lib.py +++ b/openpype/hosts/tvpaint/api/lib.py @@ -50,7 +50,8 @@ def parse_layers_data(data): "group_id": int(group_id), "visible": visible == "ON", "position": int(position), - "opacity": int(opacity), + # Opacity from 'tv_layerinfo' is always set to '0' so it's unusable + # "opacity": int(opacity), "name": name, "type": layer_type, "frame_start": int(frame_start), From 0f8a9c58a758fda407d777232112b7723d0e4332 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 11:26:22 +0100 Subject: [PATCH 583/912] added is_current information to layers info --- openpype/hosts/tvpaint/api/lib.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/tvpaint/api/lib.py b/openpype/hosts/tvpaint/api/lib.py index a0cf761870..49846d7f29 100644 --- a/openpype/hosts/tvpaint/api/lib.py +++ b/openpype/hosts/tvpaint/api/lib.py @@ -43,7 +43,7 @@ def parse_layers_data(data): layer_id, group_id, visible, position, opacity, name, layer_type, frame_start, frame_end, prelighttable, postlighttable, - selected, editable, sencil_state + selected, editable, sencil_state, is_current ) = layer_raw.split("|") layer = { "layer_id": int(layer_id), @@ -60,7 +60,8 @@ def parse_layers_data(data): "postlighttable": postlighttable == "1", "selected": selected == "1", "editable": editable == "1", - "sencil_state": sencil_state + "sencil_state": sencil_state, + "is_current": is_current == "1" } layers.append(layer) return layers @@ -88,15 +89,17 @@ def get_layers_data_george_script(output_filepath, layer_ids=None): " selected editable sencilState" ), # Check if layer ID match `tv_LayerCurrentID` + "is_current=0", "IF CMP(current_layer_id, layer_id)==1", # - mark layer as selected if layer id match to current layer id + "is_current=1", "selected=1", "END", # Prepare line with data separated by "|" ( "line = layer_id'|'group_id'|'visible'|'position'|'opacity'|'" "name'|'type'|'startFrame'|'endFrame'|'prelighttable'|'" - "postlighttable'|'selected'|'editable'|'sencilState" + "postlighttable'|'selected'|'editable'|'sencilState'|'is_current" ), # Write data to output file "tv_writetextfile \"strict\" \"append\" '\"'output_path'\"' line", From 80151ca8800ca3fdcbcdebc092f27f6277201aff Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 11:39:50 +0100 Subject: [PATCH 584/912] disable review on render layer/pass by default --- openpype/settings/defaults/project_settings/tvpaint.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json index e06a67a254..9173a8c3d5 100644 --- a/openpype/settings/defaults/project_settings/tvpaint.json +++ b/openpype/settings/defaults/project_settings/tvpaint.json @@ -31,13 +31,13 @@ "default_variants": [] }, "create_render_layer": { - "mark_for_review": true, + "mark_for_review": false, "default_pass_name": "beauty", "default_variant": "Main", "default_variants": [] }, "create_render_pass": { - "mark_for_review": true, + "mark_for_review": false, "default_variant": "Main", "default_variants": [] }, From abc36c8357e0773e35b5c312663d80ac3afbbfb1 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 12:08:08 +0100 Subject: [PATCH 585/912] fix detailed descriptions --- openpype/hosts/tvpaint/plugins/create/create_render.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 7e85977b11..d996c06818 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -66,7 +66,7 @@ RENDER_LAYER_DETAILED_DESCRIPTIONS = ( Be aware Render Layer is not TVPaint layer. All TVPaint layers in the scene with the color group id are rendered in the -beauty pass. To create sub passes use Render Layer creator which is +beauty pass. To create sub passes use Render Pass creator which is dependent on existence of render layer instance. The group can represent an asset (tree) or different part of scene that consist @@ -82,8 +82,8 @@ could be Render Layer which has 'Arm', 'Head' and 'Body' as Render Passes. RENDER_PASS_DETAILED_DESCRIPTIONS = ( """Render Pass is sub part of Render Layer. -Render Pass can consist of one or more TVPaint layers. Render Layers must -belong to a Render Layer. Marker TVPaint layers will change it's group color +Render Pass can consist of one or more TVPaint layers. Render Pass must +belong to a Render Layer. Marked TVPaint layers will change it's group color to match group color of Render Layer. """ ) From 79a40902e0a16518097240dd8bffd19c90fecbdd Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 14:49:02 +0100 Subject: [PATCH 586/912] Better error message --- openpype/hosts/tvpaint/plugins/create/create_render.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index d996c06818..563d16f847 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -461,7 +461,10 @@ class CreateRenderPass(TVPaintCreator): "render_layer_instance_id" ) if not render_layer_instance_id: - raise CreatorError("Missing RenderLayer instance") + raise CreatorError(( + "You cannot create a Render Pass without a Render Layer." + " Please select one first" + )) render_layer_instance = self.create_context.instances_by_id.get( render_layer_instance_id From ba792f648b6aeea6299a5137afd23de4dc677a3f Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 14:52:30 +0100 Subject: [PATCH 587/912] use 'list_instances' instead of existing instances --- .../hosts/tvpaint/plugins/create/create_render.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 563d16f847..6a3788cc08 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -601,13 +601,16 @@ class CreateRenderPass(TVPaintCreator): ] def get_pre_create_attr_defs(self): + # Find available Render Layers + # - instances are created after creators reset + current_instances = self.host.list_instances() render_layers = [ { - "value": instance.id, - "label": instance.label + "value": instance["instance_id"], + "label": instance["subset"] } - for instance in self.create_context.instances - if instance.creator_identifier == CreateRenderlayer.identifier + for instance in current_instances + if instance["creator_identifier"] == CreateRenderlayer.identifier ] if not render_layers: render_layers.append({"value": None, "label": "N/A"}) From 8218e18edf352d377c901197ecf9408988e974e2 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 14:52:53 +0100 Subject: [PATCH 588/912] added label with hint for artist --- openpype/hosts/tvpaint/plugins/create/create_render.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 6a3788cc08..d356a07687 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -41,6 +41,7 @@ from openpype.client import get_asset_by_name from openpype.lib import ( prepare_template_data, AbstractAttrDef, + UILabelDef, UISeparatorDef, EnumDef, TextDef, @@ -621,6 +622,9 @@ class CreateRenderPass(TVPaintCreator): label="Render Layer", items=render_layers ), + UILabelDef( + "NOTE: Try to hit refresh if you don't see a Render Layer" + ), BoolDef( "mark_for_review", label="Review", From 227f1402fe03590b4350124db0a3894335967c04 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 14:57:34 +0100 Subject: [PATCH 589/912] change how instance attributes are filled --- .../tvpaint/plugins/create/create_render.py | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index d356a07687..9711024c79 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -633,7 +633,34 @@ class CreateRenderPass(TVPaintCreator): ] def get_instance_attr_defs(self): - return self.get_pre_create_attr_defs() + # Find available Render Layers + current_instances = self.create_context.instances + render_layers = [ + { + "value": instance.id, + "label": instance.label + } + for instance in current_instances + if instance.creator_identifier == CreateRenderlayer.identifier + ] + if not render_layers: + render_layers.append({"value": None, "label": "N/A"}) + + return [ + EnumDef( + "render_layer_instance_id", + label="Render Layer", + items=render_layers + ), + UILabelDef( + "NOTE: Try to hit refresh if you don't see a Render Layer" + ), + BoolDef( + "mark_for_review", + label="Review", + default=self.mark_for_review + ) + ] class TVPaintAutoDetectRenderCreator(TVPaintCreator): From de15f1bc3a135738f218fe27db928aef5cdb1af9 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 23 Feb 2023 18:50:21 +0100 Subject: [PATCH 590/912] Updated render_local.py to not only process the first instance Moved the __hasRun to render_once() so the check only happens with the rendering. Currently only the first render node gets the representations added --- .../fusion/plugins/publish/render_local.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index 53d8eb64e1..49aaf63a61 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -18,15 +18,9 @@ class Fusionlocal(pyblish.api.InstancePlugin): def process(self, instance): - # This plug-in runs only once and thus assumes all instances - # currently will render the same frame range context = instance.context - key = f"__hasRun{self.__class__.__name__}" - if context.data.get(key, False): - return - - context.data[key] = True - + + # Start render self.render_once(context) frame_start = context.data["frameStartHandle"] @@ -60,6 +54,14 @@ class Fusionlocal(pyblish.api.InstancePlugin): def render_once(self, context): """Render context comp only once, even with more render instances""" + + # This plug-in assumes all render nodes get rendered at the same time + # to speed up the rendering. The check below makes sure that we only + # execute the rendering once and not for each instance. + key = f"__hasRun{self.__class__.__name__}" + if context.data.get(key, False): + return + context.data[key] = True current_comp = context.data["currentComp"] frame_start = context.data["frameStartHandle"] From d8041562d0e08afd7dfc34158591142158d51e0e Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 23 Feb 2023 18:52:50 +0100 Subject: [PATCH 591/912] Fixed Hounds notes --- openpype/hosts/fusion/plugins/publish/render_local.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index 49aaf63a61..c22074d6c6 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -19,7 +19,7 @@ class Fusionlocal(pyblish.api.InstancePlugin): def process(self, instance): context = instance.context - + # Start render self.render_once(context) @@ -54,7 +54,7 @@ class Fusionlocal(pyblish.api.InstancePlugin): def render_once(self, context): """Render context comp only once, even with more render instances""" - + # This plug-in assumes all render nodes get rendered at the same time # to speed up the rendering. The check below makes sure that we only # execute the rendering once and not for each instance. From 31d7b18e9ff6d5561ddc9d7ea2d003ae3a5c86bd Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 23 Feb 2023 19:18:41 +0100 Subject: [PATCH 592/912] Changed to f-string --- openpype/hosts/fusion/plugins/create/create_saver.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/fusion/plugins/create/create_saver.py b/openpype/hosts/fusion/plugins/create/create_saver.py index 99aa7583f1..59fc198243 100644 --- a/openpype/hosts/fusion/plugins/create/create_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_saver.py @@ -39,8 +39,9 @@ class CreateSaver(Creator): # Check file format settings are available if saver[file_format] is None: - raise RuntimeError("File format is not set to {}, " - "this is a bug".format(file_format)) + raise RuntimeError( + f"File format is not set to {file_format}, this is a bug" + ) # Set file format attributes saver[file_format]["Depth"] = 1 # int8 | int16 | float32 | other @@ -110,7 +111,7 @@ class CreateSaver(Creator): def _imprint(self, tool, data): # Save all data in a "openpype.{key}" = value data for key, value in data.items(): - tool.SetData("openpype.{}".format(key), value) + tool.SetData(f"openpype.{key}", value) def _update_tool_with_data(self, tool, data): """Update tool node name and output path based on subset data""" @@ -123,7 +124,7 @@ class CreateSaver(Creator): # Subset change detected # Update output filepath workdir = os.path.normpath(legacy_io.Session["AVALON_WORKDIR"]) - filename = "{}..exr".format(subset) + filename = f"{subset}..exr" filepath = os.path.join(workdir, "render", subset, filename) tool["Clip"] = filepath From 4d3442db70c025a67e5503fb8a728e2c3acd7b96 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 23 Feb 2023 19:19:24 +0100 Subject: [PATCH 593/912] Add subset to instance_data --- openpype/hosts/fusion/plugins/create/create_saver.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/fusion/plugins/create/create_saver.py b/openpype/hosts/fusion/plugins/create/create_saver.py index 59fc198243..5725b5d0d1 100644 --- a/openpype/hosts/fusion/plugins/create/create_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_saver.py @@ -33,6 +33,7 @@ class CreateSaver(Creator): args = (-32768, -32768) # Magical position numbers saver = comp.AddTool("Saver", *args) + instance_data["subset"] = subset_name self._update_tool_with_data(saver, data=instance_data) saver["OutputFormat"] = file_format From 8afd6f4f359cf1bdea8f08386a983a1782e35871 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 23 Feb 2023 19:19:52 +0100 Subject: [PATCH 594/912] Change render depth to Auto instead of forcing int16 as it was --- openpype/hosts/fusion/plugins/create/create_saver.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/plugins/create/create_saver.py b/openpype/hosts/fusion/plugins/create/create_saver.py index 5725b5d0d1..439064770e 100644 --- a/openpype/hosts/fusion/plugins/create/create_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_saver.py @@ -45,8 +45,9 @@ class CreateSaver(Creator): ) # Set file format attributes - saver[file_format]["Depth"] = 1 # int8 | int16 | float32 | other - saver[file_format]["SaveAlpha"] = 0 + saver[file_format]["Depth"] = 0 # Auto | float16 | float32 + # TODO Is this needed? + saver[file_format]["SaveAlpha"] = 1 self._imprint(saver, instance_data) From f840347f4e27a3f7474fe7e29facf9fa02f4e7ef Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 23 Feb 2023 19:20:20 +0100 Subject: [PATCH 595/912] Import get_current_comp from API directly --- openpype/hosts/fusion/plugins/create/create_workfile.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/fusion/plugins/create/create_workfile.py b/openpype/hosts/fusion/plugins/create/create_workfile.py index 783d3a147a..05dbcddd52 100644 --- a/openpype/hosts/fusion/plugins/create/create_workfile.py +++ b/openpype/hosts/fusion/plugins/create/create_workfile.py @@ -2,7 +2,9 @@ import collections import qtawesome -import openpype.hosts.fusion.api as api +from openpype.hosts.fusion.api import ( + get_current_comp +) from openpype.client import get_asset_by_name from openpype.pipeline import ( AutoCreator, @@ -35,7 +37,7 @@ class FusionWorkfileCreator(AutoCreator): def collect_instances(self): - comp = api.get_current_comp() + comp = get_current_comp() data = comp.GetData(self.data_key) if not data: return @@ -69,7 +71,7 @@ class FusionWorkfileCreator(AutoCreator): def create(self, options=None): - comp = api.get_current_comp() + comp = get_current_comp() if not comp: self.log.error("Unable to find current comp") return From f5a40056ab3e8cf18f5562d8961174fe422ce3e1 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 23 Feb 2023 19:21:00 +0100 Subject: [PATCH 596/912] Pass "data" to get_dynamic_data() was missing --- openpype/hosts/fusion/plugins/create/create_workfile.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/plugins/create/create_workfile.py b/openpype/hosts/fusion/plugins/create/create_workfile.py index 05dbcddd52..917780c56e 100644 --- a/openpype/hosts/fusion/plugins/create/create_workfile.py +++ b/openpype/hosts/fusion/plugins/create/create_workfile.py @@ -99,8 +99,12 @@ class FusionWorkfileCreator(AutoCreator): "variant": self.default_variant } data.update(self.get_dynamic_data( - self.default_variant, task_name, asset_doc, - project_name, host_name + self.default_variant, + task_name, + asset_doc, + project_name, + host_name, + data )) instance = CreatedInstance( From f0cd353301c6192ec0203a83de2ec7b31e4979c6 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 23 Feb 2023 19:29:03 +0100 Subject: [PATCH 597/912] Fixed Hound's notes --- openpype/hosts/fusion/api/pipeline.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/api/pipeline.py b/openpype/hosts/fusion/api/pipeline.py index eb097e5c5b..2d0a1da8fa 100644 --- a/openpype/hosts/fusion/api/pipeline.py +++ b/openpype/hosts/fusion/api/pipeline.py @@ -463,4 +463,4 @@ class FusionEventHandler(QtCore.QObject): # Comp Opened elif what in {"Comp_Opened"}: - emit_event("open", data=event) \ No newline at end of file + emit_event("open", data=event) From 79b73efa28fd6edfd49f7ee8aa3750a9bc910c86 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Fri, 24 Feb 2023 12:41:26 +0800 Subject: [PATCH 598/912] color convert only enabled when there is arnold plugin --- openpype/hosts/maya/api/lib.py | 20 +++++---- .../maya/plugins/publish/extract_look.py | 43 ++++++++++++------- 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index 614b04903f..a4d823b7a1 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -16,15 +16,6 @@ from six import string_types from maya import cmds, mel import maya.api.OpenMaya as om -from arnold import ( - AiTextureGetBitDepth, - AiTextureGetFormat, - AiTextureInvalidate, - # types - AI_TYPE_BYTE, - AI_TYPE_INT, - AI_TYPE_UINT -) from openpype.client import ( get_project, @@ -3532,6 +3523,10 @@ def image_info(file_path): Returns: dict: Dictionary with the information about the texture file. """ + from arnold import ( + AiTextureGetBitDepth, + AiTextureGetFormat +) # Get Texture Information img_info = {'filename': file_path} if os.path.isfile(file_path): @@ -3554,6 +3549,13 @@ def guess_colorspace(img_info): str: color space name use in the `--colorconvert` option of maketx. """ + from arnold import ( + AiTextureInvalidate, + # types + AI_TYPE_BYTE, + AI_TYPE_INT, + AI_TYPE_UINT +) try: if img_info['bit_depth'] <= 16: if img_info['format'] in (AI_TYPE_BYTE, AI_TYPE_INT, AI_TYPE_UINT): # noqa diff --git a/openpype/hosts/maya/plugins/publish/extract_look.py b/openpype/hosts/maya/plugins/publish/extract_look.py index d9c19c9139..ca110ceadd 100644 --- a/openpype/hosts/maya/plugins/publish/extract_look.py +++ b/openpype/hosts/maya/plugins/publish/extract_look.py @@ -537,33 +537,44 @@ class ExtractLook(publish.Extractor): if linearize: if cmds.colorManagementPrefs(query=True, cmEnabled=True): render_colorspace = cmds.colorManagementPrefs(query=True, renderingSpaceName=True) # noqa + config_path = cmds.colorManagementPrefs(query=True, + configFilePath=True) + if not os.path.exists(config_path): + raise RuntimeError("No OCIO config path found!") + color_space_attr = resource["node"] + ".colorSpace" try: color_space = cmds.getAttr(color_space_attr) except ValueError: # node doesn't have color space attribute - img_info = image_info(filepath) - color_space = guess_colorspace(img_info) + if cmds.loadPlugin("mtoa", quiet=True): + img_info = image_info(filepath) + color_space = guess_colorspace(img_info) + else: + color_space = "Raw" self.log.info("tx: converting {0} -> {1}".format(color_space, render_colorspace)) # noqa + additional_args.extend(["--colorconvert", color_space, render_colorspace]) else: - img_info = image_info(filepath) - color_space = guess_colorspace(img_info) - if color_space == "sRGB": - self.log.info("tx: converting sRGB -> linear") - additional_args.extend(["--colorconvert", - "sRGB", - "Raw"]) - else: - self.log.info("tx: texture's colorspace " - "is already linear") - config_path = cmds.colorManagementPrefs(query=True, - configFilePath=True) - if not os.path.exists(config_path): - raise RuntimeError("No OCIO config path found!") + if cmds.loadPlugin("mtoa", quiet=True): + img_info = image_info(filepath) + color_space = guess_colorspace(img_info) + if color_space == "sRGB": + self.log.info("tx: converting sRGB -> linear") + additional_args.extend(["--colorconvert", + "sRGB", + "Raw"]) + else: + self.log.info("tx: texture's colorspace " + "is already linear") + else: + self.log.warning("cannot guess the colorspace" + "color conversion won't be available!") + + additional_args.extend(["--colorconfig", config_path]) # Ensure folder exists if not os.path.exists(os.path.dirname(converted)): From 5aba18e089e4947ce7b19d3875ee284d164e2b35 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 10:53:44 +0100 Subject: [PATCH 599/912] extract sequence can ignore layer's transparency --- .../plugins/publish/extract_sequence.py | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py b/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py index f2856c72a9..1a21715aa2 100644 --- a/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py +++ b/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py @@ -59,6 +59,10 @@ class ExtractSequence(pyblish.api.Extractor): ) ) + ignore_layers_transparency = instance.data.get( + "ignoreLayersTransparency", False + ) + family_lowered = instance.data["family"].lower() mark_in = instance.context.data["sceneMarkIn"] mark_out = instance.context.data["sceneMarkOut"] @@ -114,7 +118,11 @@ class ExtractSequence(pyblish.api.Extractor): else: # Render output result = self.render( - output_dir, mark_in, mark_out, filtered_layers + output_dir, + mark_in, + mark_out, + filtered_layers, + ignore_layers_transparency ) output_filepaths_by_frame_idx, thumbnail_fullpath = result @@ -274,7 +282,9 @@ class ExtractSequence(pyblish.api.Extractor): return output_filepaths_by_frame_idx, thumbnail_filepath - def render(self, output_dir, mark_in, mark_out, layers): + def render( + self, output_dir, mark_in, mark_out, layers, ignore_layer_opacity + ): """ Export images from TVPaint. Args: @@ -282,6 +292,7 @@ class ExtractSequence(pyblish.api.Extractor): mark_in (int): Starting frame index from which export will begin. mark_out (int): On which frame index export will end. layers (list): List of layers to be exported. + ignore_layer_opacity (bool): Layer's opacity will be ignored. Returns: tuple: With 2 items first is list of filenames second is path to @@ -323,7 +334,7 @@ class ExtractSequence(pyblish.api.Extractor): for layer_id, render_data in extraction_data_by_layer_id.items(): layer = layers_by_id[layer_id] filepaths_by_layer_id[layer_id] = self._render_layer( - render_data, layer, output_dir + render_data, layer, output_dir, ignore_layer_opacity ) # Prepare final filepaths where compositing should store result @@ -380,7 +391,9 @@ class ExtractSequence(pyblish.api.Extractor): red, green, blue = self.review_bg return (red, green, blue) - def _render_layer(self, render_data, layer, output_dir): + def _render_layer( + self, render_data, layer, output_dir, ignore_layer_opacity + ): frame_references = render_data["frame_references"] filenames_by_frame_index = render_data["filenames_by_frame_index"] @@ -389,6 +402,12 @@ class ExtractSequence(pyblish.api.Extractor): "tv_layerset {}".format(layer_id), "tv_SaveMode \"PNG\"" ] + # Set density to 100 and store previous opacity + if ignore_layer_opacity: + george_script_lines.extend([ + "tv_layerdensity 100", + "orig_opacity = result", + ]) filepaths_by_frame = {} frames_to_render = [] @@ -409,6 +428,10 @@ class ExtractSequence(pyblish.api.Extractor): # Store image to output george_script_lines.append("tv_saveimage \"{}\"".format(dst_path)) + # Set density back to origin opacity + if ignore_layer_opacity: + george_script_lines.append("tv_layerdensity orig_opacity") + self.log.debug("Rendering Exposure frames {} of layer {} ({})".format( ",".join(frames_to_render), layer_id, layer["name"] )) From 87b818e37eaf419654468029ff8558215f9dd847 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 10:58:49 +0100 Subject: [PATCH 600/912] collect render instances can set 'ignoreLayersTransparency' --- .../tvpaint/plugins/publish/collect_render_instances.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py b/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py index ba89deac5d..e89fbf7882 100644 --- a/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py +++ b/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py @@ -9,6 +9,8 @@ class CollectRenderInstances(pyblish.api.InstancePlugin): hosts = ["tvpaint"] families = ["render", "review"] + ignore_render_pass_transparency = False + def process(self, instance): context = instance.context creator_identifier = instance.data["creator_identifier"] @@ -63,6 +65,9 @@ class CollectRenderInstances(pyblish.api.InstancePlugin): for layer in layers_data if layer["name"] in layer_names ] + instance.data["ignoreLayersTransparency"] = ( + self.ignore_render_pass_transparency + ) render_layer_data = None render_layer_id = creator_attributes["render_layer_instance_id"] From 4b127dedd68900b93062e4a0394f6afb8f1f1d20 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 10:59:03 +0100 Subject: [PATCH 601/912] added settings for Collect Render Instances --- .../defaults/project_settings/tvpaint.json | 3 +++ .../projects_schema/schema_project_tvpaint.json | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json index 0b6d3d7e81..87d3601ae4 100644 --- a/openpype/settings/defaults/project_settings/tvpaint.json +++ b/openpype/settings/defaults/project_settings/tvpaint.json @@ -49,6 +49,9 @@ } }, "publish": { + "CollectRenderInstances": { + "ignore_render_pass_transparency": true + }, "ExtractSequence": { "review_bg": [ 255, diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json index 57016a8311..708b688ba5 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json @@ -241,6 +241,20 @@ "key": "publish", "label": "Publish plugins", "children": [ + { + "type": "dict", + "collapsible": true, + "key": "CollectRenderInstances", + "label": "Collect Render Instances", + "is_group": true, + "children": [ + { + "type": "boolean", + "key": "ignore_render_pass_transparency", + "label": "Ignore Render Pass opacity" + } + ] + }, { "type": "dict", "collapsible": true, From bdd869b0a8a953fd8e707dd1caf75c2290961991 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 Feb 2023 11:19:49 +0100 Subject: [PATCH 602/912] disable ignore transparency by default --- openpype/settings/defaults/project_settings/tvpaint.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json index 87d3601ae4..e06a67a254 100644 --- a/openpype/settings/defaults/project_settings/tvpaint.json +++ b/openpype/settings/defaults/project_settings/tvpaint.json @@ -50,7 +50,7 @@ }, "publish": { "CollectRenderInstances": { - "ignore_render_pass_transparency": true + "ignore_render_pass_transparency": false }, "ExtractSequence": { "review_bg": [ From 131e27008c0e1883f7241f731d0ddfd42df3f77b Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 10:39:10 +0100 Subject: [PATCH 603/912] fix access to not existing settings key --- openpype/hosts/tvpaint/plugins/create/create_render.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 40386efe91..7e85977b11 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -660,7 +660,6 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator): ["create"] ["auto_detect_render"] ) - self.enabled = plugin_settings["enabled"] self.allow_group_rename = plugin_settings["allow_group_rename"] self.group_name_template = plugin_settings["group_name_template"] self.group_idx_offset = plugin_settings["group_idx_offset"] From 6568db35af8047bdc2ca46016aca62f9f220e4b7 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 23 Feb 2023 11:30:15 +0100 Subject: [PATCH 604/912] Fix - check existence only if not None review_path might be None --- openpype/modules/slack/plugins/publish/integrate_slack_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/modules/slack/plugins/publish/integrate_slack_api.py b/openpype/modules/slack/plugins/publish/integrate_slack_api.py index 4e2557ccc7..86c97586d2 100644 --- a/openpype/modules/slack/plugins/publish/integrate_slack_api.py +++ b/openpype/modules/slack/plugins/publish/integrate_slack_api.py @@ -187,7 +187,7 @@ class IntegrateSlackAPI(pyblish.api.InstancePlugin): repre_review_path = get_publish_repre_path( instance, repre, False ) - if os.path.exists(repre_review_path): + if repre_review_path and os.path.exists(repre_review_path): review_path = repre_review_path if "burnin" in tags: # burnin has precedence if exists break From 6ab63823f02fb32edb367567943a9b38ba7cd9c2 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 21 Feb 2023 17:40:29 +0000 Subject: [PATCH 605/912] Implement get_multipart --- openpype/hosts/maya/api/lib_renderproducts.py | 82 ++++++++++++------- 1 file changed, 52 insertions(+), 30 deletions(-) diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py index 60090e9f6d..e635414029 100644 --- a/openpype/hosts/maya/api/lib_renderproducts.py +++ b/openpype/hosts/maya/api/lib_renderproducts.py @@ -196,12 +196,18 @@ class ARenderProducts: """Constructor.""" self.layer = layer self.render_instance = render_instance - self.multipart = False + self.multipart = self.get_multipart() # Initialize self.layer_data = self._get_layer_data() self.layer_data.products = self.get_render_products() + def get_multipart(self): + raise NotImplementedError( + "The render product implementation does not have a " + "\"get_multipart\" method." + ) + def has_camera_token(self): # type: () -> bool """Check if camera token is in image prefix. @@ -344,7 +350,6 @@ class ARenderProducts: separator = file_prefix[matches[0].end(1):matches[1].start(1)] return separator - def _get_layer_data(self): # type: () -> LayerMetadata # ______________________________________________ @@ -531,16 +536,20 @@ class RenderProductsArnold(ARenderProducts): return prefix - def _get_aov_render_products(self, aov, cameras=None): - """Return all render products for the AOV""" - - products = [] - aov_name = self._get_attr(aov, "name") + def get_multipart(self): multipart = False multilayer = bool(self._get_attr("defaultArnoldDriver.multipart")) merge_AOVs = bool(self._get_attr("defaultArnoldDriver.mergeAOVs")) if multilayer or merge_AOVs: multipart = True + + return multipart + + def _get_aov_render_products(self, aov, cameras=None): + """Return all render products for the AOV""" + + products = [] + aov_name = self._get_attr(aov, "name") ai_drivers = cmds.listConnections("{}.outputs".format(aov), source=True, destination=False, @@ -594,7 +603,7 @@ class RenderProductsArnold(ARenderProducts): ext=ext, aov=aov_name, driver=ai_driver, - multipart=multipart, + multipart=self.multipart, camera=camera) products.append(product) @@ -731,6 +740,14 @@ class RenderProductsVray(ARenderProducts): renderer = "vray" + def get_multipart(self): + multipart = False + image_format = self._get_attr("vraySettings.imageFormatStr") + if image_format == "exr (multichannel)": + multipart = True + + return multipart + def get_renderer_prefix(self): # type: () -> str """Get image prefix for V-Ray. @@ -797,11 +814,6 @@ class RenderProductsVray(ARenderProducts): if default_ext in {"exr (multichannel)", "exr (deep)"}: default_ext = "exr" - # Define multipart. - multipart = False - if image_format_str == "exr (multichannel)": - multipart = True - products = [] # add beauty as default when not disabled @@ -813,7 +825,7 @@ class RenderProductsVray(ARenderProducts): productName="", ext=default_ext, camera=camera, - multipart=multipart + multipart=self.multipart ) ) @@ -826,10 +838,10 @@ class RenderProductsVray(ARenderProducts): productName="Alpha", ext=default_ext, camera=camera, - multipart=multipart + multipart=self.multipart ) ) - if multipart: + if self.multipart: # AOVs are merged in m-channel file, only main layer is rendered return products @@ -989,6 +1001,19 @@ class RenderProductsRedshift(ARenderProducts): renderer = "redshift" unmerged_aovs = {"Cryptomatte"} + def get_multipart(self): + # For Redshift we don't directly return upon forcing multilayer + # due to some AOVs still being written into separate files, + # like Cryptomatte. + # AOVs are merged in multi-channel file + multipart = False + force_layer = bool(self._get_attr("redshiftOptions.exrForceMultilayer")) # noqa + exMultipart = bool(self._get_attr("redshiftOptions.exrMultipart")) + if exMultipart or force_layer: + multipart = True + + return multipart + def get_renderer_prefix(self): """Get image prefix for Redshift. @@ -1028,16 +1053,6 @@ class RenderProductsRedshift(ARenderProducts): for c in self.get_renderable_cameras() ] - # For Redshift we don't directly return upon forcing multilayer - # due to some AOVs still being written into separate files, - # like Cryptomatte. - # AOVs are merged in multi-channel file - multipart = False - force_layer = bool(self._get_attr("redshiftOptions.exrForceMultilayer")) # noqa - exMultipart = bool(self._get_attr("redshiftOptions.exrMultipart")) - if exMultipart or force_layer: - multipart = True - # Get Redshift Extension from image format image_format = self._get_attr("redshiftOptions.imageFormat") # integer ext = mel.eval("redshiftGetImageExtension(%i)" % image_format) @@ -1059,7 +1074,7 @@ class RenderProductsRedshift(ARenderProducts): continue aov_type = self._get_attr(aov, "aovType") - if multipart and aov_type not in self.unmerged_aovs: + if self.multipart and aov_type not in self.unmerged_aovs: continue # Any AOVs that still get processed, like Cryptomatte @@ -1094,7 +1109,7 @@ class RenderProductsRedshift(ARenderProducts): productName=aov_light_group_name, aov=aov_name, ext=ext, - multipart=multipart, + multipart=self.multipart, camera=camera) products.append(product) @@ -1108,7 +1123,7 @@ class RenderProductsRedshift(ARenderProducts): product = RenderProduct(productName=aov_name, aov=aov_name, ext=ext, - multipart=multipart, + multipart=self.multipart, camera=camera) products.append(product) @@ -1124,7 +1139,7 @@ class RenderProductsRedshift(ARenderProducts): products.insert(0, RenderProduct(productName=beauty_name, ext=ext, - multipart=multipart, + multipart=self.multipart, camera=camera)) return products @@ -1144,6 +1159,10 @@ class RenderProductsRenderman(ARenderProducts): renderer = "renderman" unmerged_aovs = {"PxrCryptomatte"} + def get_multipart(self): + # Implemented as display specific in "get_render_products". + return False + def get_render_products(self): """Get all AOVs. @@ -1283,6 +1302,9 @@ class RenderProductsMayaHardware(ARenderProducts): {"label": "EXR(exr)", "index": 40, "extension": "exr"} ] + def get_multipart(self): + return False + def _get_extension(self, value): result = None if isinstance(value, int): From d9499d5750c42fc324335f4e7354564ffa7bba0c Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 22 Feb 2023 18:00:11 +0000 Subject: [PATCH 606/912] Fix Redshift expected files. --- openpype/hosts/maya/api/lib_renderproducts.py | 26 +++++++++++++++---- .../maya/plugins/publish/collect_render.py | 7 ++++- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py index e635414029..4e9e13d2a3 100644 --- a/openpype/hosts/maya/api/lib_renderproducts.py +++ b/openpype/hosts/maya/api/lib_renderproducts.py @@ -1001,6 +1001,20 @@ class RenderProductsRedshift(ARenderProducts): renderer = "redshift" unmerged_aovs = {"Cryptomatte"} + def get_files(self, product): + # When outputting AOVs we need to replace Redshift specific AOV tokens + # with Maya render tokens for generating file sequences. We validate to + # a specific AOV fileprefix so we only need to accout for one + # replacement. + if not product.multipart and product.driver: + file_prefix = self._get_attr(product.driver + ".filePrefix") + self.layer_data.filePrefix = file_prefix.replace( + "/", + "//" + ) + + return super(RenderProductsRedshift, self).get_files(product) + def get_multipart(self): # For Redshift we don't directly return upon forcing multilayer # due to some AOVs still being written into separate files, @@ -1009,7 +1023,7 @@ class RenderProductsRedshift(ARenderProducts): multipart = False force_layer = bool(self._get_attr("redshiftOptions.exrForceMultilayer")) # noqa exMultipart = bool(self._get_attr("redshiftOptions.exrMultipart")) - if exMultipart or force_layer: + if exMultipart and force_layer: multipart = True return multipart @@ -1109,8 +1123,9 @@ class RenderProductsRedshift(ARenderProducts): productName=aov_light_group_name, aov=aov_name, ext=ext, - multipart=self.multipart, - camera=camera) + multipart=False, + camera=camera, + driver=aov) products.append(product) if light_groups: @@ -1123,8 +1138,9 @@ class RenderProductsRedshift(ARenderProducts): product = RenderProduct(productName=aov_name, aov=aov_name, ext=ext, - multipart=self.multipart, - camera=camera) + multipart=False, + camera=camera, + driver=aov) products.append(product) # When a Beauty AOV is added manually, it will be rendered as diff --git a/openpype/hosts/maya/plugins/publish/collect_render.py b/openpype/hosts/maya/plugins/publish/collect_render.py index f2b5262187..338f148f85 100644 --- a/openpype/hosts/maya/plugins/publish/collect_render.py +++ b/openpype/hosts/maya/plugins/publish/collect_render.py @@ -42,6 +42,7 @@ Provides: import re import os import platform +import json from maya import cmds import maya.app.renderSetup.model.renderSetup as renderSetup @@ -183,7 +184,11 @@ class CollectMayaRender(pyblish.api.ContextPlugin): self.log.info("multipart: {}".format( multipart)) assert exp_files, "no file names were generated, this is bug" - self.log.info(exp_files) + self.log.info( + "expected files: {}".format( + json.dumps(exp_files, indent=4, sort_keys=True) + ) + ) # if we want to attach render to subset, check if we have AOV's # in expectedFiles. If so, raise error as we cannot attach AOV From 52238488f331781525118e83130394ec20ca1d1c Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 23 Feb 2023 09:20:25 +0000 Subject: [PATCH 607/912] Only use force options as multipart identifier. --- openpype/hosts/maya/api/lib_renderproducts.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py index 4e9e13d2a3..02e55601b9 100644 --- a/openpype/hosts/maya/api/lib_renderproducts.py +++ b/openpype/hosts/maya/api/lib_renderproducts.py @@ -1021,9 +1021,10 @@ class RenderProductsRedshift(ARenderProducts): # like Cryptomatte. # AOVs are merged in multi-channel file multipart = False - force_layer = bool(self._get_attr("redshiftOptions.exrForceMultilayer")) # noqa - exMultipart = bool(self._get_attr("redshiftOptions.exrMultipart")) - if exMultipart and force_layer: + force_layer = bool( + self._get_attr("redshiftOptions.exrForceMultilayer") + ) + if force_layer: multipart = True return multipart From 3724c86c185f86d1271eb9c5c98c7f1e302a7baf Mon Sep 17 00:00:00 2001 From: Toke Jepsen Date: Thu, 23 Feb 2023 11:53:55 +0000 Subject: [PATCH 608/912] Update openpype/hosts/maya/api/lib_renderproducts.py --- openpype/hosts/maya/api/lib_renderproducts.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py index 02e55601b9..463324284b 100644 --- a/openpype/hosts/maya/api/lib_renderproducts.py +++ b/openpype/hosts/maya/api/lib_renderproducts.py @@ -1320,6 +1320,7 @@ class RenderProductsMayaHardware(ARenderProducts): ] def get_multipart(self): + # MayaHardware does not support multipart EXRs. return False def _get_extension(self, value): From 09ccf1af77b3f05aec8d99469f526a13ce2bafca Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 31 Jan 2023 06:55:36 +0000 Subject: [PATCH 609/912] Batch script for running Openpype on Deadline. --- tools/openpype_console.bat | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tools/openpype_console.bat diff --git a/tools/openpype_console.bat b/tools/openpype_console.bat new file mode 100644 index 0000000000..414b5fdf66 --- /dev/null +++ b/tools/openpype_console.bat @@ -0,0 +1,3 @@ +cd "%~dp0\.." +echo %OPENPYPE_MONGO% +.poetry\bin\poetry.exe run python start.py %* From e7017ff05b70ffbd4c3a6354d76a19f2c3d39a22 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Fri, 17 Feb 2023 16:25:35 +0000 Subject: [PATCH 610/912] Commenting for documentation --- tools/openpype_console.bat | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/openpype_console.bat b/tools/openpype_console.bat index 414b5fdf66..04b28c389f 100644 --- a/tools/openpype_console.bat +++ b/tools/openpype_console.bat @@ -1,3 +1,15 @@ +goto comment +SYNOPSIS + Helper script running scripts through the OpenPype environment. + +DESCRIPTION + This script is usually used as a replacement for building when tested farm integration like Deadline. + +EXAMPLE + +cmd> .\openpype_console.bat path/to/python_script.py +:comment + cd "%~dp0\.." echo %OPENPYPE_MONGO% .poetry\bin\poetry.exe run python start.py %* From b387441ad67a1d12a012c8bc8bc9f32d2d08ce94 Mon Sep 17 00:00:00 2001 From: Fabia Serra Arrizabalaga Date: Thu, 23 Feb 2023 00:52:40 +0100 Subject: [PATCH 611/912] Move get_workfile_build_placeholder_plugins to NukeHost class as workfile template builder expects --- openpype/hosts/nuke/api/__init__.py | 3 --- openpype/hosts/nuke/api/pipeline.py | 13 ++++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/openpype/hosts/nuke/api/__init__.py b/openpype/hosts/nuke/api/__init__.py index 3b00ca9f6f..1af5ff365d 100644 --- a/openpype/hosts/nuke/api/__init__.py +++ b/openpype/hosts/nuke/api/__init__.py @@ -30,7 +30,6 @@ from .pipeline import ( parse_container, update_container, - get_workfile_build_placeholder_plugins, ) from .lib import ( INSTANCE_DATA_KNOB, @@ -79,8 +78,6 @@ __all__ = ( "parse_container", "update_container", - "get_workfile_build_placeholder_plugins", - "INSTANCE_DATA_KNOB", "ROOT_DATA_KNOB", "maintained_selection", diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index 6dec60d81a..d5289010cb 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -101,6 +101,12 @@ class NukeHost( def get_workfile_extensions(self): return file_extensions() + def get_workfile_build_placeholder_plugins(self): + return [ + NukePlaceholderLoadPlugin, + NukePlaceholderCreatePlugin + ] + def get_containers(self): return ls() @@ -200,13 +206,6 @@ def _show_workfiles(): host_tools.show_workfiles(parent=None, on_top=False) -def get_workfile_build_placeholder_plugins(): - return [ - NukePlaceholderLoadPlugin, - NukePlaceholderCreatePlugin - ] - - def _install_menu(): # uninstall original avalon menu main_window = get_main_window() From 6bf8b7b8ca3cc8961ba271f914fd0abdbcf5bda8 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 22 Feb 2023 15:40:55 +0100 Subject: [PATCH 612/912] improving deprecation --- openpype/hosts/nuke/api/lib.py | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index 0325838e78..b13c592fbf 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -214,8 +214,9 @@ def update_node_data(node, knobname, data): knob.setValue(knob_value) +@deprecated class Knobby(object): - """[DEPRICATED] For creating knob which it's type isn't + """[DEPRECATED] For creating knob which it's type isn't mapped in `create_knobs` Args: @@ -248,8 +249,9 @@ class Knobby(object): return " ".join(words) +@deprecated def create_knobs(data, tab=None): - """[DEPRICATED] Create knobs by data + """[DEPRECATED] Create knobs by data Depending on the type of each dict value and creates the correct Knob. @@ -342,8 +344,9 @@ def create_knobs(data, tab=None): return knobs +@deprecated def imprint(node, data, tab=None): - """[DEPRICATED] Store attributes with value on node + """[DEPRECATED] Store attributes with value on node Parse user data into Node knobs. Use `collections.OrderedDict` to ensure knob order. @@ -398,8 +401,9 @@ def imprint(node, data, tab=None): node.addKnob(knob) +@deprecated def add_publish_knob(node): - """[DEPRICATED] Add Publish knob to node + """[DEPRECATED] Add Publish knob to node Arguments: node (nuke.Node): nuke node to be processed @@ -416,8 +420,9 @@ def add_publish_knob(node): return node +@deprecated def set_avalon_knob_data(node, data=None, prefix="avalon:"): - """[DEPRICATED] Sets data into nodes's avalon knob + """[DEPRECATED] Sets data into nodes's avalon knob Arguments: node (nuke.Node): Nuke node to imprint with data, @@ -478,8 +483,9 @@ def set_avalon_knob_data(node, data=None, prefix="avalon:"): return node +@deprecated def get_avalon_knob_data(node, prefix="avalon:", create=True): - """[DEPRICATED] Gets a data from nodes's avalon knob + """[DEPRECATED] Gets a data from nodes's avalon knob Arguments: node (obj): Nuke node to search for data, @@ -521,8 +527,9 @@ def get_avalon_knob_data(node, prefix="avalon:", create=True): return data +@deprecated def fix_data_for_node_create(data): - """[DEPRICATED] Fixing data to be used for nuke knobs + """[DEPRECATED] Fixing data to be used for nuke knobs """ for k, v in data.items(): if isinstance(v, six.text_type): @@ -532,8 +539,9 @@ def fix_data_for_node_create(data): return data +@deprecated def add_write_node_legacy(name, **kwarg): - """[DEPRICATED] Adding nuke write node + """[DEPRECATED] Adding nuke write node Arguments: name (str): nuke node name kwarg (attrs): data for nuke knobs @@ -697,7 +705,7 @@ def get_nuke_imageio_settings(): @deprecated("openpype.hosts.nuke.api.lib.get_nuke_imageio_settings") def get_created_node_imageio_setting_legacy(nodeclass, creator, subset): - '''[DEPRICATED] Get preset data for dataflow (fileType, compression, bitDepth) + '''[DEPRECATED] Get preset data for dataflow (fileType, compression, bitDepth) ''' assert any([creator, nodeclass]), nuke.message( From ea23223977420a60168a922eaf4603f6fe7726b5 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 22 Feb 2023 17:21:17 +0100 Subject: [PATCH 613/912] Nuke: baking with multiple reposition nodes also with settings and defaults --- openpype/hosts/nuke/api/plugin.py | 96 ++++++++++++------- .../defaults/project_settings/nuke.json | 35 +++++++ .../schemas/schema_nuke_publish.json | 47 +++++++++ 3 files changed, 144 insertions(+), 34 deletions(-) diff --git a/openpype/hosts/nuke/api/plugin.py b/openpype/hosts/nuke/api/plugin.py index d3f8357f7d..5521db99c0 100644 --- a/openpype/hosts/nuke/api/plugin.py +++ b/openpype/hosts/nuke/api/plugin.py @@ -558,9 +558,7 @@ class ExporterReview(object): self.path_in = self.instance.data.get("path", None) self.staging_dir = self.instance.data["stagingDir"] self.collection = self.instance.data.get("collection", None) - self.data = dict({ - "representations": list() - }) + self.data = {"representations": []} def get_file_info(self): if self.collection: @@ -626,7 +624,7 @@ class ExporterReview(object): nuke_imageio = opnlib.get_nuke_imageio_settings() # TODO: this is only securing backward compatibility lets remove - # this once all projects's anotomy are updated to newer config + # this once all projects's anatomy are updated to newer config if "baking" in nuke_imageio.keys(): return nuke_imageio["baking"]["viewerProcess"] else: @@ -823,8 +821,41 @@ class ExporterReviewMov(ExporterReview): add_tags = [] self.publish_on_farm = farm read_raw = kwargs["read_raw"] + + # TODO: remove this when `reformat_nodes_config` + # is changed in settings reformat_node_add = kwargs["reformat_node_add"] reformat_node_config = kwargs["reformat_node_config"] + + # TODO: make this required in future + reformat_nodes_config = kwargs.get("reformat_nodes_config", {}) + + # TODO: remove this once deprecated is removed + # make sure only reformat_nodes_config is used in future + if reformat_node_add and reformat_nodes_config.get("enabled"): + self.log.warning( + "`reformat_node_add` is deprecated. " + "Please use only `reformat_nodes_config` instead.") + reformat_nodes_config = None + + # TODO: reformat code when backward compatibility is not needed + # warning if reformat_nodes_config is not set + if not reformat_nodes_config: + self.log.warning( + "Please set `reformat_nodes_config` in settings.") + self.log.warning( + "Using `reformat_node_config` instead.") + reformat_nodes_config = { + "enabled": reformat_node_add, + "reposition_nodes": [ + { + "node_class": "Reformat", + "knobs": reformat_node_config + } + ] + } + + bake_viewer_process = kwargs["bake_viewer_process"] bake_viewer_input_process_node = kwargs[ "bake_viewer_input_process"] @@ -846,7 +877,6 @@ class ExporterReviewMov(ExporterReview): subset = self.instance.data["subset"] self._temp_nodes[subset] = [] - # ---------- start nodes creation # Read node r_node = nuke.createNode("Read") @@ -860,44 +890,39 @@ class ExporterReviewMov(ExporterReview): if read_raw: r_node["raw"].setValue(1) - # connect - self._temp_nodes[subset].append(r_node) - self.previous_node = r_node - self.log.debug("Read... `{}`".format(self._temp_nodes[subset])) + # connect to Read node + self._shift_to_previous_node_and_temp(subset, r_node, "Read... `{}`") # add reformat node - if reformat_node_add: + if reformat_nodes_config["enabled"]: + reposition_nodes = reformat_nodes_config["reposition_nodes"] + for reposition_node in reposition_nodes: + node_class = reposition_node["node_class"] + knobs = reposition_node["knobs"] + node = nuke.createNode(node_class) + set_node_knobs_from_settings(node, knobs) + + # connect in order + self._connect_to_above_nodes( + node, subset, "Reposition node... `{}`" + ) # append reformated tag add_tags.append("reformated") - rf_node = nuke.createNode("Reformat") - set_node_knobs_from_settings(rf_node, reformat_node_config) - - # connect - rf_node.setInput(0, self.previous_node) - self._temp_nodes[subset].append(rf_node) - self.previous_node = rf_node - self.log.debug( - "Reformat... `{}`".format(self._temp_nodes[subset])) - # only create colorspace baking if toggled on if bake_viewer_process: if bake_viewer_input_process_node: # View Process node ipn = get_view_process_node() if ipn is not None: - # connect - ipn.setInput(0, self.previous_node) - self._temp_nodes[subset].append(ipn) - self.previous_node = ipn - self.log.debug( - "ViewProcess... `{}`".format( - self._temp_nodes[subset])) + # connect to ViewProcess node + self._connect_to_above_nodes(ipn, subset, "ViewProcess... `{}`") if not self.viewer_lut_raw: # OCIODisplay dag_node = nuke.createNode("OCIODisplay") + # assign display display, viewer = get_viewer_config_from_string( str(baking_view_profile) ) @@ -907,13 +932,7 @@ class ExporterReviewMov(ExporterReview): # assign viewer dag_node["view"].setValue(viewer) - # connect - dag_node.setInput(0, self.previous_node) - self._temp_nodes[subset].append(dag_node) - self.previous_node = dag_node - self.log.debug("OCIODisplay... `{}`".format( - self._temp_nodes[subset])) - + self._connect_to_above_nodes(dag_node, subset, "OCIODisplay... `{}`") # Write node write_node = nuke.createNode("Write") self.log.debug("Path: {}".format(self.path)) @@ -967,6 +986,15 @@ class ExporterReviewMov(ExporterReview): return self.data + def _shift_to_previous_node_and_temp(self, subset, node, message): + self._temp_nodes[subset].append(node) + self.previous_node = node + self.log.debug(message.format(self._temp_nodes[subset])) + + def _connect_to_above_nodes(self, node, subset, message): + node.setInput(0, self.previous_node) + self._shift_to_previous_node_and_temp(subset, node, message) + @deprecated("openpype.hosts.nuke.api.plugin.NukeWriteCreator") class AbstractWriteRender(OpenPypeCreator): diff --git a/openpype/settings/defaults/project_settings/nuke.json b/openpype/settings/defaults/project_settings/nuke.json index d475c337d9..2545411e0a 100644 --- a/openpype/settings/defaults/project_settings/nuke.json +++ b/openpype/settings/defaults/project_settings/nuke.json @@ -446,6 +446,41 @@ "value": false } ], + "reformat_nodes_config": { + "enabled": false, + "reposition_nodes": [ + { + "node_class": "Reformat", + "knobs": [ + { + "type": "text", + "name": "type", + "value": "to format" + }, + { + "type": "text", + "name": "format", + "value": "HD_1080" + }, + { + "type": "text", + "name": "filter", + "value": "Lanczos6" + }, + { + "type": "bool", + "name": "black_outside", + "value": true + }, + { + "type": "bool", + "name": "pbb", + "value": false + } + ] + } + ] + }, "extension": "mov", "add_custom_tags": [] } diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json index 5b9145e7d9..1c542279fc 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json @@ -271,6 +271,10 @@ { "type": "separator" }, + { + "type": "label", + "label": "Currently we are supporting also multiple reposition nodes.
Older single reformat node is still supported
and if it is activated then preference will
be on it. If you want to use multiple reformat
nodes then you need to disable single reformat
node and enable multiple Reformat nodes here." + }, { "type": "boolean", "key": "reformat_node_add", @@ -287,6 +291,49 @@ } ] }, + { + "key": "reformat_nodes_config", + "type": "dict", + "label": "Reformat Nodes", + "collapsible": true, + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "label", + "label": "Reposition knobs supported only.
You can add multiple reformat nodes
and set their knobs. Order of reformat
nodes is important. First reformat node
will be applied first and last reformat
node will be applied last." + }, + { + "key": "reposition_nodes", + "type": "list", + "label": "Reposition nodes", + "object_type": { + "type": "dict", + "children": [ + { + "key": "node_class", + "label": "Node class", + "type": "text" + }, + { + "type": "schema_template", + "name": "template_nuke_knob_inputs", + "template_data": [ + { + "label": "Node knobs", + "key": "knobs" + } + ] + } + ] + } + } + ] + }, { "type": "separator" }, From 15fa8f551c3131b8019e81d46a3f0ab976bf9a63 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 23 Feb 2023 10:57:00 +0100 Subject: [PATCH 614/912] little fixes --- openpype/hosts/nuke/api/lib.py | 9 +++------ openpype/hosts/nuke/api/plugin.py | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index b13c592fbf..73d4986b64 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -214,7 +214,6 @@ def update_node_data(node, knobname, data): knob.setValue(knob_value) -@deprecated class Knobby(object): """[DEPRECATED] For creating knob which it's type isn't mapped in `create_knobs` @@ -249,9 +248,8 @@ class Knobby(object): return " ".join(words) -@deprecated def create_knobs(data, tab=None): - """[DEPRECATED] Create knobs by data + """Create knobs by data Depending on the type of each dict value and creates the correct Knob. @@ -344,9 +342,8 @@ def create_knobs(data, tab=None): return knobs -@deprecated def imprint(node, data, tab=None): - """[DEPRECATED] Store attributes with value on node + """Store attributes with value on node Parse user data into Node knobs. Use `collections.OrderedDict` to ensure knob order. @@ -1249,7 +1246,7 @@ def create_write_node( nodes to be created before write with dependency review (bool)[optional]: adding review knob farm (bool)[optional]: rendering workflow target - kwargs (dict)[optional]: additional key arguments for formating + kwargs (dict)[optional]: additional key arguments for formatting Example: prenodes = { diff --git a/openpype/hosts/nuke/api/plugin.py b/openpype/hosts/nuke/api/plugin.py index 5521db99c0..160ca820a4 100644 --- a/openpype/hosts/nuke/api/plugin.py +++ b/openpype/hosts/nuke/api/plugin.py @@ -842,9 +842,9 @@ class ExporterReviewMov(ExporterReview): # warning if reformat_nodes_config is not set if not reformat_nodes_config: self.log.warning( - "Please set `reformat_nodes_config` in settings.") - self.log.warning( - "Using `reformat_node_config` instead.") + "Please set `reformat_nodes_config` in settings. " + "Using `reformat_node_config` instead." + ) reformat_nodes_config = { "enabled": reformat_node_add, "reposition_nodes": [ From ca7bf70e1578f175712c1923683513391a5023e8 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 21 Feb 2023 11:47:32 +0100 Subject: [PATCH 615/912] nuke assist kickoff --- .../system_settings/applications.json | 128 ++++++++++++++++++ .../system_schema/schema_applications.json | 8 ++ 2 files changed, 136 insertions(+) diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json index f84d99e36b..5fd9b926fb 100644 --- a/openpype/settings/defaults/system_settings/applications.json +++ b/openpype/settings/defaults/system_settings/applications.json @@ -337,6 +337,134 @@ } } }, + "nukeassist": { + "enabled": true, + "label": "Nuke Assist", + "icon": "{}/app_icons/nuke.png", + "host_name": "nuke", + "environment": { + "NUKE_PATH": [ + "{NUKE_PATH}", + "{OPENPYPE_STUDIO_PLUGINS}/nuke" + ] + }, + "variants": { + "13-2": { + "use_python_2": false, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke13.2v1/Nuke13.2" + ] + }, + "arguments": { + "windows": ["--nukeassist"], + "darwin": ["--nukeassist"], + "linux": ["--nukeassist"] + }, + "environment": {} + }, + "13-0": { + "use_python_2": false, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke13.0v1/Nuke13.0" + ] + }, + "arguments": { + "windows": ["--nukeassist"], + "darwin": ["--nukeassist"], + "linux": ["--nukeassist"] + }, + "environment": {} + }, + "12-2": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke12.2v3Nuke12.2" + ] + }, + "arguments": { + "windows": ["--nukeassist"], + "darwin": ["--nukeassist"], + "linux": ["--nukeassist"] + }, + "environment": {} + }, + "12-0": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke12.0v1/Nuke12.0" + ] + }, + "arguments": { + "windows": ["--nukeassist"], + "darwin": ["--nukeassist"], + "linux": ["--nukeassist"] + }, + "environment": {} + }, + "11-3": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke11.3v5/Nuke11.3" + ] + }, + "arguments": { + "windows": ["--nukeassist"], + "darwin": ["--nukeassist"], + "linux": ["--nukeassist"] + }, + "environment": {} + }, + "11-2": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke11.2v2\\Nuke11.2.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": ["--nukeassist"], + "darwin": ["--nukeassist"], + "linux": ["--nukeassist"] + }, + "environment": {} + }, + "__dynamic_keys_labels__": { + "13-2": "13.2", + "13-0": "13.0", + "12-2": "12.2", + "12-0": "12.0", + "11-3": "11.3", + "11-2": "11.2" + } + } + }, "nukex": { "enabled": true, "label": "Nuke X", diff --git a/openpype/settings/entities/schemas/system_schema/schema_applications.json b/openpype/settings/entities/schemas/system_schema/schema_applications.json index 36c5811496..b17687cf71 100644 --- a/openpype/settings/entities/schemas/system_schema/schema_applications.json +++ b/openpype/settings/entities/schemas/system_schema/schema_applications.json @@ -25,6 +25,14 @@ "nuke_label": "Nuke" } }, + { + "type": "schema_template", + "name": "template_nuke", + "template_data": { + "nuke_type": "nukeassist", + "nuke_label": "Nuke Assist" + } + }, { "type": "schema_template", "name": "template_nuke", From 8777aa9859e66ecf52cc7cfebb0c1541e5e37785 Mon Sep 17 00:00:00 2001 From: ynput Date: Tue, 21 Feb 2023 14:23:26 +0200 Subject: [PATCH 616/912] adding appgroup to prelaunch hook --- openpype/hooks/pre_foundry_apps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hooks/pre_foundry_apps.py b/openpype/hooks/pre_foundry_apps.py index 85f68c6b60..2092d5025d 100644 --- a/openpype/hooks/pre_foundry_apps.py +++ b/openpype/hooks/pre_foundry_apps.py @@ -13,7 +13,7 @@ class LaunchFoundryAppsWindows(PreLaunchHook): # Should be as last hook because must change launch arguments to string order = 1000 - app_groups = ["nuke", "nukex", "hiero", "nukestudio"] + app_groups = ["nuke", "nukeassist", "nukex", "hiero", "nukestudio"] platforms = ["windows"] def execute(self): From 3c84b4195d6077ffc4abf51933359f2c69cec7a8 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 21 Feb 2023 13:39:02 +0100 Subject: [PATCH 617/912] adding nukeassist hook --- openpype/hosts/nuke/hooks/__init__.py | 0 openpype/hosts/nuke/hooks/pre_nukeassist_setup.py | 10 ++++++++++ 2 files changed, 10 insertions(+) create mode 100644 openpype/hosts/nuke/hooks/__init__.py create mode 100644 openpype/hosts/nuke/hooks/pre_nukeassist_setup.py diff --git a/openpype/hosts/nuke/hooks/__init__.py b/openpype/hosts/nuke/hooks/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py new file mode 100644 index 0000000000..80696c34e5 --- /dev/null +++ b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py @@ -0,0 +1,10 @@ +from openpype.lib import PreLaunchHook + +class PrelaunchNukeAssistHook(PreLaunchHook): + """ + Adding flag when nukeassist + """ + app_groups = ["nukeassist"] + + def execute(self): + self.launch_context.env["NUKEASSIST"] = True From 633738daa719e78a69e56391f7e46d0c1986a183 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 21 Feb 2023 13:56:17 +0100 Subject: [PATCH 618/912] adding hook to host --- openpype/hosts/nuke/addon.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/openpype/hosts/nuke/addon.py b/openpype/hosts/nuke/addon.py index 9d25afe2b6..6a4b91a76d 100644 --- a/openpype/hosts/nuke/addon.py +++ b/openpype/hosts/nuke/addon.py @@ -63,5 +63,12 @@ class NukeAddon(OpenPypeModule, IHostAddon): path_paths.append(quick_time_path) env["PATH"] = os.pathsep.join(path_paths) + def get_launch_hook_paths(self, app): + if app.host_name != self.host_name: + return [] + return [ + os.path.join(NUKE_ROOT_DIR, "hooks") + ] + def get_workfile_extensions(self): return [".nk"] From 6bb6aab0f96ac8903d38b93c529c5e7d8b349b6b Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 21 Feb 2023 14:54:51 +0100 Subject: [PATCH 619/912] adding menu assist variant conditions --- openpype/hosts/nuke/api/pipeline.py | 50 +++++++++++-------- openpype/hosts/nuke/hooks/__init__.py | 0 .../hosts/nuke/hooks/pre_nukeassist_setup.py | 2 +- 3 files changed, 30 insertions(+), 22 deletions(-) delete mode 100644 openpype/hosts/nuke/hooks/__init__.py diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index d5289010cb..306fa50de9 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -71,7 +71,7 @@ CREATE_PATH = os.path.join(PLUGINS_DIR, "create") INVENTORY_PATH = os.path.join(PLUGINS_DIR, "inventory") MENU_LABEL = os.environ["AVALON_LABEL"] - +ASSIST = bool(os.getenv("NUKEASSIST")) # registering pyblish gui regarding settings in presets if os.getenv("PYBLISH_GUI", None): @@ -207,6 +207,7 @@ def _show_workfiles(): def _install_menu(): + # uninstall original avalon menu main_window = get_main_window() menubar = nuke.menu("Nuke") @@ -217,7 +218,9 @@ def _install_menu(): ) Context.context_label = label context_action = menu.addCommand(label) - context_action.setEnabled(False) + + if not ASSIST: + context_action.setEnabled(False) menu.addSeparator() menu.addCommand( @@ -226,18 +229,20 @@ def _install_menu(): ) menu.addSeparator() - menu.addCommand( - "Create...", - lambda: host_tools.show_publisher( - tab="create" + if not ASSIST: + menu.addCommand( + "Create...", + lambda: host_tools.show_publisher( + tab="create" + ) ) - ) - menu.addCommand( - "Publish...", - lambda: host_tools.show_publisher( - tab="publish" + menu.addCommand( + "Publish...", + lambda: host_tools.show_publisher( + tab="publish" + ) ) - ) + menu.addCommand( "Load...", lambda: host_tools.show_loader( @@ -285,15 +290,18 @@ def _install_menu(): "Build Workfile from template", lambda: build_workfile_template() ) - menu_template.addSeparator() - menu_template.addCommand( - "Create Place Holder", - lambda: create_placeholder() - ) - menu_template.addCommand( - "Update Place Holder", - lambda: update_placeholder() - ) + + if not ASSIST: + menu_template.addSeparator() + menu_template.addCommand( + "Create Place Holder", + lambda: create_placeholder() + ) + menu_template.addCommand( + "Update Place Holder", + lambda: update_placeholder() + ) + menu.addSeparator() menu.addCommand( "Experimental tools...", diff --git a/openpype/hosts/nuke/hooks/__init__.py b/openpype/hosts/nuke/hooks/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py index 80696c34e5..054bd677a7 100644 --- a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py +++ b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py @@ -7,4 +7,4 @@ class PrelaunchNukeAssistHook(PreLaunchHook): app_groups = ["nukeassist"] def execute(self): - self.launch_context.env["NUKEASSIST"] = True + self.launch_context.env["NUKEASSIST"] = "1" From 3159facb2083a44785cd4fd1378993b167a57c45 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 21 Feb 2023 15:26:07 +0100 Subject: [PATCH 620/912] moving Assist switch to api level condition for updating nodes --- openpype/hosts/nuke/api/__init__.py | 7 ++++++- openpype/hosts/nuke/api/lib.py | 21 ++++++++++++--------- openpype/hosts/nuke/api/pipeline.py | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/openpype/hosts/nuke/api/__init__.py b/openpype/hosts/nuke/api/__init__.py index 1af5ff365d..7766a94140 100644 --- a/openpype/hosts/nuke/api/__init__.py +++ b/openpype/hosts/nuke/api/__init__.py @@ -1,3 +1,4 @@ +import os from .workio import ( file_extensions, has_unsaved_changes, @@ -50,6 +51,8 @@ from .utils import ( get_colorspace_list ) +ASSIST = bool(os.getenv("NUKEASSIST")) + __all__ = ( "file_extensions", "has_unsaved_changes", @@ -92,5 +95,7 @@ __all__ = ( "create_write_node", "colorspace_exists_on_node", - "get_colorspace_list" + "get_colorspace_list", + + "ASSIST" ) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index 73d4986b64..ec5bc58f9f 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -49,7 +49,7 @@ from openpype.pipeline.colorspace import ( ) from openpype.pipeline.workfile import BuildWorkfile -from . import gizmo_menu +from . import gizmo_menu, ASSIST from .workio import ( save_file, @@ -2263,14 +2263,17 @@ class WorkfileSettings(object): node['frame_range'].setValue(range) node['frame_range_lock'].setValue(True) - set_node_data( - self._root_node, - INSTANCE_DATA_KNOB, - { - "handleStart": int(handle_start), - "handleEnd": int(handle_end) - } - ) + if not ASSIST: + set_node_data( + self._root_node, + INSTANCE_DATA_KNOB, + { + "handleStart": int(handle_start), + "handleEnd": int(handle_end) + } + ) + else: + log.warning("NukeAssist mode is not allowing updating custom knobs...") def reset_resolution(self): """Set resolution to project resolution.""" diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index 306fa50de9..94c4518664 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -60,6 +60,7 @@ from .workio import ( work_root, current_file ) +from . import ASSIST log = Logger.get_logger(__name__) @@ -71,7 +72,6 @@ CREATE_PATH = os.path.join(PLUGINS_DIR, "create") INVENTORY_PATH = os.path.join(PLUGINS_DIR, "inventory") MENU_LABEL = os.environ["AVALON_LABEL"] -ASSIST = bool(os.getenv("NUKEASSIST")) # registering pyblish gui regarding settings in presets if os.getenv("PYBLISH_GUI", None): From 02b69f8ba84505c40d01f23048a0ad965a539b72 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 21 Feb 2023 16:06:39 +0100 Subject: [PATCH 621/912] moving ASSIST switch to utils --- openpype/hosts/nuke/api/__init__.py | 7 +------ openpype/hosts/nuke/api/lib.py | 3 ++- openpype/hosts/nuke/api/pipeline.py | 2 +- openpype/hosts/nuke/api/utils.py | 1 + 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/nuke/api/__init__.py b/openpype/hosts/nuke/api/__init__.py index 7766a94140..1af5ff365d 100644 --- a/openpype/hosts/nuke/api/__init__.py +++ b/openpype/hosts/nuke/api/__init__.py @@ -1,4 +1,3 @@ -import os from .workio import ( file_extensions, has_unsaved_changes, @@ -51,8 +50,6 @@ from .utils import ( get_colorspace_list ) -ASSIST = bool(os.getenv("NUKEASSIST")) - __all__ = ( "file_extensions", "has_unsaved_changes", @@ -95,7 +92,5 @@ __all__ = ( "create_write_node", "colorspace_exists_on_node", - "get_colorspace_list", - - "ASSIST" + "get_colorspace_list" ) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index ec5bc58f9f..dfc647872b 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -49,7 +49,8 @@ from openpype.pipeline.colorspace import ( ) from openpype.pipeline.workfile import BuildWorkfile -from . import gizmo_menu, ASSIST +from . import gizmo_menu +from .utils import ASSIST from .workio import ( save_file, diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index 94c4518664..55cb77bafe 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -60,7 +60,7 @@ from .workio import ( work_root, current_file ) -from . import ASSIST +from .utils import ASSIST log = Logger.get_logger(__name__) diff --git a/openpype/hosts/nuke/api/utils.py b/openpype/hosts/nuke/api/utils.py index 6bcb752dd1..261eba8401 100644 --- a/openpype/hosts/nuke/api/utils.py +++ b/openpype/hosts/nuke/api/utils.py @@ -4,6 +4,7 @@ import nuke from openpype import resources from .lib import maintained_selection +ASSIST = bool(os.getenv("NUKEASSIST")) def set_context_favorites(favorites=None): """ Adding favorite folders to nuke's browser From 888f436def036d0cddcbeb8b6f4340e641aa0f0c Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 21 Feb 2023 16:38:54 +0100 Subject: [PATCH 622/912] move ASSIST to constant --- openpype/hosts/nuke/api/constants.py | 4 ++++ openpype/hosts/nuke/api/lib.py | 2 +- openpype/hosts/nuke/api/pipeline.py | 2 +- openpype/hosts/nuke/api/utils.py | 1 - 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 openpype/hosts/nuke/api/constants.py diff --git a/openpype/hosts/nuke/api/constants.py b/openpype/hosts/nuke/api/constants.py new file mode 100644 index 0000000000..110199720f --- /dev/null +++ b/openpype/hosts/nuke/api/constants.py @@ -0,0 +1,4 @@ +import os + + +ASSIST = bool(os.getenv("NUKEASSIST")) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index dfc647872b..9e36fb147b 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -50,7 +50,7 @@ from openpype.pipeline.colorspace import ( from openpype.pipeline.workfile import BuildWorkfile from . import gizmo_menu -from .utils import ASSIST +from .constants import ASSIST from .workio import ( save_file, diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index 55cb77bafe..f07d150ba5 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -60,7 +60,7 @@ from .workio import ( work_root, current_file ) -from .utils import ASSIST +from .constants import ASSIST log = Logger.get_logger(__name__) diff --git a/openpype/hosts/nuke/api/utils.py b/openpype/hosts/nuke/api/utils.py index 261eba8401..6bcb752dd1 100644 --- a/openpype/hosts/nuke/api/utils.py +++ b/openpype/hosts/nuke/api/utils.py @@ -4,7 +4,6 @@ import nuke from openpype import resources from .lib import maintained_selection -ASSIST = bool(os.getenv("NUKEASSIST")) def set_context_favorites(favorites=None): """ Adding favorite folders to nuke's browser From a6bde83900e369c853cd79696431f79acae3215e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Je=C5=BEek?= Date: Wed, 22 Feb 2023 14:41:36 +0100 Subject: [PATCH 623/912] Update openpype/hosts/nuke/hooks/pre_nukeassist_setup.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- openpype/hosts/nuke/hooks/pre_nukeassist_setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py index 054bd677a7..3a0f00413a 100644 --- a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py +++ b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py @@ -8,3 +8,4 @@ class PrelaunchNukeAssistHook(PreLaunchHook): def execute(self): self.launch_context.env["NUKEASSIST"] = "1" + From 47c93bb12ac21de36c26595d9a5db2560098dd38 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 22 Feb 2023 14:44:22 +0100 Subject: [PATCH 624/912] removing line --- openpype/hosts/nuke/hooks/pre_nukeassist_setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py index 3a0f00413a..054bd677a7 100644 --- a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py +++ b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py @@ -8,4 +8,3 @@ class PrelaunchNukeAssistHook(PreLaunchHook): def execute(self): self.launch_context.env["NUKEASSIST"] = "1" - From 0a9e8265ed4f660eb3512455f222b8d31dae9871 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 22 Feb 2023 14:52:57 +0100 Subject: [PATCH 625/912] context label is not needed in nukeassist --- openpype/hosts/nuke/api/pipeline.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index f07d150ba5..4c0f169ade 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -207,22 +207,25 @@ def _show_workfiles(): def _install_menu(): + """Install Avalon menu into Nuke's main menu bar.""" # uninstall original avalon menu main_window = get_main_window() menubar = nuke.menu("Nuke") menu = menubar.addMenu(MENU_LABEL) - label = "{0}, {1}".format( - os.environ["AVALON_ASSET"], os.environ["AVALON_TASK"] - ) - Context.context_label = label - context_action = menu.addCommand(label) if not ASSIST: + label = "{0}, {1}".format( + os.environ["AVALON_ASSET"], os.environ["AVALON_TASK"] + ) + Context.context_label = label + context_action = menu.addCommand(label) context_action.setEnabled(False) - menu.addSeparator() + # add separator after context label + menu.addSeparator() + menu.addCommand( "Work Files...", _show_workfiles From c99b5fdb238bb345b1efeebc651afbbb338f77b7 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 22 Feb 2023 14:56:27 +0100 Subject: [PATCH 626/912] adding empty lines --- openpype/hosts/nuke/api/pipeline.py | 1 - openpype/hosts/nuke/hooks/pre_nukeassist_setup.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index 4c0f169ade..2496d66c1d 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -214,7 +214,6 @@ def _install_menu(): menubar = nuke.menu("Nuke") menu = menubar.addMenu(MENU_LABEL) - if not ASSIST: label = "{0}, {1}".format( os.environ["AVALON_ASSET"], os.environ["AVALON_TASK"] diff --git a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py index 054bd677a7..3948a665c6 100644 --- a/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py +++ b/openpype/hosts/nuke/hooks/pre_nukeassist_setup.py @@ -1,5 +1,6 @@ from openpype.lib import PreLaunchHook + class PrelaunchNukeAssistHook(PreLaunchHook): """ Adding flag when nukeassist From 36c5a91cb5f4615e736cb53c2a0a46883bbd2c0f Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 22 Feb 2023 14:59:30 +0100 Subject: [PATCH 627/912] hound comments --- openpype/hosts/nuke/api/lib.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index 9e36fb147b..c08db978d3 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -2274,7 +2274,10 @@ class WorkfileSettings(object): } ) else: - log.warning("NukeAssist mode is not allowing updating custom knobs...") + log.warning( + "NukeAssist mode is not allowing " + "updating custom knobs..." + ) def reset_resolution(self): """Set resolution to project resolution.""" From 68f0602975d8eea61fc56d7fd81a6cd777e42856 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Fri, 24 Feb 2023 12:45:00 +0800 Subject: [PATCH 628/912] resolve conflict --- openpype/hosts/maya/plugins/publish/extract_look.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/extract_look.py b/openpype/hosts/maya/plugins/publish/extract_look.py index ca110ceadd..efeddcfbe4 100644 --- a/openpype/hosts/maya/plugins/publish/extract_look.py +++ b/openpype/hosts/maya/plugins/publish/extract_look.py @@ -536,9 +536,10 @@ class ExtractLook(publish.Extractor): ] if linearize: if cmds.colorManagementPrefs(query=True, cmEnabled=True): - render_colorspace = cmds.colorManagementPrefs(query=True, renderingSpaceName=True) # noqa + render_colorspace = cmds.colorManagementPrefs(query=True, + renderingSpaceName=True) # noqa config_path = cmds.colorManagementPrefs(query=True, - configFilePath=True) + configFilePath=True) # noqa if not os.path.exists(config_path): raise RuntimeError("No OCIO config path found!") @@ -572,7 +573,7 @@ class ExtractLook(publish.Extractor): "is already linear") else: self.log.warning("cannot guess the colorspace" - "color conversion won't be available!") + "color conversion won't be available!") # noqa additional_args.extend(["--colorconfig", config_path]) From ffb4b64137b0ca91b9f51ea3c6f284c9b27f1887 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Fri, 24 Feb 2023 12:48:15 +0800 Subject: [PATCH 629/912] hound fix --- openpype/hosts/maya/api/lib.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index 71ca6b79c8..5e0f80818b 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -3577,8 +3577,8 @@ def image_info(file_path): dict: Dictionary with the information about the texture file. """ from arnold import ( - AiTextureGetBitDepth, - AiTextureGetFormat + AiTextureGetBitDepth, + AiTextureGetFormat ) # Get Texture Information img_info = {'filename': file_path} @@ -3603,11 +3603,11 @@ def guess_colorspace(img_info): option of maketx. """ from arnold import ( - AiTextureInvalidate, - # types - AI_TYPE_BYTE, - AI_TYPE_INT, - AI_TYPE_UINT + AiTextureInvalidate, + # types + AI_TYPE_BYTE, + AI_TYPE_INT, + AI_TYPE_UINT ) try: if img_info['bit_depth'] <= 16: From 8bbe10e18dfe88107a02a7f2fd1bebdb9d88fe51 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Fri, 24 Feb 2023 12:49:39 +0800 Subject: [PATCH 630/912] hound fix --- openpype/hosts/maya/api/lib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index 5e0f80818b..f3c0f068b8 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -3579,7 +3579,7 @@ def image_info(file_path): from arnold import ( AiTextureGetBitDepth, AiTextureGetFormat -) + ) # Get Texture Information img_info = {'filename': file_path} if os.path.isfile(file_path): @@ -3608,7 +3608,7 @@ def guess_colorspace(img_info): AI_TYPE_BYTE, AI_TYPE_INT, AI_TYPE_UINT -) + ) try: if img_info['bit_depth'] <= 16: if img_info['format'] in (AI_TYPE_BYTE, AI_TYPE_INT, AI_TYPE_UINT): # noqa From eae25bbf0b4dcf4b62bbdeab8d61ce9f4f82cfd9 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 23 Feb 2023 11:24:36 +0000 Subject: [PATCH 631/912] Publish user defined attributes option. --- .../maya/plugins/create/create_pointcache.py | 1 + .../maya/plugins/publish/collect_pointcache.py | 18 ++++++++++++++++++ .../maya/plugins/publish/extract_pointcache.py | 3 +-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/maya/plugins/create/create_pointcache.py b/openpype/hosts/maya/plugins/create/create_pointcache.py index 63c0490dc7..51eab94a1a 100644 --- a/openpype/hosts/maya/plugins/create/create_pointcache.py +++ b/openpype/hosts/maya/plugins/create/create_pointcache.py @@ -33,6 +33,7 @@ class CreatePointCache(plugin.Creator): self.data["refresh"] = False # Default to suspend refresh. # Add options for custom attributes + self.data["includeUserDefinedAttributes"] = True self.data["attr"] = "" self.data["attrPrefix"] = "" diff --git a/openpype/hosts/maya/plugins/publish/collect_pointcache.py b/openpype/hosts/maya/plugins/publish/collect_pointcache.py index 332992ca92..72aa37fc11 100644 --- a/openpype/hosts/maya/plugins/publish/collect_pointcache.py +++ b/openpype/hosts/maya/plugins/publish/collect_pointcache.py @@ -42,3 +42,21 @@ class CollectPointcache(pyblish.api.InstancePlugin): if proxy_set: instance.remove(proxy_set) instance.data["setMembers"].remove(proxy_set) + + # Collect user defined attributes. + if not instance.data.get("includeUserDefinedAttributes", False): + return + + all_nodes = ( + instance.data["setMembers"] + instance.data.get("proxy", []) + ) + user_defined_attributes = set() + for node in all_nodes: + attrs = cmds.listAttr(node, userDefined=True) or list() + shapes = cmds.listRelatives(node, shapes=True) or list() + for shape in shapes: + attrs.extend(cmds.listAttr(shape, userDefined=True) or list()) + + user_defined_attributes.update(attrs) + + instance.data["userDefinedAttributes"] = list(user_defined_attributes) diff --git a/openpype/hosts/maya/plugins/publish/extract_pointcache.py b/openpype/hosts/maya/plugins/publish/extract_pointcache.py index 0eb65e4226..8e794d4e17 100644 --- a/openpype/hosts/maya/plugins/publish/extract_pointcache.py +++ b/openpype/hosts/maya/plugins/publish/extract_pointcache.py @@ -39,8 +39,7 @@ class ExtractAlembic(publish.Extractor): start = float(instance.data.get("frameStartHandle", 1)) end = float(instance.data.get("frameEndHandle", 1)) - attrs = instance.data.get("attr", "").split(";") - attrs = [value for value in attrs if value.strip()] + attrs = instance.data.get("userDefinedAttributes", []) attrs += ["cbId"] attr_prefixes = instance.data.get("attrPrefix", "").split(";") From 80e19b6d430f239b95d8b14e9965ba3821e28867 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 23 Feb 2023 12:22:49 +0000 Subject: [PATCH 632/912] Include animation family --- .../maya/plugins/create/create_animation.py | 4 ++++ .../maya/plugins/publish/collect_animation.py | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/create/create_animation.py b/openpype/hosts/maya/plugins/create/create_animation.py index e54c12315c..a4b6e86598 100644 --- a/openpype/hosts/maya/plugins/create/create_animation.py +++ b/openpype/hosts/maya/plugins/create/create_animation.py @@ -13,6 +13,7 @@ class CreateAnimation(plugin.Creator): icon = "male" write_color_sets = False write_face_sets = False + include_user_defined_attributes = False def __init__(self, *args, **kwargs): super(CreateAnimation, self).__init__(*args, **kwargs) @@ -47,3 +48,6 @@ class CreateAnimation(plugin.Creator): # Default to write normals. self.data["writeNormals"] = True + + value = self.include_user_defined_attributes + self.data["includeUserDefinedAttributes"] = value diff --git a/openpype/hosts/maya/plugins/publish/collect_animation.py b/openpype/hosts/maya/plugins/publish/collect_animation.py index 549098863f..8f523f770b 100644 --- a/openpype/hosts/maya/plugins/publish/collect_animation.py +++ b/openpype/hosts/maya/plugins/publish/collect_animation.py @@ -46,7 +46,6 @@ class CollectAnimationOutputGeometry(pyblish.api.InstancePlugin): hierarchy = members + descendants - # Ignore certain node types (e.g. constraints) ignore = cmds.ls(hierarchy, type=self.ignore_type, long=True) if ignore: @@ -58,3 +57,18 @@ class CollectAnimationOutputGeometry(pyblish.api.InstancePlugin): if instance.data.get("farm"): instance.data["families"].append("publish.farm") + + # Collect user defined attributes. + if not instance.data.get("includeUserDefinedAttributes", False): + return + + user_defined_attributes = set() + for node in hierarchy: + attrs = cmds.listAttr(node, userDefined=True) or list() + shapes = cmds.listRelatives(node, shapes=True) or list() + for shape in shapes: + attrs.extend(cmds.listAttr(shape, userDefined=True) or list()) + + user_defined_attributes.update(attrs) + + instance.data["userDefinedAttributes"] = list(user_defined_attributes) From b12d1e9ff99f26435a167c6f17c9a9f9e2b79cdb Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 23 Feb 2023 12:23:10 +0000 Subject: [PATCH 633/912] Add project settings. --- .../hosts/maya/plugins/create/create_pointcache.py | 4 +++- openpype/settings/defaults/project_settings/maya.json | 2 ++ .../projects_schema/schemas/schema_maya_create.json | 10 ++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/create/create_pointcache.py b/openpype/hosts/maya/plugins/create/create_pointcache.py index 51eab94a1a..1b8d5e6850 100644 --- a/openpype/hosts/maya/plugins/create/create_pointcache.py +++ b/openpype/hosts/maya/plugins/create/create_pointcache.py @@ -15,6 +15,7 @@ class CreatePointCache(plugin.Creator): icon = "gears" write_color_sets = False write_face_sets = False + include_user_defined_attributes = False def __init__(self, *args, **kwargs): super(CreatePointCache, self).__init__(*args, **kwargs) @@ -33,7 +34,8 @@ class CreatePointCache(plugin.Creator): self.data["refresh"] = False # Default to suspend refresh. # Add options for custom attributes - self.data["includeUserDefinedAttributes"] = True + value = self.include_user_defined_attributes + self.data["includeUserDefinedAttributes"] = value self.data["attr"] = "" self.data["attrPrefix"] = "" diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index 32b141566b..2559448900 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -147,6 +147,7 @@ "enabled": true, "write_color_sets": false, "write_face_sets": false, + "include_user_defined_attributes": false, "defaults": [ "Main" ] @@ -165,6 +166,7 @@ "enabled": true, "write_color_sets": false, "write_face_sets": false, + "include_user_defined_attributes": false, "defaults": [ "Main" ] diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json index e1a3082616..77a39f692f 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json @@ -132,6 +132,11 @@ "key": "write_face_sets", "label": "Write Face Sets" }, + { + "type": "boolean", + "key": "include_user_defined_attributes", + "label": "Include User Defined Attributes" + }, { "type": "list", "key": "defaults", @@ -192,6 +197,11 @@ "key": "write_face_sets", "label": "Write Face Sets" }, + { + "type": "boolean", + "key": "include_user_defined_attributes", + "label": "Include User Defined Attributes" + }, { "type": "list", "key": "defaults", From ba927f068f115521d9a51564e1e3b7cb0f4a52e6 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 23 Feb 2023 15:39:15 +0000 Subject: [PATCH 634/912] BigRoy feedback --- openpype/hosts/maya/plugins/publish/collect_pointcache.py | 5 +---- openpype/hosts/maya/plugins/publish/extract_pointcache.py | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/collect_pointcache.py b/openpype/hosts/maya/plugins/publish/collect_pointcache.py index 72aa37fc11..d0430c5612 100644 --- a/openpype/hosts/maya/plugins/publish/collect_pointcache.py +++ b/openpype/hosts/maya/plugins/publish/collect_pointcache.py @@ -47,11 +47,8 @@ class CollectPointcache(pyblish.api.InstancePlugin): if not instance.data.get("includeUserDefinedAttributes", False): return - all_nodes = ( - instance.data["setMembers"] + instance.data.get("proxy", []) - ) user_defined_attributes = set() - for node in all_nodes: + for node in instance: attrs = cmds.listAttr(node, userDefined=True) or list() shapes = cmds.listRelatives(node, shapes=True) or list() for shape in shapes: diff --git a/openpype/hosts/maya/plugins/publish/extract_pointcache.py b/openpype/hosts/maya/plugins/publish/extract_pointcache.py index 8e794d4e17..e551858d48 100644 --- a/openpype/hosts/maya/plugins/publish/extract_pointcache.py +++ b/openpype/hosts/maya/plugins/publish/extract_pointcache.py @@ -39,7 +39,9 @@ class ExtractAlembic(publish.Extractor): start = float(instance.data.get("frameStartHandle", 1)) end = float(instance.data.get("frameEndHandle", 1)) - attrs = instance.data.get("userDefinedAttributes", []) + attrs = instance.data.get("attr", "").split(";") + attrs = [value for value in attrs if value.strip()] + attrs += instance.data.get("userDefinedAttributes", []) attrs += ["cbId"] attr_prefixes = instance.data.get("attrPrefix", "").split(";") From 421e24055b03d3c3a910ebf74e102ef5b6144f3b Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 23 Feb 2023 17:14:36 +0000 Subject: [PATCH 635/912] Documentation --- website/docs/artist_hosts_maya.md | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/website/docs/artist_hosts_maya.md b/website/docs/artist_hosts_maya.md index 9fab845e62..73bff286b9 100644 --- a/website/docs/artist_hosts_maya.md +++ b/website/docs/artist_hosts_maya.md @@ -314,10 +314,18 @@ Example setup: ![Maya - Point Cache Example](assets/maya-pointcache_setup.png) -:::note Publish on farm -If your studio has Deadline configured, artists could choose to offload potentially long running export of pointache and publish it to the farm. -Only thing that is necessary is to toggle `Farm` property in created pointcache instance to True. -::: +#### Options + +- **Frame Start**: which frame to start the export at. +- **Frame End**: which frame to end the export at. +- **Handle Start**: additional frames to export at frame start. Ei. frame start - handle start = export start. +- **Handle Start**: additional frames to export at frame end. Ei. frame end + handle end = export end. +- **Step**: frequency of sampling the export. For example when dealing with quick movements for motion blur, a step size of less than 1 might be better. +- **Refresh**: refresh the viewport when exporting the pointcache. For performance is best to leave off, but certain situations can require to refresh the viewport, for example using the Bullet plugin. +- **Attr**: specific attributes to publish separated by `;` +- **Include User Defined Attribudes**: include all user defined attributes in the publish. +- **Farm**: if your studio has Deadline configured, artists could choose to offload potentially long running export of pointache and publish it to the farm. Only thing that is necessary is to toggle this attribute in created pointcache instance to True. +- **Priority**: Farm priority. ### Loading Point Caches From aee263d24da72655d48942ee198cf95cd94054fc Mon Sep 17 00:00:00 2001 From: Toke Jepsen Date: Fri, 24 Feb 2023 08:56:52 +0000 Subject: [PATCH 636/912] Update website/docs/artist_hosts_maya.md --- website/docs/artist_hosts_maya.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/docs/artist_hosts_maya.md b/website/docs/artist_hosts_maya.md index 73bff286b9..c2100204b8 100644 --- a/website/docs/artist_hosts_maya.md +++ b/website/docs/artist_hosts_maya.md @@ -322,7 +322,8 @@ Example setup: - **Handle Start**: additional frames to export at frame end. Ei. frame end + handle end = export end. - **Step**: frequency of sampling the export. For example when dealing with quick movements for motion blur, a step size of less than 1 might be better. - **Refresh**: refresh the viewport when exporting the pointcache. For performance is best to leave off, but certain situations can require to refresh the viewport, for example using the Bullet plugin. -- **Attr**: specific attributes to publish separated by `;` +- **Attr**: specific attributes to publish separated by `;`. +- **AttrPrefix**: Prefix filter for determining which geometric attributes to write out, separated by `;`. - **Include User Defined Attribudes**: include all user defined attributes in the publish. - **Farm**: if your studio has Deadline configured, artists could choose to offload potentially long running export of pointache and publish it to the farm. Only thing that is necessary is to toggle this attribute in created pointcache instance to True. - **Priority**: Farm priority. From 30768de8502db34e2d03d2440262733e61002949 Mon Sep 17 00:00:00 2001 From: Toke Jepsen Date: Fri, 24 Feb 2023 10:15:01 +0000 Subject: [PATCH 637/912] Update website/docs/artist_hosts_maya.md Co-authored-by: Roy Nieterau --- website/docs/artist_hosts_maya.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/artist_hosts_maya.md b/website/docs/artist_hosts_maya.md index c2100204b8..07495fbc96 100644 --- a/website/docs/artist_hosts_maya.md +++ b/website/docs/artist_hosts_maya.md @@ -323,7 +323,7 @@ Example setup: - **Step**: frequency of sampling the export. For example when dealing with quick movements for motion blur, a step size of less than 1 might be better. - **Refresh**: refresh the viewport when exporting the pointcache. For performance is best to leave off, but certain situations can require to refresh the viewport, for example using the Bullet plugin. - **Attr**: specific attributes to publish separated by `;`. -- **AttrPrefix**: Prefix filter for determining which geometric attributes to write out, separated by `;`. +- **AttrPrefix**: specific attributes which start with this prefix to publish separated by `;`. - **Include User Defined Attribudes**: include all user defined attributes in the publish. - **Farm**: if your studio has Deadline configured, artists could choose to offload potentially long running export of pointache and publish it to the farm. Only thing that is necessary is to toggle this attribute in created pointcache instance to True. - **Priority**: Farm priority. From 90955e577900ad86072468f33cbf26af3b2a5116 Mon Sep 17 00:00:00 2001 From: Joseff Date: Wed, 25 Jan 2023 11:31:27 +0100 Subject: [PATCH 638/912] Refactored the generation of UE projects, plugin is now being installed in the engine. --- openpype/hosts/unreal/addon.py | 2 +- .../unreal/hooks/pre_workfile_preparation.py | 28 ++- .../UE_4.7/CommandletProject/.gitignore | 6 + .../CommandletProject.uproject | 12 + .../Config/DefaultEditor.ini | 0 .../Config/DefaultEngine.ini | 16 ++ .../CommandletProject/Config/DefaultGame.ini | 4 + .../UE_4.7/{ => OpenPype}/.gitignore | 0 .../Config/DefaultOpenPypeSettings.ini | 0 .../UE_4.7/OpenPype/Config/FilterPlugin.ini | 8 + .../Content/Python/init_unreal.py | 0 .../OpenPype}/OpenPype.uplugin | 4 +- .../UE_4.7/{ => OpenPype}/README.md | 0 .../{ => OpenPype}/Resources/openpype128.png | Bin .../{ => OpenPype}/Resources/openpype40.png | Bin .../{ => OpenPype}/Resources/openpype512.png | Bin .../Source/OpenPype/OpenPype.Build.cs | 5 +- .../OPGenerateProjectCommandlet.cpp | 140 +++++++++++ .../Private/Commandlets/OPActionResult.cpp | 41 ++++ .../OpenPype/Private/Logging/OP_Log.cpp | 1 + .../Source/OpenPype/Private/OpenPype.cpp | 42 ++-- .../Source/OpenPype/Private/OpenPypeLib.cpp | 0 .../Private/OpenPypePublishInstance.cpp | 4 +- .../OpenPypePublishInstanceFactory.cpp | 0 .../OpenPype/Private/OpenPypePythonBridge.cpp | 0 .../OpenPype/Private/OpenPypeSettings.cpp | 3 +- .../Source/OpenPype/Private/OpenPypeStyle.cpp | 3 +- .../OPGenerateProjectCommandlet.h | 60 +++++ .../Public/Commandlets/OPActionResult.h | 83 +++++++ .../Source/OpenPype/Public/Logging/OP_Log.h | 3 + .../Source/OpenPype/Public/OPConstants.h | 12 + .../Source/OpenPype/Public/OpenPype.h | 0 .../Source/OpenPype/Public/OpenPypeLib.h | 0 .../OpenPype/Public/OpenPypePublishInstance.h | 6 +- .../Public/OpenPypePublishInstanceFactory.h | 0 .../OpenPype/Public/OpenPypePythonBridge.h | 0 .../Source/OpenPype/Public/OpenPypeSettings.h | 1 - .../Source/OpenPype/Public/OpenPypeStyle.h | 0 .../OpenPype/Private/AssetContainer.cpp | 115 --------- .../Private/AssetContainerFactory.cpp | 20 -- .../Source/OpenPype/Public/AssetContainer.h | 39 --- .../OpenPype/Public/AssetContainerFactory.h | 21 -- .../UE_5.0/CommandletProject/.gitignore | 6 + .../CommandletProject.uproject | 20 ++ .../Config/DefaultEditor.ini | 0 .../Config/DefaultEngine.ini | 42 ++++ .../CommandletProject/Config/DefaultGame.ini | 4 + .../UE_5.0/{ => OpenPype}/.gitignore | 0 .../Config/DefaultOpenPypeSettings.ini | 0 .../UE_5.0/OpenPype/Config/FilterPlugin.ini | 8 + .../Content/Python/init_unreal.py | 0 .../OpenPype}/OpenPype.uplugin | 1 + .../UE_5.0/{ => OpenPype}/README.md | 0 .../{ => OpenPype}/Resources/openpype128.png | Bin .../{ => OpenPype}/Resources/openpype40.png | Bin .../{ => OpenPype}/Resources/openpype512.png | Bin .../Source/OpenPype/OpenPype.Build.cs | 5 +- .../OPGenerateProjectCommandlet.cpp | 140 +++++++++++ .../Private/Commandlets/OPActionResult.cpp | 41 ++++ .../OpenPype/Private/Logging/OP_Log.cpp | 1 + .../Source/OpenPype/Private/OpenPype.cpp | 0 .../OpenPype/Private/OpenPypeCommands.cpp | 0 .../Source/OpenPype/Private/OpenPypeLib.cpp | 0 .../Private/OpenPypePublishInstance.cpp | 2 +- .../OpenPypePublishInstanceFactory.cpp | 0 .../OpenPype/Private/OpenPypePythonBridge.cpp | 0 .../OpenPype/Private/OpenPypeSettings.cpp | 0 .../Source/OpenPype/Private/OpenPypeStyle.cpp | 0 .../OPGenerateProjectCommandlet.h | 60 +++++ .../Public/Commandlets/OPActionResult.h | 83 +++++++ .../Source/OpenPype/Public/Logging/OP_Log.h | 3 + .../Source/OpenPype/Public/OPConstants.h | 12 + .../Source/OpenPype/Public/OpenPype.h | 0 .../Source/OpenPype/Public/OpenPypeCommands.h | 0 .../Source/OpenPype/Public/OpenPypeLib.h | 0 .../OpenPype/Public/OpenPypePublishInstance.h | 6 +- .../Public/OpenPypePublishInstanceFactory.h | 0 .../OpenPype/Public/OpenPypePythonBridge.h | 0 .../Source/OpenPype/Public/OpenPypeSettings.h | 0 .../Source/OpenPype/Public/OpenPypeStyle.h | 0 .../OpenPype/Private/AssetContainer.cpp | 115 --------- .../Private/AssetContainerFactory.cpp | 20 -- .../Source/OpenPype/Public/AssetContainer.h | 39 --- .../OpenPype/Public/AssetContainerFactory.h | 21 -- openpype/hosts/unreal/lib.py | 230 +++++++++++++----- 85 files changed, 1029 insertions(+), 509 deletions(-) create mode 100644 openpype/hosts/unreal/integration/UE_4.7/CommandletProject/.gitignore create mode 100644 openpype/hosts/unreal/integration/UE_4.7/CommandletProject/CommandletProject.uproject create mode 100644 openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultEditor.ini create mode 100644 openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultEngine.ini create mode 100644 openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultGame.ini rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/.gitignore (100%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Config/DefaultOpenPypeSettings.ini (100%) create mode 100644 openpype/hosts/unreal/integration/UE_4.7/OpenPype/Config/FilterPlugin.ini rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Content/Python/init_unreal.py (100%) rename openpype/hosts/unreal/integration/{UE_5.0 => UE_4.7/OpenPype}/OpenPype.uplugin (90%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/README.md (100%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Resources/openpype128.png (100%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Resources/openpype40.png (100%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Resources/openpype512.png (100%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Source/OpenPype/OpenPype.Build.cs (92%) create mode 100644 openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp create mode 100644 openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp create mode 100644 openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Source/OpenPype/Private/OpenPype.cpp (79%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Source/OpenPype/Private/OpenPypeLib.cpp (100%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Source/OpenPype/Private/OpenPypePublishInstance.cpp (98%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp (100%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Source/OpenPype/Private/OpenPypePythonBridge.cpp (100%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Source/OpenPype/Private/OpenPypeSettings.cpp (91%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Source/OpenPype/Private/OpenPypeStyle.cpp (93%) create mode 100644 openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h create mode 100644 openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h create mode 100644 openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h create mode 100644 openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OPConstants.h rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Source/OpenPype/Public/OpenPype.h (100%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Source/OpenPype/Public/OpenPypeLib.h (100%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Source/OpenPype/Public/OpenPypePublishInstance.h (94%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h (100%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Source/OpenPype/Public/OpenPypePythonBridge.h (100%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Source/OpenPype/Public/OpenPypeSettings.h (97%) rename openpype/hosts/unreal/integration/UE_4.7/{ => OpenPype}/Source/OpenPype/Public/OpenPypeStyle.h (100%) delete mode 100644 openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/AssetContainer.cpp delete mode 100644 openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/AssetContainerFactory.cpp delete mode 100644 openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/AssetContainer.h delete mode 100644 openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/AssetContainerFactory.h create mode 100644 openpype/hosts/unreal/integration/UE_5.0/CommandletProject/.gitignore create mode 100644 openpype/hosts/unreal/integration/UE_5.0/CommandletProject/CommandletProject.uproject create mode 100644 openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultEditor.ini create mode 100644 openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultEngine.ini create mode 100644 openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultGame.ini rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/.gitignore (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Config/DefaultOpenPypeSettings.ini (100%) create mode 100644 openpype/hosts/unreal/integration/UE_5.0/OpenPype/Config/FilterPlugin.ini rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Content/Python/init_unreal.py (100%) rename openpype/hosts/unreal/integration/{UE_4.7 => UE_5.0/OpenPype}/OpenPype.uplugin (95%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/README.md (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Resources/openpype128.png (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Resources/openpype40.png (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Resources/openpype512.png (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/OpenPype.Build.cs (92%) create mode 100644 openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp create mode 100644 openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp create mode 100644 openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Private/OpenPype.cpp (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Private/OpenPypeCommands.cpp (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Private/OpenPypeLib.cpp (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Private/OpenPypePublishInstance.cpp (99%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Private/OpenPypePythonBridge.cpp (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Private/OpenPypeSettings.cpp (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Private/OpenPypeStyle.cpp (100%) create mode 100644 openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h create mode 100644 openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h create mode 100644 openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h create mode 100644 openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OPConstants.h rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Public/OpenPype.h (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Public/OpenPypeCommands.h (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Public/OpenPypeLib.h (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Public/OpenPypePublishInstance.h (94%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Public/OpenPypePythonBridge.h (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Public/OpenPypeSettings.h (100%) rename openpype/hosts/unreal/integration/UE_5.0/{ => OpenPype}/Source/OpenPype/Public/OpenPypeStyle.h (100%) delete mode 100644 openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/AssetContainer.cpp delete mode 100644 openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/AssetContainerFactory.cpp delete mode 100644 openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/AssetContainer.h delete mode 100644 openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/AssetContainerFactory.h diff --git a/openpype/hosts/unreal/addon.py b/openpype/hosts/unreal/addon.py index e2c8484651..c92a44870f 100644 --- a/openpype/hosts/unreal/addon.py +++ b/openpype/hosts/unreal/addon.py @@ -17,7 +17,7 @@ class UnrealAddon(OpenPypeModule, IHostAddon): ue_plugin = "UE_5.0" if app.name[:1] == "5" else "UE_4.7" unreal_plugin_path = os.path.join( - UNREAL_ROOT_DIR, "integration", ue_plugin + UNREAL_ROOT_DIR, "integration", ue_plugin, "OpenPype" ) if not env.get("OPENPYPE_UNREAL_PLUGIN"): env["OPENPYPE_UNREAL_PLUGIN"] = unreal_plugin_path diff --git a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py index 2dc6fb9f42..821018ba9d 100644 --- a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py +++ b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py @@ -119,29 +119,33 @@ class UnrealPrelaunchHook(PreLaunchHook): f"detected [ {engine_version} ]" )) - ue_path = unreal_lib.get_editor_executable_path( + ue_path = unreal_lib.get_editor_exe_path( Path(detected[engine_version]), engine_version) self.launch_context.launch_args = [ue_path.as_posix()] project_path.mkdir(parents=True, exist_ok=True) + # Set "OPENPYPE_UNREAL_PLUGIN" to current process environment for + # execution of `create_unreal_project` + if self.launch_context.env.get("OPENPYPE_UNREAL_PLUGIN"): + self.log.info(( + f"{self.signature} using OpenPype plugin from " + f"{self.launch_context.env.get('OPENPYPE_UNREAL_PLUGIN')}" + )) + env_key = "OPENPYPE_UNREAL_PLUGIN" + if self.launch_context.env.get(env_key): + os.environ[env_key] = self.launch_context.env[env_key] + + engine_path = detected[engine_version] + + unreal_lib.try_installing_plugin(Path(engine_path), engine_version) + project_file = project_path / unreal_project_filename if not project_file.is_file(): - engine_path = detected[engine_version] self.log.info(( f"{self.signature} creating unreal " f"project [ {unreal_project_name} ]" )) - # Set "OPENPYPE_UNREAL_PLUGIN" to current process environment for - # execution of `create_unreal_project` - if self.launch_context.env.get("OPENPYPE_UNREAL_PLUGIN"): - self.log.info(( - f"{self.signature} using OpenPype plugin from " - f"{self.launch_context.env.get('OPENPYPE_UNREAL_PLUGIN')}" - )) - env_key = "OPENPYPE_UNREAL_PLUGIN" - if self.launch_context.env.get(env_key): - os.environ[env_key] = self.launch_context.env[env_key] unreal_lib.create_unreal_project( unreal_project_name, diff --git a/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/.gitignore b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/.gitignore new file mode 100644 index 0000000000..1004610e4f --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/.gitignore @@ -0,0 +1,6 @@ +/Saved +/DerivedDataCache +/Intermediate +/Binaries +/.idea +/.vs \ No newline at end of file diff --git a/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/CommandletProject.uproject b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/CommandletProject.uproject new file mode 100644 index 0000000000..4d75e03bf3 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/CommandletProject.uproject @@ -0,0 +1,12 @@ +{ + "FileVersion": 3, + "EngineAssociation": "4.27", + "Category": "", + "Description": "", + "Plugins": [ + { + "Name": "OpenPype", + "Enabled": true + } + ] +} \ No newline at end of file diff --git a/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultEditor.ini b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultEditor.ini new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultEngine.ini b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultEngine.ini new file mode 100644 index 0000000000..2845baccca --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultEngine.ini @@ -0,0 +1,16 @@ + + +[/Script/EngineSettings.GameMapsSettings] +GameDefaultMap=/Engine/Maps/Templates/Template_Default.Template_Default + + +[/Script/HardwareTargeting.HardwareTargetingSettings] +TargetedHardwareClass=Desktop +AppliedTargetedHardwareClass=Desktop +DefaultGraphicsPerformance=Maximum +AppliedDefaultGraphicsPerformance=Maximum + +[/Script/Engine.Engine] ++ActiveGameNameRedirects=(OldGameName="TP_BlankBP",NewGameName="/Script/CommandletProject") ++ActiveGameNameRedirects=(OldGameName="/Script/TP_BlankBP",NewGameName="/Script/CommandletProject") + diff --git a/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultGame.ini b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultGame.ini new file mode 100644 index 0000000000..40956de961 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultGame.ini @@ -0,0 +1,4 @@ + + +[/Script/EngineSettings.GeneralProjectSettings] +ProjectID=95AED0BF45A918DF73ABB3BB27D25356 diff --git a/openpype/hosts/unreal/integration/UE_4.7/.gitignore b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/.gitignore similarity index 100% rename from openpype/hosts/unreal/integration/UE_4.7/.gitignore rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/.gitignore diff --git a/openpype/hosts/unreal/integration/UE_4.7/Config/DefaultOpenPypeSettings.ini b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Config/DefaultOpenPypeSettings.ini similarity index 100% rename from openpype/hosts/unreal/integration/UE_4.7/Config/DefaultOpenPypeSettings.ini rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Config/DefaultOpenPypeSettings.ini diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Config/FilterPlugin.ini b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Config/FilterPlugin.ini new file mode 100644 index 0000000000..ccebca2f32 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Config/FilterPlugin.ini @@ -0,0 +1,8 @@ +[FilterPlugin] +; This section lists additional files which will be packaged along with your plugin. Paths should be listed relative to the root plugin directory, and +; may include "...", "*", and "?" wildcards to match directories, files, and individual characters respectively. +; +; Examples: +; /README.txt +; /Extras/... +; /Binaries/ThirdParty/*.dll diff --git a/openpype/hosts/unreal/integration/UE_4.7/Content/Python/init_unreal.py b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Content/Python/init_unreal.py similarity index 100% rename from openpype/hosts/unreal/integration/UE_4.7/Content/Python/init_unreal.py rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Content/Python/init_unreal.py diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype.uplugin b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/OpenPype.uplugin similarity index 90% rename from openpype/hosts/unreal/integration/UE_5.0/OpenPype.uplugin rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/OpenPype.uplugin index 4c7a74403c..23155cb74d 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype.uplugin +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/OpenPype.uplugin @@ -10,10 +10,10 @@ "DocsURL": "https://openpype.io/docs/artist_hosts_unreal", "MarketplaceURL": "", "SupportURL": "https://pype.club/", + "EngineVersion": "4.27", "CanContainContent": true, "IsBetaVersion": true, - "IsExperimentalVersion": false, - "Installed": false, + "Installed": true, "Modules": [ { "Name": "OpenPype", diff --git a/openpype/hosts/unreal/integration/UE_4.7/README.md b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/README.md similarity index 100% rename from openpype/hosts/unreal/integration/UE_4.7/README.md rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/README.md diff --git a/openpype/hosts/unreal/integration/UE_4.7/Resources/openpype128.png b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Resources/openpype128.png similarity index 100% rename from openpype/hosts/unreal/integration/UE_4.7/Resources/openpype128.png rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Resources/openpype128.png diff --git a/openpype/hosts/unreal/integration/UE_4.7/Resources/openpype40.png b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Resources/openpype40.png similarity index 100% rename from openpype/hosts/unreal/integration/UE_4.7/Resources/openpype40.png rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Resources/openpype40.png diff --git a/openpype/hosts/unreal/integration/UE_4.7/Resources/openpype512.png b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Resources/openpype512.png similarity index 100% rename from openpype/hosts/unreal/integration/UE_4.7/Resources/openpype512.png rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Resources/openpype512.png diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/OpenPype.Build.cs b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/OpenPype.Build.cs similarity index 92% rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/OpenPype.Build.cs rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/OpenPype.Build.cs index 46e5dcb2df..13afb11003 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/OpenPype.Build.cs +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/OpenPype.Build.cs @@ -6,8 +6,8 @@ public class OpenPype : ModuleRules { public OpenPype(ReadOnlyTargetRules Target) : base(Target) { - PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs; - + PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; + PublicIncludePaths.AddRange( new string[] { // ... add public include paths required here ... @@ -34,6 +34,7 @@ public class OpenPype : ModuleRules PrivateDependencyModuleNames.AddRange( new string[] { + "GameProjectGeneration", "Projects", "InputCore", "UnrealEd", diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp new file mode 100644 index 0000000000..024a6097b3 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp @@ -0,0 +1,140 @@ +#include "Commandlets/Implementations/OPGenerateProjectCommandlet.h" + +#include "Editor.h" +#include "GameProjectUtils.h" +#include "OPConstants.h" +#include "Commandlets/OPActionResult.h" +#include "ProjectDescriptor.h" + +int32 UOPGenerateProjectCommandlet::Main(const FString& CommandLineParams) +{ + //Parses command line parameters & creates structure FProjectInformation + const FOPGenerateProjectParams ParsedParams = FOPGenerateProjectParams(CommandLineParams); + ProjectInformation = ParsedParams.GenerateUEProjectInformation(); + + //Creates .uproject & other UE files + EVALUATE_OP_ACTION_RESULT(TryCreateProject()); + + //Loads created .uproject + EVALUATE_OP_ACTION_RESULT(TryLoadProjectDescriptor()); + + //Adds needed plugin to .uproject + AttachPluginsToProjectDescriptor(); + + //Saves .uproject + EVALUATE_OP_ACTION_RESULT(TrySave()); + + //When we are here, there should not be problems in generating Unreal Project for OpenPype + return 0; +} + + +FOPGenerateProjectParams::FOPGenerateProjectParams(): FOPGenerateProjectParams("") +{ +} + +FOPGenerateProjectParams::FOPGenerateProjectParams(const FString& CommandLineParams): CommandLineParams( + CommandLineParams) +{ + UCommandlet::ParseCommandLine(*CommandLineParams, Tokens, Switches); +} + +FProjectInformation FOPGenerateProjectParams::GenerateUEProjectInformation() const +{ + FProjectInformation ProjectInformation = FProjectInformation(); + ProjectInformation.ProjectFilename = GetProjectFileName(); + + ProjectInformation.bShouldGenerateCode = IsSwitchPresent("GenerateCode"); + + return ProjectInformation; +} + +FString FOPGenerateProjectParams::TryGetToken(const int32 Index) const +{ + return Tokens.IsValidIndex(Index) ? Tokens[Index] : ""; +} + +FString FOPGenerateProjectParams::GetProjectFileName() const +{ + return TryGetToken(0); +} + +bool FOPGenerateProjectParams::IsSwitchPresent(const FString& Switch) const +{ + return INDEX_NONE != Switches.IndexOfByPredicate([&Switch](const FString& Item) -> bool + { + return Item.Equals(Switch); + } + ); +} + + +UOPGenerateProjectCommandlet::UOPGenerateProjectCommandlet() +{ + LogToConsole = true; +} + +FOP_ActionResult UOPGenerateProjectCommandlet::TryCreateProject() const +{ + FText FailReason; + FText FailLog; + TArray OutCreatedFiles; + + if (!GameProjectUtils::CreateProject(ProjectInformation, FailReason, FailLog, &OutCreatedFiles)) + return FOP_ActionResult(EOP_ActionResult::ProjectNotCreated, FailReason); + return FOP_ActionResult(); +} + +FOP_ActionResult UOPGenerateProjectCommandlet::TryLoadProjectDescriptor() +{ + FText FailReason; + const bool bLoaded = ProjectDescriptor.Load(ProjectInformation.ProjectFilename, FailReason); + + return FOP_ActionResult(bLoaded ? EOP_ActionResult::Ok : EOP_ActionResult::ProjectNotLoaded, FailReason); +} + +void UOPGenerateProjectCommandlet::AttachPluginsToProjectDescriptor() +{ + FPluginReferenceDescriptor OPPluginDescriptor; + OPPluginDescriptor.bEnabled = true; + OPPluginDescriptor.Name = OPConstants::OP_PluginName; + ProjectDescriptor.Plugins.Add(OPPluginDescriptor); + + FPluginReferenceDescriptor PythonPluginDescriptor; + PythonPluginDescriptor.bEnabled = true; + PythonPluginDescriptor.Name = OPConstants::PythonScript_PluginName; + ProjectDescriptor.Plugins.Add(PythonPluginDescriptor); + + FPluginReferenceDescriptor SequencerScriptingPluginDescriptor; + SequencerScriptingPluginDescriptor.bEnabled = true; + SequencerScriptingPluginDescriptor.Name = OPConstants::SequencerScripting_PluginName; + ProjectDescriptor.Plugins.Add(SequencerScriptingPluginDescriptor); + + FPluginReferenceDescriptor MovieRenderPipelinePluginDescriptor; + MovieRenderPipelinePluginDescriptor.bEnabled = true; + MovieRenderPipelinePluginDescriptor.Name = OPConstants::MovieRenderPipeline_PluginName; + ProjectDescriptor.Plugins.Add(MovieRenderPipelinePluginDescriptor); + + FPluginReferenceDescriptor EditorScriptingPluginDescriptor; + EditorScriptingPluginDescriptor.bEnabled = true; + EditorScriptingPluginDescriptor.Name = OPConstants::EditorScriptingUtils_PluginName; + ProjectDescriptor.Plugins.Add(EditorScriptingPluginDescriptor); +} + +FOP_ActionResult UOPGenerateProjectCommandlet::TrySave() +{ + FText FailReason; + const bool bSaved = ProjectDescriptor.Save(ProjectInformation.ProjectFilename, FailReason); + + return FOP_ActionResult(bSaved ? EOP_ActionResult::Ok : EOP_ActionResult::ProjectNotSaved, FailReason); +} + +FOPGenerateProjectParams UOPGenerateProjectCommandlet::ParseParameters(const FString& Params) const +{ + FOPGenerateProjectParams ParamsResult; + + TArray Tokens, Switches; + ParseCommandLine(*Params, Tokens, Switches); + + return ParamsResult; +} diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp new file mode 100644 index 0000000000..9236fbb057 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp @@ -0,0 +1,41 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "Commandlets/OPActionResult.h" +#include "Logging/OP_Log.h" + +EOP_ActionResult::Type& FOP_ActionResult::GetStatus() +{ + return Status; +} + +FText& FOP_ActionResult::GetReason() +{ + return Reason; +} + +FOP_ActionResult::FOP_ActionResult():Status(EOP_ActionResult::Type::Ok) +{ + +} + +FOP_ActionResult::FOP_ActionResult(const EOP_ActionResult::Type& InEnum):Status(InEnum) +{ + TryLog(); +} + +FOP_ActionResult::FOP_ActionResult(const EOP_ActionResult::Type& InEnum, const FText& InReason):Status(InEnum), Reason(InReason) +{ + TryLog(); +}; + +bool FOP_ActionResult::IsProblem() const +{ + return Status != EOP_ActionResult::Ok; +} + +void FOP_ActionResult::TryLog() const +{ + if(IsProblem()) + UE_LOG(LogCommandletOPGenerateProject, Error, TEXT("%s"), *Reason.ToString()); +} diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp new file mode 100644 index 0000000000..29b1068c21 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp @@ -0,0 +1 @@ +#include "Logging/OP_Log.h" diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPype.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPype.cpp similarity index 79% rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPype.cpp rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPype.cpp index d06a08eb43..a510a5e3bf 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPype.cpp +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPype.cpp @@ -16,32 +16,34 @@ static const FName OpenPypeTabName("OpenPype"); // This function is triggered when the plugin is staring up void FOpenPypeModule::StartupModule() { - FOpenPypeStyle::Initialize(); - FOpenPypeStyle::SetIcon("Logo", "openpype40"); + if (!IsRunningCommandlet()) { + FOpenPypeStyle::Initialize(); + FOpenPypeStyle::SetIcon("Logo", "openpype40"); - // Create the Extender that will add content to the menu - FLevelEditorModule& LevelEditorModule = FModuleManager::LoadModuleChecked("LevelEditor"); + // Create the Extender that will add content to the menu + FLevelEditorModule& LevelEditorModule = FModuleManager::LoadModuleChecked("LevelEditor"); - TSharedPtr MenuExtender = MakeShareable(new FExtender()); - TSharedPtr ToolbarExtender = MakeShareable(new FExtender()); + TSharedPtr MenuExtender = MakeShareable(new FExtender()); + TSharedPtr ToolbarExtender = MakeShareable(new FExtender()); - MenuExtender->AddMenuExtension( - "LevelEditor", - EExtensionHook::After, - NULL, - FMenuExtensionDelegate::CreateRaw(this, &FOpenPypeModule::AddMenuEntry) - ); - ToolbarExtender->AddToolBarExtension( - "Settings", - EExtensionHook::After, - NULL, - FToolBarExtensionDelegate::CreateRaw(this, &FOpenPypeModule::AddToobarEntry)); + MenuExtender->AddMenuExtension( + "LevelEditor", + EExtensionHook::After, + NULL, + FMenuExtensionDelegate::CreateRaw(this, &FOpenPypeModule::AddMenuEntry) + ); + ToolbarExtender->AddToolBarExtension( + "Settings", + EExtensionHook::After, + NULL, + FToolBarExtensionDelegate::CreateRaw(this, &FOpenPypeModule::AddToobarEntry)); - LevelEditorModule.GetMenuExtensibilityManager()->AddExtender(MenuExtender); - LevelEditorModule.GetToolBarExtensibilityManager()->AddExtender(ToolbarExtender); + LevelEditorModule.GetMenuExtensibilityManager()->AddExtender(MenuExtender); + LevelEditorModule.GetToolBarExtensibilityManager()->AddExtender(ToolbarExtender); - RegisterSettings(); + RegisterSettings(); + } } void FOpenPypeModule::ShutdownModule() diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeLib.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp similarity index 100% rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeLib.cpp rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePublishInstance.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp similarity index 98% rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePublishInstance.cpp rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp index 38740f1cbd..424c4ed491 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePublishInstance.cpp +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp @@ -2,10 +2,10 @@ #include "OpenPypePublishInstance.h" #include "AssetRegistryModule.h" -#include "NotificationManager.h" #include "OpenPypeLib.h" #include "OpenPypeSettings.h" -#include "SNotificationList.h" +#include "Framework/Notifications/NotificationManager.h" +#include "Widgets/Notifications/SNotificationList.h" //Moves all the invalid pointers to the end to prepare them for the shrinking #define REMOVE_INVALID_ENTRIES(VAR) VAR.CompactStable(); \ diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp similarity index 100% rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePythonBridge.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp similarity index 100% rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePythonBridge.cpp rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeSettings.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp similarity index 91% rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeSettings.cpp rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp index 7134614d22..951b522308 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeSettings.cpp +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp @@ -2,8 +2,7 @@ #include "OpenPypeSettings.h" -#include "IPluginManager.h" -#include "UObjectGlobals.h" +#include "Interfaces/IPluginManager.h" /** * Mainly is used for initializing default values if the DefaultOpenPypeSettings.ini file does not exist in the saved config diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeStyle.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp similarity index 93% rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeStyle.cpp rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp index a51c2d6aa5..b7abc38156 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeStyle.cpp +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp @@ -43,7 +43,7 @@ const FVector2D Icon40x40(40.0f, 40.0f); TUniquePtr< FSlateStyleSet > FOpenPypeStyle::Create() { TUniquePtr< FSlateStyleSet > Style = MakeUnique(GetStyleSetName()); - Style->SetContentRoot(FPaths::ProjectPluginsDir() / TEXT("OpenPype/Resources")); + Style->SetContentRoot(FPaths::EnginePluginsDir() / TEXT("Marketplace/OpenPype/Resources")); return Style; } @@ -66,5 +66,4 @@ const ISlateStyle& FOpenPypeStyle::Get() { check(OpenPypeStyleInstance); return *OpenPypeStyleInstance; - return *OpenPypeStyleInstance; } diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h new file mode 100644 index 0000000000..8738de6d4a --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h @@ -0,0 +1,60 @@ +#pragma once + + +#include "GameProjectUtils.h" +#include "Commandlets/OPActionResult.h" +#include "ProjectDescriptor.h" +#include "Commandlets/Commandlet.h" +#include "OPGenerateProjectCommandlet.generated.h" + +struct FProjectDescriptor; +struct FProjectInformation; + +/** +* @brief Structure which parses command line parameters and generates FProjectInformation +*/ +USTRUCT() +struct FOPGenerateProjectParams +{ + GENERATED_BODY() + +private: + FString CommandLineParams; + TArray Tokens; + TArray Switches; + +public: + FOPGenerateProjectParams(); + FOPGenerateProjectParams(const FString& CommandLineParams); + + FProjectInformation GenerateUEProjectInformation() const; + +private: + FString TryGetToken(const int32 Index) const; + FString GetProjectFileName() const; + + bool IsSwitchPresent(const FString& Switch) const; +}; + +UCLASS() +class OPENPYPE_API UOPGenerateProjectCommandlet : public UCommandlet +{ + GENERATED_BODY() + +private: + FProjectInformation ProjectInformation; + FProjectDescriptor ProjectDescriptor; + +public: + UOPGenerateProjectCommandlet(); + + virtual int32 Main(const FString& CommandLineParams) override; + +private: + FOPGenerateProjectParams ParseParameters(const FString& Params) const; + FOP_ActionResult TryCreateProject() const; + FOP_ActionResult TryLoadProjectDescriptor(); + void AttachPluginsToProjectDescriptor(); + FOP_ActionResult TrySave(); +}; + diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h new file mode 100644 index 0000000000..f46ba9c62a --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h @@ -0,0 +1,83 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "OPActionResult.generated.h" + +/** + * @brief This macro returns error code when is problem or does nothing when there is no problem. + * @param ActionResult FOP_ActionResult structure + */ +#define EVALUATE_OP_ACTION_RESULT(ActionResult) \ + if(ActionResult.IsProblem()) \ + return ActionResult.GetStatus(); + +/** +* @brief This enum values are humanly readable mapping of error codes. +* Here should be all error codes to be possible find what went wrong. +* TODO: In the future should exists an web document where is mapped error code & what problem occured & how to repair it... +*/ +UENUM() +namespace EOP_ActionResult +{ + enum Type + { + Ok, + ProjectNotCreated, + ProjectNotLoaded, + ProjectNotSaved, + //....Here insert another values + + //Do not remove! + //Usable for looping through enum values + __Last UMETA(Hidden) + }; +} + + +/** + * @brief This struct holds action result enum and optionally reason of fail + */ +USTRUCT() +struct FOP_ActionResult +{ + GENERATED_BODY() + +public: + /** @brief Default constructor usable when there is no problem */ + FOP_ActionResult(); + + /** + * @brief This constructor initializes variables & attempts to log when is error + * @param InEnum Status + */ + FOP_ActionResult(const EOP_ActionResult::Type& InEnum); + + /** + * @brief This constructor initializes variables & attempts to log when is error + * @param InEnum Status + * @param InReason Reason of potential fail + */ + FOP_ActionResult(const EOP_ActionResult::Type& InEnum, const FText& InReason); + +private: + /** @brief Action status */ + EOP_ActionResult::Type Status; + + /** @brief Optional reason of fail */ + FText Reason; + +public: + /** + * @brief Checks if there is problematic state + * @return true when status is not equal to EOP_ActionResult::Ok + */ + bool IsProblem() const; + EOP_ActionResult::Type& GetStatus(); + FText& GetReason(); + +private: + void TryLog() const; +}; + diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h new file mode 100644 index 0000000000..4f8af3e2e6 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h @@ -0,0 +1,3 @@ +#pragma once + +DEFINE_LOG_CATEGORY_STATIC(LogCommandletOPGenerateProject, Log, All); \ No newline at end of file diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OPConstants.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OPConstants.h new file mode 100644 index 0000000000..21a033e426 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OPConstants.h @@ -0,0 +1,12 @@ +#pragma once + +namespace OPConstants +{ + const FString OP_PluginName = "OpenPype"; + const FString PythonScript_PluginName = "PythonScriptPlugin"; + const FString SequencerScripting_PluginName = "SequencerScripting"; + const FString MovieRenderPipeline_PluginName = "MovieRenderPipeline"; + const FString EditorScriptingUtils_PluginName = "EditorScriptingUtilities"; +} + + diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPype.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPype.h similarity index 100% rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPype.h rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPype.h diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeLib.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeLib.h similarity index 100% rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeLib.h rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeLib.h diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePublishInstance.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h similarity index 94% rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePublishInstance.h rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h index cd414fe2cc..16b3194b96 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePublishInstance.h +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h @@ -16,7 +16,7 @@ public: * * @return - Set of UObjects. Careful! They are returning raw pointers. Seems like an issue in UE5 */ - UFUNCTION(BlueprintCallable, BlueprintPure) + UFUNCTION(BlueprintCallable, BlueprintPure, Category="Python") TSet GetInternalAssets() const { //For some reason it can only return Raw Pointers? Seems like an issue which they haven't fixed. @@ -33,7 +33,7 @@ public: * * @return - TSet of assets (UObjects). Careful! They are returning raw pointers. Seems like an issue in UE5 */ - UFUNCTION(BlueprintCallable, BlueprintPure) + UFUNCTION(BlueprintCallable, BlueprintPure, Category="Python") TSet GetExternalAssets() const { //For some reason it can only return Raw Pointers? Seems like an issue which they haven't fixed. @@ -53,7 +53,7 @@ public: * * @attention If the bAddExternalAssets variable is false, external assets won't be included! */ - UFUNCTION(BlueprintCallable, BlueprintPure) + UFUNCTION(BlueprintCallable, BlueprintPure, Category="Python") TSet GetAllAssets() const { const TSet>& IteratedSet = bAddExternalAssets diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h similarity index 100% rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePythonBridge.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h similarity index 100% rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePythonBridge.h rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeSettings.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h similarity index 97% rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeSettings.h rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h index 2df6c887cf..9bdcfb2399 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeSettings.h +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h @@ -3,7 +3,6 @@ #pragma once #include "CoreMinimal.h" -#include "Object.h" #include "OpenPypeSettings.generated.h" #define OPENPYPE_SETTINGS_FILEPATH IPluginManager::Get().FindPlugin("OpenPype")->GetBaseDir() / TEXT("Config") / TEXT("DefaultOpenPypeSettings.ini") diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeStyle.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h similarity index 100% rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeStyle.h rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/AssetContainer.cpp b/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/AssetContainer.cpp deleted file mode 100644 index c766f87a8e..0000000000 --- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/AssetContainer.cpp +++ /dev/null @@ -1,115 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#include "AssetContainer.h" -#include "AssetRegistryModule.h" -#include "Misc/PackageName.h" -#include "Engine.h" -#include "Containers/UnrealString.h" - -UAssetContainer::UAssetContainer(const FObjectInitializer& ObjectInitializer) -: UAssetUserData(ObjectInitializer) -{ - FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked("AssetRegistry"); - FString path = UAssetContainer::GetPathName(); - UE_LOG(LogTemp, Warning, TEXT("UAssetContainer %s"), *path); - FARFilter Filter; - Filter.PackagePaths.Add(FName(*path)); - - AssetRegistryModule.Get().OnAssetAdded().AddUObject(this, &UAssetContainer::OnAssetAdded); - AssetRegistryModule.Get().OnAssetRemoved().AddUObject(this, &UAssetContainer::OnAssetRemoved); - AssetRegistryModule.Get().OnAssetRenamed().AddUObject(this, &UAssetContainer::OnAssetRenamed); -} - -void UAssetContainer::OnAssetAdded(const FAssetData& AssetData) -{ - TArray split; - - // get directory of current container - FString selfFullPath = UAssetContainer::GetPathName(); - FString selfDir = FPackageName::GetLongPackagePath(*selfFullPath); - - // get asset path and class - FString assetPath = AssetData.GetFullName(); - FString assetFName = AssetData.AssetClass.ToString(); - - // split path - assetPath.ParseIntoArray(split, TEXT(" "), true); - - FString assetDir = FPackageName::GetLongPackagePath(*split[1]); - - // take interest only in paths starting with path of current container - if (assetDir.StartsWith(*selfDir)) - { - // exclude self - if (assetFName != "AssetContainer") - { - assets.Add(assetPath); - assetsData.Add(AssetData); - UE_LOG(LogTemp, Log, TEXT("%s: asset added to %s"), *selfFullPath, *selfDir); - } - } -} - -void UAssetContainer::OnAssetRemoved(const FAssetData& AssetData) -{ - TArray split; - - // get directory of current container - FString selfFullPath = UAssetContainer::GetPathName(); - FString selfDir = FPackageName::GetLongPackagePath(*selfFullPath); - - // get asset path and class - FString assetPath = AssetData.GetFullName(); - FString assetFName = AssetData.AssetClass.ToString(); - - // split path - assetPath.ParseIntoArray(split, TEXT(" "), true); - - FString assetDir = FPackageName::GetLongPackagePath(*split[1]); - - // take interest only in paths starting with path of current container - FString path = UAssetContainer::GetPathName(); - FString lpp = FPackageName::GetLongPackagePath(*path); - - if (assetDir.StartsWith(*selfDir)) - { - // exclude self - if (assetFName != "AssetContainer") - { - // UE_LOG(LogTemp, Warning, TEXT("%s: asset removed"), *lpp); - assets.Remove(assetPath); - assetsData.Remove(AssetData); - } - } -} - -void UAssetContainer::OnAssetRenamed(const FAssetData& AssetData, const FString& str) -{ - TArray split; - - // get directory of current container - FString selfFullPath = UAssetContainer::GetPathName(); - FString selfDir = FPackageName::GetLongPackagePath(*selfFullPath); - - // get asset path and class - FString assetPath = AssetData.GetFullName(); - FString assetFName = AssetData.AssetClass.ToString(); - - // split path - assetPath.ParseIntoArray(split, TEXT(" "), true); - - FString assetDir = FPackageName::GetLongPackagePath(*split[1]); - if (assetDir.StartsWith(*selfDir)) - { - // exclude self - if (assetFName != "AssetContainer") - { - - assets.Remove(str); - assets.Add(assetPath); - assetsData.Remove(AssetData); - // UE_LOG(LogTemp, Warning, TEXT("%s: asset renamed %s"), *lpp, *str); - } - } -} - diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/AssetContainerFactory.cpp b/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/AssetContainerFactory.cpp deleted file mode 100644 index b943150bdd..0000000000 --- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/AssetContainerFactory.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "AssetContainerFactory.h" -#include "AssetContainer.h" - -UAssetContainerFactory::UAssetContainerFactory(const FObjectInitializer& ObjectInitializer) - : UFactory(ObjectInitializer) -{ - SupportedClass = UAssetContainer::StaticClass(); - bCreateNew = false; - bEditorImport = true; -} - -UObject* UAssetContainerFactory::FactoryCreateNew(UClass* Class, UObject* InParent, FName Name, EObjectFlags Flags, UObject* Context, FFeedbackContext* Warn) -{ - UAssetContainer* AssetContainer = NewObject(InParent, Class, Name, Flags); - return AssetContainer; -} - -bool UAssetContainerFactory::ShouldShowInNewMenu() const { - return false; -} diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/AssetContainer.h b/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/AssetContainer.h deleted file mode 100644 index 3c2a360c78..0000000000 --- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/AssetContainer.h +++ /dev/null @@ -1,39 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "UObject/NoExportTypes.h" -#include "Engine/AssetUserData.h" -#include "AssetData.h" -#include "AssetContainer.generated.h" - -/** - * - */ -UCLASS(Blueprintable) -class OPENPYPE_API UAssetContainer : public UAssetUserData -{ - GENERATED_BODY() - -public: - - UAssetContainer(const FObjectInitializer& ObjectInitalizer); - // ~UAssetContainer(); - - UPROPERTY(EditAnywhere, BlueprintReadOnly) - TArray assets; - - // There seems to be no reflection option to expose array of FAssetData - /* - UPROPERTY(Transient, BlueprintReadOnly, Category = "Python", meta=(DisplayName="Assets Data")) - TArray assetsData; - */ -private: - TArray assetsData; - void OnAssetAdded(const FAssetData& AssetData); - void OnAssetRemoved(const FAssetData& AssetData); - void OnAssetRenamed(const FAssetData& AssetData, const FString& str); -}; - - diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/AssetContainerFactory.h b/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/AssetContainerFactory.h deleted file mode 100644 index 331ce6bb50..0000000000 --- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/AssetContainerFactory.h +++ /dev/null @@ -1,21 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "Factories/Factory.h" -#include "AssetContainerFactory.generated.h" - -/** - * - */ -UCLASS() -class OPENPYPE_API UAssetContainerFactory : public UFactory -{ - GENERATED_BODY() - -public: - UAssetContainerFactory(const FObjectInitializer& ObjectInitializer); - virtual UObject* FactoryCreateNew(UClass* Class, UObject* InParent, FName Name, EObjectFlags Flags, UObject* Context, FFeedbackContext* Warn) override; - virtual bool ShouldShowInNewMenu() const override; -}; \ No newline at end of file diff --git a/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/.gitignore b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/.gitignore new file mode 100644 index 0000000000..1004610e4f --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/.gitignore @@ -0,0 +1,6 @@ +/Saved +/DerivedDataCache +/Intermediate +/Binaries +/.idea +/.vs \ No newline at end of file diff --git a/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/CommandletProject.uproject b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/CommandletProject.uproject new file mode 100644 index 0000000000..c8dc1c673e --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/CommandletProject.uproject @@ -0,0 +1,20 @@ +{ + "FileVersion": 3, + "EngineAssociation": "5.0", + "Category": "", + "Description": "", + "Plugins": [ + { + "Name": "ModelingToolsEditorMode", + "Enabled": true, + "TargetAllowList": [ + "Editor" + ] + }, + { + "Name": "OpenPype", + "Enabled": true, + "Type": "Editor" + } + ] +} \ No newline at end of file diff --git a/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultEditor.ini b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultEditor.ini new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultEngine.ini b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultEngine.ini new file mode 100644 index 0000000000..3f5357dac4 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultEngine.ini @@ -0,0 +1,42 @@ + + +[/Script/EngineSettings.GameMapsSettings] +GameDefaultMap=/Engine/Maps/Templates/OpenWorld + + +[/Script/HardwareTargeting.HardwareTargetingSettings] +TargetedHardwareClass=Desktop +AppliedTargetedHardwareClass=Desktop +DefaultGraphicsPerformance=Maximum +AppliedDefaultGraphicsPerformance=Maximum + +[/Script/WindowsTargetPlatform.WindowsTargetSettings] +DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 + +[/Script/Engine.RendererSettings] +r.GenerateMeshDistanceFields=True +r.DynamicGlobalIlluminationMethod=1 +r.ReflectionMethod=1 +r.Shadow.Virtual.Enable=1 + +[/Script/WorldPartitionEditor.WorldPartitionEditorSettings] +CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet' + +[/Script/Engine.Engine] ++ActiveGameNameRedirects=(OldGameName="TP_BlankBP",NewGameName="/Script/CommandletProject") ++ActiveGameNameRedirects=(OldGameName="/Script/TP_BlankBP",NewGameName="/Script/CommandletProject") + +[/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings] +bEnablePlugin=True +bAllowNetworkConnection=True +SecurityToken=684C16AF4BD96F1D6828A6B067693175 +bIncludeInShipping=False +bAllowExternalStartInShipping=False +bCompileAFSProject=False +bUseCompression=False +bLogFiles=False +bReportStats=False +ConnectionType=USBOnly +bUseManualIPAddress=False +ManualIPAddress= + diff --git a/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultGame.ini b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultGame.ini new file mode 100644 index 0000000000..c661b739ab --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultGame.ini @@ -0,0 +1,4 @@ + + +[/Script/EngineSettings.GeneralProjectSettings] +ProjectID=D528076140C577E5807BA5BA135366BB diff --git a/openpype/hosts/unreal/integration/UE_5.0/.gitignore b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/.gitignore similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/.gitignore rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/.gitignore diff --git a/openpype/hosts/unreal/integration/UE_5.0/Config/DefaultOpenPypeSettings.ini b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Config/DefaultOpenPypeSettings.ini similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Config/DefaultOpenPypeSettings.ini rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Config/DefaultOpenPypeSettings.ini diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Config/FilterPlugin.ini b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Config/FilterPlugin.ini new file mode 100644 index 0000000000..ccebca2f32 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Config/FilterPlugin.ini @@ -0,0 +1,8 @@ +[FilterPlugin] +; This section lists additional files which will be packaged along with your plugin. Paths should be listed relative to the root plugin directory, and +; may include "...", "*", and "?" wildcards to match directories, files, and individual characters respectively. +; +; Examples: +; /README.txt +; /Extras/... +; /Binaries/ThirdParty/*.dll diff --git a/openpype/hosts/unreal/integration/UE_5.0/Content/Python/init_unreal.py b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Content/Python/init_unreal.py similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Content/Python/init_unreal.py rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Content/Python/init_unreal.py diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype.uplugin b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/OpenPype.uplugin similarity index 95% rename from openpype/hosts/unreal/integration/UE_4.7/OpenPype.uplugin rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/OpenPype.uplugin index 4c7a74403c..b89eb43949 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype.uplugin +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/OpenPype.uplugin @@ -11,6 +11,7 @@ "MarketplaceURL": "", "SupportURL": "https://pype.club/", "CanContainContent": true, + "EngineVersion": "5.0", "IsBetaVersion": true, "IsExperimentalVersion": false, "Installed": false, diff --git a/openpype/hosts/unreal/integration/UE_5.0/README.md b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/README.md similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/README.md rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/README.md diff --git a/openpype/hosts/unreal/integration/UE_5.0/Resources/openpype128.png b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Resources/openpype128.png similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Resources/openpype128.png rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Resources/openpype128.png diff --git a/openpype/hosts/unreal/integration/UE_5.0/Resources/openpype40.png b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Resources/openpype40.png similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Resources/openpype40.png rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Resources/openpype40.png diff --git a/openpype/hosts/unreal/integration/UE_5.0/Resources/openpype512.png b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Resources/openpype512.png similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Resources/openpype512.png rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Resources/openpype512.png diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/OpenPype.Build.cs b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/OpenPype.Build.cs similarity index 92% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/OpenPype.Build.cs rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/OpenPype.Build.cs index d853ec028f..99c1c7b306 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/OpenPype.Build.cs +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/OpenPype.Build.cs @@ -10,7 +10,7 @@ public class OpenPype : ModuleRules bLegacyPublicIncludePaths = false; ShadowVariableWarningLevel = WarningLevel.Error; PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs; - IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_0; + //IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_0; PublicIncludePaths.AddRange( new string[] { @@ -30,14 +30,15 @@ public class OpenPype : ModuleRules new string[] { "Core", + "CoreUObject" // ... add other public dependencies that you statically link with here ... } ); - PrivateDependencyModuleNames.AddRange( new string[] { + "GameProjectGeneration", "Projects", "InputCore", "EditorFramework", diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp new file mode 100644 index 0000000000..024a6097b3 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp @@ -0,0 +1,140 @@ +#include "Commandlets/Implementations/OPGenerateProjectCommandlet.h" + +#include "Editor.h" +#include "GameProjectUtils.h" +#include "OPConstants.h" +#include "Commandlets/OPActionResult.h" +#include "ProjectDescriptor.h" + +int32 UOPGenerateProjectCommandlet::Main(const FString& CommandLineParams) +{ + //Parses command line parameters & creates structure FProjectInformation + const FOPGenerateProjectParams ParsedParams = FOPGenerateProjectParams(CommandLineParams); + ProjectInformation = ParsedParams.GenerateUEProjectInformation(); + + //Creates .uproject & other UE files + EVALUATE_OP_ACTION_RESULT(TryCreateProject()); + + //Loads created .uproject + EVALUATE_OP_ACTION_RESULT(TryLoadProjectDescriptor()); + + //Adds needed plugin to .uproject + AttachPluginsToProjectDescriptor(); + + //Saves .uproject + EVALUATE_OP_ACTION_RESULT(TrySave()); + + //When we are here, there should not be problems in generating Unreal Project for OpenPype + return 0; +} + + +FOPGenerateProjectParams::FOPGenerateProjectParams(): FOPGenerateProjectParams("") +{ +} + +FOPGenerateProjectParams::FOPGenerateProjectParams(const FString& CommandLineParams): CommandLineParams( + CommandLineParams) +{ + UCommandlet::ParseCommandLine(*CommandLineParams, Tokens, Switches); +} + +FProjectInformation FOPGenerateProjectParams::GenerateUEProjectInformation() const +{ + FProjectInformation ProjectInformation = FProjectInformation(); + ProjectInformation.ProjectFilename = GetProjectFileName(); + + ProjectInformation.bShouldGenerateCode = IsSwitchPresent("GenerateCode"); + + return ProjectInformation; +} + +FString FOPGenerateProjectParams::TryGetToken(const int32 Index) const +{ + return Tokens.IsValidIndex(Index) ? Tokens[Index] : ""; +} + +FString FOPGenerateProjectParams::GetProjectFileName() const +{ + return TryGetToken(0); +} + +bool FOPGenerateProjectParams::IsSwitchPresent(const FString& Switch) const +{ + return INDEX_NONE != Switches.IndexOfByPredicate([&Switch](const FString& Item) -> bool + { + return Item.Equals(Switch); + } + ); +} + + +UOPGenerateProjectCommandlet::UOPGenerateProjectCommandlet() +{ + LogToConsole = true; +} + +FOP_ActionResult UOPGenerateProjectCommandlet::TryCreateProject() const +{ + FText FailReason; + FText FailLog; + TArray OutCreatedFiles; + + if (!GameProjectUtils::CreateProject(ProjectInformation, FailReason, FailLog, &OutCreatedFiles)) + return FOP_ActionResult(EOP_ActionResult::ProjectNotCreated, FailReason); + return FOP_ActionResult(); +} + +FOP_ActionResult UOPGenerateProjectCommandlet::TryLoadProjectDescriptor() +{ + FText FailReason; + const bool bLoaded = ProjectDescriptor.Load(ProjectInformation.ProjectFilename, FailReason); + + return FOP_ActionResult(bLoaded ? EOP_ActionResult::Ok : EOP_ActionResult::ProjectNotLoaded, FailReason); +} + +void UOPGenerateProjectCommandlet::AttachPluginsToProjectDescriptor() +{ + FPluginReferenceDescriptor OPPluginDescriptor; + OPPluginDescriptor.bEnabled = true; + OPPluginDescriptor.Name = OPConstants::OP_PluginName; + ProjectDescriptor.Plugins.Add(OPPluginDescriptor); + + FPluginReferenceDescriptor PythonPluginDescriptor; + PythonPluginDescriptor.bEnabled = true; + PythonPluginDescriptor.Name = OPConstants::PythonScript_PluginName; + ProjectDescriptor.Plugins.Add(PythonPluginDescriptor); + + FPluginReferenceDescriptor SequencerScriptingPluginDescriptor; + SequencerScriptingPluginDescriptor.bEnabled = true; + SequencerScriptingPluginDescriptor.Name = OPConstants::SequencerScripting_PluginName; + ProjectDescriptor.Plugins.Add(SequencerScriptingPluginDescriptor); + + FPluginReferenceDescriptor MovieRenderPipelinePluginDescriptor; + MovieRenderPipelinePluginDescriptor.bEnabled = true; + MovieRenderPipelinePluginDescriptor.Name = OPConstants::MovieRenderPipeline_PluginName; + ProjectDescriptor.Plugins.Add(MovieRenderPipelinePluginDescriptor); + + FPluginReferenceDescriptor EditorScriptingPluginDescriptor; + EditorScriptingPluginDescriptor.bEnabled = true; + EditorScriptingPluginDescriptor.Name = OPConstants::EditorScriptingUtils_PluginName; + ProjectDescriptor.Plugins.Add(EditorScriptingPluginDescriptor); +} + +FOP_ActionResult UOPGenerateProjectCommandlet::TrySave() +{ + FText FailReason; + const bool bSaved = ProjectDescriptor.Save(ProjectInformation.ProjectFilename, FailReason); + + return FOP_ActionResult(bSaved ? EOP_ActionResult::Ok : EOP_ActionResult::ProjectNotSaved, FailReason); +} + +FOPGenerateProjectParams UOPGenerateProjectCommandlet::ParseParameters(const FString& Params) const +{ + FOPGenerateProjectParams ParamsResult; + + TArray Tokens, Switches; + ParseCommandLine(*Params, Tokens, Switches); + + return ParamsResult; +} diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp new file mode 100644 index 0000000000..9236fbb057 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp @@ -0,0 +1,41 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "Commandlets/OPActionResult.h" +#include "Logging/OP_Log.h" + +EOP_ActionResult::Type& FOP_ActionResult::GetStatus() +{ + return Status; +} + +FText& FOP_ActionResult::GetReason() +{ + return Reason; +} + +FOP_ActionResult::FOP_ActionResult():Status(EOP_ActionResult::Type::Ok) +{ + +} + +FOP_ActionResult::FOP_ActionResult(const EOP_ActionResult::Type& InEnum):Status(InEnum) +{ + TryLog(); +} + +FOP_ActionResult::FOP_ActionResult(const EOP_ActionResult::Type& InEnum, const FText& InReason):Status(InEnum), Reason(InReason) +{ + TryLog(); +}; + +bool FOP_ActionResult::IsProblem() const +{ + return Status != EOP_ActionResult::Ok; +} + +void FOP_ActionResult::TryLog() const +{ + if(IsProblem()) + UE_LOG(LogCommandletOPGenerateProject, Error, TEXT("%s"), *Reason.ToString()); +} diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp new file mode 100644 index 0000000000..29b1068c21 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp @@ -0,0 +1 @@ +#include "Logging/OP_Log.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPype.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPype.cpp similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPype.cpp rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPype.cpp diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeCommands.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeCommands.cpp similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeCommands.cpp rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeCommands.cpp diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeLib.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeLib.cpp rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePublishInstance.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp similarity index 99% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePublishInstance.cpp rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp index 0b56111a49..e6a85002c7 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePublishInstance.cpp +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp @@ -55,7 +55,7 @@ void UOpenPypePublishInstance::OnAssetCreated(const FAssetData& InAssetData) if (!IsValid(Asset)) { UE_LOG(LogAssetData, Warning, TEXT("Asset \"%s\" is not valid! Skipping the addition."), - *InAssetData.GetObjectPathString()); + *InAssetData.ObjectPath.ToString()); return; } diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePythonBridge.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePythonBridge.cpp rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeSettings.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeSettings.cpp rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeStyle.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeStyle.cpp rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h new file mode 100644 index 0000000000..8738de6d4a --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h @@ -0,0 +1,60 @@ +#pragma once + + +#include "GameProjectUtils.h" +#include "Commandlets/OPActionResult.h" +#include "ProjectDescriptor.h" +#include "Commandlets/Commandlet.h" +#include "OPGenerateProjectCommandlet.generated.h" + +struct FProjectDescriptor; +struct FProjectInformation; + +/** +* @brief Structure which parses command line parameters and generates FProjectInformation +*/ +USTRUCT() +struct FOPGenerateProjectParams +{ + GENERATED_BODY() + +private: + FString CommandLineParams; + TArray Tokens; + TArray Switches; + +public: + FOPGenerateProjectParams(); + FOPGenerateProjectParams(const FString& CommandLineParams); + + FProjectInformation GenerateUEProjectInformation() const; + +private: + FString TryGetToken(const int32 Index) const; + FString GetProjectFileName() const; + + bool IsSwitchPresent(const FString& Switch) const; +}; + +UCLASS() +class OPENPYPE_API UOPGenerateProjectCommandlet : public UCommandlet +{ + GENERATED_BODY() + +private: + FProjectInformation ProjectInformation; + FProjectDescriptor ProjectDescriptor; + +public: + UOPGenerateProjectCommandlet(); + + virtual int32 Main(const FString& CommandLineParams) override; + +private: + FOPGenerateProjectParams ParseParameters(const FString& Params) const; + FOP_ActionResult TryCreateProject() const; + FOP_ActionResult TryLoadProjectDescriptor(); + void AttachPluginsToProjectDescriptor(); + FOP_ActionResult TrySave(); +}; + diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h new file mode 100644 index 0000000000..f46ba9c62a --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h @@ -0,0 +1,83 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "OPActionResult.generated.h" + +/** + * @brief This macro returns error code when is problem or does nothing when there is no problem. + * @param ActionResult FOP_ActionResult structure + */ +#define EVALUATE_OP_ACTION_RESULT(ActionResult) \ + if(ActionResult.IsProblem()) \ + return ActionResult.GetStatus(); + +/** +* @brief This enum values are humanly readable mapping of error codes. +* Here should be all error codes to be possible find what went wrong. +* TODO: In the future should exists an web document where is mapped error code & what problem occured & how to repair it... +*/ +UENUM() +namespace EOP_ActionResult +{ + enum Type + { + Ok, + ProjectNotCreated, + ProjectNotLoaded, + ProjectNotSaved, + //....Here insert another values + + //Do not remove! + //Usable for looping through enum values + __Last UMETA(Hidden) + }; +} + + +/** + * @brief This struct holds action result enum and optionally reason of fail + */ +USTRUCT() +struct FOP_ActionResult +{ + GENERATED_BODY() + +public: + /** @brief Default constructor usable when there is no problem */ + FOP_ActionResult(); + + /** + * @brief This constructor initializes variables & attempts to log when is error + * @param InEnum Status + */ + FOP_ActionResult(const EOP_ActionResult::Type& InEnum); + + /** + * @brief This constructor initializes variables & attempts to log when is error + * @param InEnum Status + * @param InReason Reason of potential fail + */ + FOP_ActionResult(const EOP_ActionResult::Type& InEnum, const FText& InReason); + +private: + /** @brief Action status */ + EOP_ActionResult::Type Status; + + /** @brief Optional reason of fail */ + FText Reason; + +public: + /** + * @brief Checks if there is problematic state + * @return true when status is not equal to EOP_ActionResult::Ok + */ + bool IsProblem() const; + EOP_ActionResult::Type& GetStatus(); + FText& GetReason(); + +private: + void TryLog() const; +}; + diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h new file mode 100644 index 0000000000..4f8af3e2e6 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h @@ -0,0 +1,3 @@ +#pragma once + +DEFINE_LOG_CATEGORY_STATIC(LogCommandletOPGenerateProject, Log, All); \ No newline at end of file diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OPConstants.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OPConstants.h new file mode 100644 index 0000000000..21a033e426 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OPConstants.h @@ -0,0 +1,12 @@ +#pragma once + +namespace OPConstants +{ + const FString OP_PluginName = "OpenPype"; + const FString PythonScript_PluginName = "PythonScriptPlugin"; + const FString SequencerScripting_PluginName = "SequencerScripting"; + const FString MovieRenderPipeline_PluginName = "MovieRenderPipeline"; + const FString EditorScriptingUtils_PluginName = "EditorScriptingUtilities"; +} + + diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPype.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPype.h similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPype.h rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPype.h diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeCommands.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeCommands.h similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeCommands.h rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeCommands.h diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeLib.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeLib.h similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeLib.h rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeLib.h diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePublishInstance.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h similarity index 94% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePublishInstance.h rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h index 146025bd6d..c221f64135 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePublishInstance.h +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h @@ -17,7 +17,7 @@ public: * * @return - Set of UObjects. Careful! They are returning raw pointers. Seems like an issue in UE5 */ - UFUNCTION(BlueprintCallable, BlueprintPure) + UFUNCTION(BlueprintCallable, BlueprintPure, Category="Python") TSet GetInternalAssets() const { //For some reason it can only return Raw Pointers? Seems like an issue which they haven't fixed. @@ -34,7 +34,7 @@ public: * * @return - TSet of assets (UObjects). Careful! They are returning raw pointers. Seems like an issue in UE5 */ - UFUNCTION(BlueprintCallable, BlueprintPure) + UFUNCTION(BlueprintCallable, BlueprintPure, Category="Python") TSet GetExternalAssets() const { //For some reason it can only return Raw Pointers? Seems like an issue which they haven't fixed. @@ -54,7 +54,7 @@ public: * * @attention If the bAddExternalAssets variable is false, external assets won't be included! */ - UFUNCTION(BlueprintCallable, BlueprintPure) + UFUNCTION(BlueprintCallable, BlueprintPure, Category="Python") TSet GetAllAssets() const { const TSet>& IteratedSet = bAddExternalAssets diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePythonBridge.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePythonBridge.h rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeSettings.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeSettings.h rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeStyle.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h similarity index 100% rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeStyle.h rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/AssetContainer.cpp b/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/AssetContainer.cpp deleted file mode 100644 index 61e563f729..0000000000 --- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/AssetContainer.cpp +++ /dev/null @@ -1,115 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#include "AssetContainer.h" -#include "AssetRegistry/AssetRegistryModule.h" -#include "Misc/PackageName.h" -#include "Engine.h" -#include "Containers/UnrealString.h" - -UAssetContainer::UAssetContainer(const FObjectInitializer& ObjectInitializer) -: UAssetUserData(ObjectInitializer) -{ - FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked("AssetRegistry"); - FString path = UAssetContainer::GetPathName(); - UE_LOG(LogTemp, Warning, TEXT("UAssetContainer %s"), *path); - FARFilter Filter; - Filter.PackagePaths.Add(FName(*path)); - - AssetRegistryModule.Get().OnAssetAdded().AddUObject(this, &UAssetContainer::OnAssetAdded); - AssetRegistryModule.Get().OnAssetRemoved().AddUObject(this, &UAssetContainer::OnAssetRemoved); - AssetRegistryModule.Get().OnAssetRenamed().AddUObject(this, &UAssetContainer::OnAssetRenamed); -} - -void UAssetContainer::OnAssetAdded(const FAssetData& AssetData) -{ - TArray split; - - // get directory of current container - FString selfFullPath = UAssetContainer::GetPathName(); - FString selfDir = FPackageName::GetLongPackagePath(*selfFullPath); - - // get asset path and class - FString assetPath = AssetData.GetFullName(); - FString assetFName = AssetData.AssetClassPath.ToString(); - UE_LOG(LogTemp, Log, TEXT("asset name %s"), *assetFName); - // split path - assetPath.ParseIntoArray(split, TEXT(" "), true); - - FString assetDir = FPackageName::GetLongPackagePath(*split[1]); - - // take interest only in paths starting with path of current container - if (assetDir.StartsWith(*selfDir)) - { - // exclude self - if (assetFName != "AssetContainer") - { - assets.Add(assetPath); - assetsData.Add(AssetData); - UE_LOG(LogTemp, Log, TEXT("%s: asset added to %s"), *selfFullPath, *selfDir); - } - } -} - -void UAssetContainer::OnAssetRemoved(const FAssetData& AssetData) -{ - TArray split; - - // get directory of current container - FString selfFullPath = UAssetContainer::GetPathName(); - FString selfDir = FPackageName::GetLongPackagePath(*selfFullPath); - - // get asset path and class - FString assetPath = AssetData.GetFullName(); - FString assetFName = AssetData.AssetClassPath.ToString(); - - // split path - assetPath.ParseIntoArray(split, TEXT(" "), true); - - FString assetDir = FPackageName::GetLongPackagePath(*split[1]); - - // take interest only in paths starting with path of current container - FString path = UAssetContainer::GetPathName(); - FString lpp = FPackageName::GetLongPackagePath(*path); - - if (assetDir.StartsWith(*selfDir)) - { - // exclude self - if (assetFName != "AssetContainer") - { - // UE_LOG(LogTemp, Warning, TEXT("%s: asset removed"), *lpp); - assets.Remove(assetPath); - assetsData.Remove(AssetData); - } - } -} - -void UAssetContainer::OnAssetRenamed(const FAssetData& AssetData, const FString& str) -{ - TArray split; - - // get directory of current container - FString selfFullPath = UAssetContainer::GetPathName(); - FString selfDir = FPackageName::GetLongPackagePath(*selfFullPath); - - // get asset path and class - FString assetPath = AssetData.GetFullName(); - FString assetFName = AssetData.AssetClassPath.ToString(); - - // split path - assetPath.ParseIntoArray(split, TEXT(" "), true); - - FString assetDir = FPackageName::GetLongPackagePath(*split[1]); - if (assetDir.StartsWith(*selfDir)) - { - // exclude self - if (assetFName != "AssetContainer") - { - - assets.Remove(str); - assets.Add(assetPath); - assetsData.Remove(AssetData); - // UE_LOG(LogTemp, Warning, TEXT("%s: asset renamed %s"), *lpp, *str); - } - } -} - diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/AssetContainerFactory.cpp b/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/AssetContainerFactory.cpp deleted file mode 100644 index b943150bdd..0000000000 --- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/AssetContainerFactory.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "AssetContainerFactory.h" -#include "AssetContainer.h" - -UAssetContainerFactory::UAssetContainerFactory(const FObjectInitializer& ObjectInitializer) - : UFactory(ObjectInitializer) -{ - SupportedClass = UAssetContainer::StaticClass(); - bCreateNew = false; - bEditorImport = true; -} - -UObject* UAssetContainerFactory::FactoryCreateNew(UClass* Class, UObject* InParent, FName Name, EObjectFlags Flags, UObject* Context, FFeedbackContext* Warn) -{ - UAssetContainer* AssetContainer = NewObject(InParent, Class, Name, Flags); - return AssetContainer; -} - -bool UAssetContainerFactory::ShouldShowInNewMenu() const { - return false; -} diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/AssetContainer.h b/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/AssetContainer.h deleted file mode 100644 index 2c06e59d6f..0000000000 --- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/AssetContainer.h +++ /dev/null @@ -1,39 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "UObject/NoExportTypes.h" -#include "Engine/AssetUserData.h" -#include "AssetRegistry/AssetData.h" -#include "AssetContainer.generated.h" - -/** - * - */ -UCLASS(Blueprintable) -class OPENPYPE_API UAssetContainer : public UAssetUserData -{ - GENERATED_BODY() - -public: - - UAssetContainer(const FObjectInitializer& ObjectInitalizer); - // ~UAssetContainer(); - - UPROPERTY(EditAnywhere, BlueprintReadOnly) - TArray assets; - - // There seems to be no reflection option to expose array of FAssetData - /* - UPROPERTY(Transient, BlueprintReadOnly, Category = "Python", meta=(DisplayName="Assets Data")) - TArray assetsData; - */ -private: - TArray assetsData; - void OnAssetAdded(const FAssetData& AssetData); - void OnAssetRemoved(const FAssetData& AssetData); - void OnAssetRenamed(const FAssetData& AssetData, const FString& str); -}; - - diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/AssetContainerFactory.h b/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/AssetContainerFactory.h deleted file mode 100644 index 331ce6bb50..0000000000 --- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/AssetContainerFactory.h +++ /dev/null @@ -1,21 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "Factories/Factory.h" -#include "AssetContainerFactory.generated.h" - -/** - * - */ -UCLASS() -class OPENPYPE_API UAssetContainerFactory : public UFactory -{ - GENERATED_BODY() - -public: - UAssetContainerFactory(const FObjectInitializer& ObjectInitializer); - virtual UObject* FactoryCreateNew(UClass* Class, UObject* InParent, FName Name, EObjectFlags Flags, UObject* Context, FFeedbackContext* Warn) override; - virtual bool ShouldShowInNewMenu() const override; -}; \ No newline at end of file diff --git a/openpype/hosts/unreal/lib.py b/openpype/hosts/unreal/lib.py index 095f5e414b..5bde65edb6 100644 --- a/openpype/hosts/unreal/lib.py +++ b/openpype/hosts/unreal/lib.py @@ -4,6 +4,10 @@ import os import platform import json + +from typing import List + +import openpype from distutils import dir_util import subprocess import re @@ -73,7 +77,7 @@ def get_engine_versions(env=None): return OrderedDict() -def get_editor_executable_path(engine_path: Path, engine_version: str) -> Path: +def get_editor_exe_path(engine_path: Path, engine_version: str) -> Path: """Get UE Editor executable path.""" ue_path = engine_path / "Engine/Binaries" if platform.system().lower() == "windows": @@ -214,77 +218,58 @@ def create_unreal_project(project_name: str, # created in different UE4 version. When user convert such project # to his UE4 version, Engine ID is replaced in uproject file. If some # other user tries to open it, it will present him with similar error. - ue_modules = Path() - if platform.system().lower() == "windows": - ue_modules_path = engine_path / "Engine/Binaries/Win64" - if ue_version.split(".")[0] == "4": - ue_modules_path /= "UE4Editor.modules" - elif ue_version.split(".")[0] == "5": - ue_modules_path /= "UnrealEditor.modules" - ue_modules = Path(ue_modules_path) - if platform.system().lower() == "linux": - ue_modules = Path(os.path.join(engine_path, "Engine", "Binaries", - "Linux", "UE4Editor.modules")) + # engine_path should be the location of UE_X.X folder - if platform.system().lower() == "darwin": - ue_modules = Path(os.path.join(engine_path, "Engine", "Binaries", - "Mac", "UE4Editor.modules")) + ue_editor_exe_path: Path = get_editor_exe_path(engine_path, ue_version) + cmdlet_project_path = get_path_to_cmdlet_project(ue_version) - if ue_modules.exists(): - print("--- Loading Engine ID from modules file ...") - with open(ue_modules, "r") as mp: - loaded_modules = json.load(mp) + project_file = pr_dir / f"{project_name}.uproject" - if loaded_modules.get("BuildId"): - ue_id = "{" + loaded_modules.get("BuildId") + "}" - - plugins_path = None - if os.path.isdir(env.get("OPENPYPE_UNREAL_PLUGIN", "")): - # copy plugin to correct path under project - plugins_path = pr_dir / "Plugins" - openpype_plugin_path = plugins_path / "OpenPype" - if not openpype_plugin_path.is_dir(): - openpype_plugin_path.mkdir(parents=True, exist_ok=True) - dir_util._path_created = {} - dir_util.copy_tree(os.environ.get("OPENPYPE_UNREAL_PLUGIN"), - openpype_plugin_path.as_posix()) - - if not (openpype_plugin_path / "Binaries").is_dir() \ - or not (openpype_plugin_path / "Intermediate").is_dir(): - dev_mode = True - - # data for project file - data = { - "FileVersion": 3, - "EngineAssociation": ue_id, - "Category": "", - "Description": "", - "Plugins": [ - {"Name": "PythonScriptPlugin", "Enabled": True}, - {"Name": "EditorScriptingUtilities", "Enabled": True}, - {"Name": "SequencerScripting", "Enabled": True}, - {"Name": "MovieRenderPipeline", "Enabled": True}, - {"Name": "OpenPype", "Enabled": True} - ] - } + print("--- Generating a new project ...") + commandlet_cmd = [f'{ue_editor_exe_path.as_posix()}', + f'{cmdlet_project_path.as_posix()}', + f'-run=OPGenerateProject', + f'{project_file.resolve().as_posix()}'] if dev_mode or preset["dev_mode"]: - # this will add the project module and necessary source file to - # make it a C++ project and to (hopefully) make Unreal Editor to - # compile all # sources at start + commandlet_cmd.append('-GenerateCode') - data["Modules"] = [{ - "Name": project_name, - "Type": "Runtime", - "LoadingPhase": "Default", - "AdditionalDependencies": ["Engine"], - }] + subprocess.run(commandlet_cmd) - # write project file - project_file = pr_dir / f"{project_name}.uproject" - with open(project_file, mode="w") as pf: - json.dump(data, pf, indent=4) + with open(project_file, mode="r+") as pf: + pf_json = json.load(pf) + pf_json["EngineAssociation"] = _get_build_id(engine_path, ue_version) + pf.seek(0) + json.dump(pf_json, pf, indent=4) + pf.truncate() + print(f'--- Engine ID has been writen into the project file') + + if dev_mode or preset["dev_mode"]: + u_build_tool = get_path_to_ubt(engine_path, ue_version) + + arch = "Win64" + if platform.system().lower() == "windows": + arch = "Win64" + elif platform.system().lower() == "linux": + arch = "Linux" + elif platform.system().lower() == "darwin": + # we need to test this out + arch = "Mac" + + command1 = [u_build_tool.as_posix(), "-projectfiles", + f"-project={project_file}", "-progress"] + + subprocess.run(command1) + + command2 = [u_build_tool.as_posix(), + f"-ModuleWithSuffix={project_name},3555", arch, + "Development", "-TargetType=Editor", + f'-Project={project_file}', + f'{project_file}', + "-IgnoreJunk"] + + subprocess.run(command2) # ensure we have PySide2 installed in engine python_path = None @@ -307,8 +292,121 @@ def create_unreal_project(project_name: str, subprocess.check_call( [python_path.as_posix(), "-m", "pip", "install", "pyside2"]) - if dev_mode or preset["dev_mode"]: - _prepare_cpp_project(project_file, engine_path, ue_version) + +def get_path_to_uat(engine_path: Path) -> Path: + if platform.system().lower() == "windows": + return engine_path / "Engine/Build/BatchFiles/RunUAT.bat" + + if platform.system().lower() == "linux" or platform.system().lower() == "darwin": + return engine_path / "Engine/Build/BatchFiles/RunUAT.sh" + + +def get_path_to_cmdlet_project(ue_version: str) -> Path: + commandlet_project_path: Path = Path(os.path.dirname(os.path.abspath(openpype.__file__))) + + # For now, only tested on Windows (For Linux and Mac it has to be implemented) + if ue_version.split(".")[0] == "4": + return commandlet_project_path / "hosts/unreal/integration/UE_4.7/CommandletProject/CommandletProject.uproject" + elif ue_version.split(".")[0] == "5": + return commandlet_project_path / "hosts/unreal/integration/UE_5.0/CommandletProject/CommandletProject.uproject" + + +def get_path_to_ubt(engine_path: Path, ue_version: str) -> Path: + u_build_tool_path = engine_path / "Engine/Binaries/DotNET" + + if ue_version.split(".")[0] == "4": + u_build_tool_path /= "UnrealBuildTool.exe" + elif ue_version.split(".")[0] == "5": + u_build_tool_path /= "UnrealBuildTool/UnrealBuildTool.exe" + + return Path(u_build_tool_path) + + +def _get_build_id(engine_path: Path, ue_version: str) -> str: + ue_modules = Path() + if platform.system().lower() == "windows": + ue_modules_path = engine_path / "Engine/Binaries/Win64" + if ue_version.split(".")[0] == "4": + ue_modules_path /= "UE4Editor.modules" + elif ue_version.split(".")[0] == "5": + ue_modules_path /= "UnrealEditor.modules" + ue_modules = Path(ue_modules_path) + + if platform.system().lower() == "linux": + ue_modules = Path(os.path.join(engine_path, "Engine", "Binaries", + "Linux", "UE4Editor.modules")) + + if platform.system().lower() == "darwin": + ue_modules = Path(os.path.join(engine_path, "Engine", "Binaries", + "Mac", "UE4Editor.modules")) + + if ue_modules.exists(): + print("--- Loading Engine ID from modules file ...") + with open(ue_modules, "r") as mp: + loaded_modules = json.load(mp) + + if loaded_modules.get("BuildId"): + return "{" + loaded_modules.get("BuildId") + "}" + + +def try_installing_plugin(engine_path: Path, + ue_version: str, + env: dict = None) -> None: + env = env or os.environ + + integration_plugin_path: Path = Path(env.get("OPENPYPE_UNREAL_PLUGIN", "")) + + if not os.path.isdir(integration_plugin_path): + raise RuntimeError("Path to the integration plugin is null!") + + # Create a path to the plugin in the engine + openpype_plugin_path: Path = engine_path / "Engine/Plugins/Marketplace/OpenPype" + + if not openpype_plugin_path.is_dir(): + print("--- OpenPype Plugin is not present. Creating a new plugin directory ...") + openpype_plugin_path.mkdir(parents=True, exist_ok=True) + + engine_plugin_config_path: Path = openpype_plugin_path / "Config" + engine_plugin_config_path.mkdir(exist_ok=True) + + dir_util._path_created = {} + + if not (openpype_plugin_path / "Binaries").is_dir() \ + or not (openpype_plugin_path / "Intermediate").is_dir(): + print("--- Binaries are not present. Building the plugin ...") + _build_and_move_integration_plugin(engine_path, openpype_plugin_path, env) + + +def _build_and_move_integration_plugin(engine_path: Path, + plugin_build_path: Path, + env: dict = None) -> None: + uat_path: Path = get_path_to_uat(engine_path) + + env = env or os.environ + integration_plugin_path: Path = Path(env.get("OPENPYPE_UNREAL_PLUGIN", "")) + + if uat_path.is_file(): + temp_dir: Path = integration_plugin_path.parent / "Temp" + temp_dir.mkdir(exist_ok=True) + uplugin_path: Path = integration_plugin_path / "OpenPype.uplugin" + + # in order to successfully build the plugin, It must be built outside the Engine directory and then moved + build_plugin_cmd: List[str] = [f'{uat_path.as_posix()}', + 'BuildPlugin', + f'-Plugin={uplugin_path.as_posix()}', + f'-Package={temp_dir.as_posix()}'] + subprocess.run(build_plugin_cmd) + + # Copy the contents of the 'Temp' dir into the 'OpenPype' directory in the engine + dir_util.copy_tree(temp_dir.as_posix(), plugin_build_path.as_posix()) + + # We need to also copy the config folder. The UAT doesn't include the Config folder in the build + plugin_install_config_path: Path = plugin_build_path / "Config" + integration_plugin_config_path = integration_plugin_path / "Config" + + dir_util.copy_tree(integration_plugin_config_path.as_posix(), plugin_install_config_path.as_posix()) + + dir_util.remove_tree(temp_dir.as_posix()) def _prepare_cpp_project( From 222a2a0631293f5c9640af10c99f15fc85372ada Mon Sep 17 00:00:00 2001 From: Joseff Date: Wed, 25 Jan 2023 13:25:57 +0100 Subject: [PATCH 639/912] Cleaning up and refactoring the code. --- openpype/hosts/unreal/lib.py | 210 ++++------------------------------- 1 file changed, 23 insertions(+), 187 deletions(-) diff --git a/openpype/hosts/unreal/lib.py b/openpype/hosts/unreal/lib.py index 5bde65edb6..8c4299be53 100644 --- a/openpype/hosts/unreal/lib.py +++ b/openpype/hosts/unreal/lib.py @@ -221,14 +221,14 @@ def create_unreal_project(project_name: str, # engine_path should be the location of UE_X.X folder - ue_editor_exe_path: Path = get_editor_exe_path(engine_path, ue_version) - cmdlet_project_path = get_path_to_cmdlet_project(ue_version) + ue_editor_exe: Path = get_editor_exe_path(engine_path, ue_version) + cmdlet_project: Path = get_path_to_cmdlet_project(ue_version) project_file = pr_dir / f"{project_name}.uproject" print("--- Generating a new project ...") - commandlet_cmd = [f'{ue_editor_exe_path.as_posix()}', - f'{cmdlet_project_path.as_posix()}', + commandlet_cmd = [f'{ue_editor_exe.as_posix()}', + f'{cmdlet_project.as_posix()}', f'-run=OPGenerateProject', f'{project_file.resolve().as_posix()}'] @@ -297,18 +297,21 @@ def get_path_to_uat(engine_path: Path) -> Path: if platform.system().lower() == "windows": return engine_path / "Engine/Build/BatchFiles/RunUAT.bat" - if platform.system().lower() == "linux" or platform.system().lower() == "darwin": + if platform.system().lower() == "linux" \ + or platform.system().lower() == "darwin": return engine_path / "Engine/Build/BatchFiles/RunUAT.sh" def get_path_to_cmdlet_project(ue_version: str) -> Path: - commandlet_project_path: Path = Path(os.path.dirname(os.path.abspath(openpype.__file__))) + cmdlet_project: Path = Path(os.path.dirname(os.path.abspath(openpype.__file__))) # For now, only tested on Windows (For Linux and Mac it has to be implemented) if ue_version.split(".")[0] == "4": - return commandlet_project_path / "hosts/unreal/integration/UE_4.7/CommandletProject/CommandletProject.uproject" + cmdlet_project /= "hosts/unreal/integration/UE_4.7" elif ue_version.split(".")[0] == "5": - return commandlet_project_path / "hosts/unreal/integration/UE_5.0/CommandletProject/CommandletProject.uproject" + cmdlet_project /= "hosts/unreal/integration/UE_5.0" + + return cmdlet_project / "CommandletProject/CommandletProject.uproject" def get_path_to_ubt(engine_path: Path, ue_version: str) -> Path: @@ -374,12 +377,12 @@ def try_installing_plugin(engine_path: Path, if not (openpype_plugin_path / "Binaries").is_dir() \ or not (openpype_plugin_path / "Intermediate").is_dir(): print("--- Binaries are not present. Building the plugin ...") - _build_and_move_integration_plugin(engine_path, openpype_plugin_path, env) + _build_and_move_plugin(engine_path, openpype_plugin_path, env) -def _build_and_move_integration_plugin(engine_path: Path, - plugin_build_path: Path, - env: dict = None) -> None: +def _build_and_move_plugin(engine_path: Path, + plugin_build_path: Path, + env: dict = None) -> None: uat_path: Path = get_path_to_uat(engine_path) env = env or os.environ @@ -390,191 +393,24 @@ def _build_and_move_integration_plugin(engine_path: Path, temp_dir.mkdir(exist_ok=True) uplugin_path: Path = integration_plugin_path / "OpenPype.uplugin" - # in order to successfully build the plugin, It must be built outside the Engine directory and then moved + # in order to successfully build the plugin, + # It must be built outside the Engine directory and then moved build_plugin_cmd: List[str] = [f'{uat_path.as_posix()}', 'BuildPlugin', f'-Plugin={uplugin_path.as_posix()}', f'-Package={temp_dir.as_posix()}'] subprocess.run(build_plugin_cmd) - # Copy the contents of the 'Temp' dir into the 'OpenPype' directory in the engine + # Copy the contents of the 'Temp' dir into the + # 'OpenPype' directory in the engine dir_util.copy_tree(temp_dir.as_posix(), plugin_build_path.as_posix()) - # We need to also copy the config folder. The UAT doesn't include the Config folder in the build + # We need to also copy the config folder. + # The UAT doesn't include the Config folder in the build plugin_install_config_path: Path = plugin_build_path / "Config" integration_plugin_config_path = integration_plugin_path / "Config" - dir_util.copy_tree(integration_plugin_config_path.as_posix(), plugin_install_config_path.as_posix()) + dir_util.copy_tree(integration_plugin_config_path.as_posix(), + plugin_install_config_path.as_posix()) dir_util.remove_tree(temp_dir.as_posix()) - - -def _prepare_cpp_project( - project_file: Path, engine_path: Path, ue_version: str) -> None: - """Prepare CPP Unreal Project. - - This function will add source files needed for project to be - rebuild along with the OpenPype integration plugin. - - There seems not to be automated way to do it from command line. - But there might be way to create at least those target and build files - by some generator. This needs more research as manually writing - those files is rather hackish. :skull_and_crossbones: - - - Args: - project_file (str): Path to .uproject file. - engine_path (str): Path to unreal engine associated with project. - - """ - project_name = project_file.stem - project_dir = project_file.parent - targets_dir = project_dir / "Source" - sources_dir = targets_dir / project_name - - sources_dir.mkdir(parents=True, exist_ok=True) - (project_dir / "Content").mkdir(parents=True, exist_ok=True) - - module_target = ''' -using UnrealBuildTool; -using System.Collections.Generic; - -public class {0}Target : TargetRules -{{ - public {0}Target( TargetInfo Target) : base(Target) - {{ - Type = TargetType.Game; - ExtraModuleNames.AddRange( new string[] {{ "{0}" }} ); - }} -}} -'''.format(project_name) - - editor_module_target = ''' -using UnrealBuildTool; -using System.Collections.Generic; - -public class {0}EditorTarget : TargetRules -{{ - public {0}EditorTarget( TargetInfo Target) : base(Target) - {{ - Type = TargetType.Editor; - - ExtraModuleNames.AddRange( new string[] {{ "{0}" }} ); - }} -}} -'''.format(project_name) - - module_build = ''' -using UnrealBuildTool; -public class {0} : ModuleRules -{{ - public {0}(ReadOnlyTargetRules Target) : base(Target) - {{ - PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; - PublicDependencyModuleNames.AddRange(new string[] {{ "Core", - "CoreUObject", "Engine", "InputCore" }}); - PrivateDependencyModuleNames.AddRange(new string[] {{ }}); - }} -}} -'''.format(project_name) - - module_cpp = ''' -#include "{0}.h" -#include "Modules/ModuleManager.h" - -IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, {0}, "{0}" ); -'''.format(project_name) - - module_header = ''' -#pragma once -#include "CoreMinimal.h" -''' - - game_mode_cpp = ''' -#include "{0}GameModeBase.h" -'''.format(project_name) - - game_mode_h = ''' -#pragma once - -#include "CoreMinimal.h" -#include "GameFramework/GameModeBase.h" -#include "{0}GameModeBase.generated.h" - -UCLASS() -class {1}_API A{0}GameModeBase : public AGameModeBase -{{ - GENERATED_BODY() -}}; -'''.format(project_name, project_name.upper()) - - with open(targets_dir / f"{project_name}.Target.cs", mode="w") as f: - f.write(module_target) - - with open(targets_dir / f"{project_name}Editor.Target.cs", mode="w") as f: - f.write(editor_module_target) - - with open(sources_dir / f"{project_name}.Build.cs", mode="w") as f: - f.write(module_build) - - with open(sources_dir / f"{project_name}.cpp", mode="w") as f: - f.write(module_cpp) - - with open(sources_dir / f"{project_name}.h", mode="w") as f: - f.write(module_header) - - with open(sources_dir / f"{project_name}GameModeBase.cpp", mode="w") as f: - f.write(game_mode_cpp) - - with open(sources_dir / f"{project_name}GameModeBase.h", mode="w") as f: - f.write(game_mode_h) - - u_build_tool_path = engine_path / "Engine/Binaries/DotNET" - if ue_version.split(".")[0] == "4": - u_build_tool_path /= "UnrealBuildTool.exe" - elif ue_version.split(".")[0] == "5": - u_build_tool_path /= "UnrealBuildTool/UnrealBuildTool.exe" - u_build_tool = Path(u_build_tool_path) - u_header_tool = None - - arch = "Win64" - if platform.system().lower() == "windows": - arch = "Win64" - u_header_tool = Path( - engine_path / "Engine/Binaries/Win64/UnrealHeaderTool.exe") - elif platform.system().lower() == "linux": - arch = "Linux" - u_header_tool = Path( - engine_path / "Engine/Binaries/Linux/UnrealHeaderTool") - elif platform.system().lower() == "darwin": - # we need to test this out - arch = "Mac" - u_header_tool = Path( - engine_path / "Engine/Binaries/Mac/UnrealHeaderTool") - - if not u_header_tool: - raise NotImplementedError("Unsupported platform") - - command1 = [u_build_tool.as_posix(), "-projectfiles", - f"-project={project_file}", "-progress"] - - subprocess.run(command1) - - command2 = [u_build_tool.as_posix(), - f"-ModuleWithSuffix={project_name},3555", arch, - "Development", "-TargetType=Editor", - f'-Project={project_file}', - f'{project_file}', - "-IgnoreJunk"] - - subprocess.run(command2) - - """ - uhtmanifest = os.path.join(os.path.dirname(project_file), - f"{project_name}.uhtmanifest") - - command3 = [u_header_tool, f'"{project_file}"', f'"{uhtmanifest}"', - "-Unattended", "-WarningsAsErrors", "-installed"] - - subprocess.run(command3) - """ From 87d8c912cab99ac4fc9cae7a354de4c24aa5a456 Mon Sep 17 00:00:00 2001 From: Joseff Date: Wed, 25 Jan 2023 13:34:48 +0100 Subject: [PATCH 640/912] Shortening the lines of code --- openpype/hosts/unreal/lib.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/openpype/hosts/unreal/lib.py b/openpype/hosts/unreal/lib.py index 8c4299be53..3b842a112e 100644 --- a/openpype/hosts/unreal/lib.py +++ b/openpype/hosts/unreal/lib.py @@ -303,15 +303,15 @@ def get_path_to_uat(engine_path: Path) -> Path: def get_path_to_cmdlet_project(ue_version: str) -> Path: - cmdlet_project: Path = Path(os.path.dirname(os.path.abspath(openpype.__file__))) + cmd_project: Path = Path(os.path.dirname(os.path.abspath(openpype.__file__))) # For now, only tested on Windows (For Linux and Mac it has to be implemented) if ue_version.split(".")[0] == "4": - cmdlet_project /= "hosts/unreal/integration/UE_4.7" + cmd_project /= "hosts/unreal/integration/UE_4.7" elif ue_version.split(".")[0] == "5": - cmdlet_project /= "hosts/unreal/integration/UE_5.0" + cmd_project /= "hosts/unreal/integration/UE_5.0" - return cmdlet_project / "CommandletProject/CommandletProject.uproject" + return cmd_project / "CommandletProject/CommandletProject.uproject" def get_path_to_ubt(engine_path: Path, ue_version: str) -> Path: @@ -363,21 +363,21 @@ def try_installing_plugin(engine_path: Path, raise RuntimeError("Path to the integration plugin is null!") # Create a path to the plugin in the engine - openpype_plugin_path: Path = engine_path / "Engine/Plugins/Marketplace/OpenPype" + op_plugin_path: Path = engine_path / "Engine/Plugins/Marketplace/OpenPype" - if not openpype_plugin_path.is_dir(): - print("--- OpenPype Plugin is not present. Creating a new plugin directory ...") - openpype_plugin_path.mkdir(parents=True, exist_ok=True) + if not op_plugin_path.is_dir(): + print("--- OpenPype Plugin is not present. Installing ...") + op_plugin_path.mkdir(parents=True, exist_ok=True) - engine_plugin_config_path: Path = openpype_plugin_path / "Config" + engine_plugin_config_path: Path = op_plugin_path / "Config" engine_plugin_config_path.mkdir(exist_ok=True) dir_util._path_created = {} - if not (openpype_plugin_path / "Binaries").is_dir() \ - or not (openpype_plugin_path / "Intermediate").is_dir(): + if not (op_plugin_path / "Binaries").is_dir() \ + or not (op_plugin_path / "Intermediate").is_dir(): print("--- Binaries are not present. Building the plugin ...") - _build_and_move_plugin(engine_path, openpype_plugin_path, env) + _build_and_move_plugin(engine_path, op_plugin_path, env) def _build_and_move_plugin(engine_path: Path, From ae3248b6d9ad95c9c816ba832545bb87c4f04809 Mon Sep 17 00:00:00 2001 From: Joseff Date: Wed, 25 Jan 2023 11:31:27 +0100 Subject: [PATCH 641/912] Refactored the generation of UE projects, plugin is now being installed in the engine. --- openpype/hosts/unreal/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/unreal/lib.py b/openpype/hosts/unreal/lib.py index 3b842a112e..b502737771 100644 --- a/openpype/hosts/unreal/lib.py +++ b/openpype/hosts/unreal/lib.py @@ -303,7 +303,7 @@ def get_path_to_uat(engine_path: Path) -> Path: def get_path_to_cmdlet_project(ue_version: str) -> Path: - cmd_project: Path = Path(os.path.dirname(os.path.abspath(openpype.__file__))) + cmd_project = Path(os.path.dirname(os.path.abspath(openpype.__file__))) # For now, only tested on Windows (For Linux and Mac it has to be implemented) if ue_version.split(".")[0] == "4": From 141214d86c8e1055210e517fd7cd467d2dd93496 Mon Sep 17 00:00:00 2001 From: Joseff Date: Fri, 3 Feb 2023 11:03:10 +0100 Subject: [PATCH 642/912] Added a stdout printing for the project generation command --- openpype/hosts/unreal/lib.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/unreal/lib.py b/openpype/hosts/unreal/lib.py index b502737771..04171f3ac0 100644 --- a/openpype/hosts/unreal/lib.py +++ b/openpype/hosts/unreal/lib.py @@ -235,15 +235,27 @@ def create_unreal_project(project_name: str, if dev_mode or preset["dev_mode"]: commandlet_cmd.append('-GenerateCode') - subprocess.run(commandlet_cmd) + gen_process = subprocess.Popen(commandlet_cmd, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) - with open(project_file, mode="r+") as pf: + for line in gen_process.stdout: + print(line.decode(), end='') + gen_process.stdout.close() + return_code = gen_process.wait() + + if return_code and return_code != 0: + raise RuntimeError(f'Failed to generate \'{project_name}\' project! Exited with return code {return_code}') + + print("--- Project has been generated successfully.") + + with open(project_file.as_posix(), mode="r+") as pf: pf_json = json.load(pf) pf_json["EngineAssociation"] = _get_build_id(engine_path, ue_version) pf.seek(0) json.dump(pf_json, pf, indent=4) pf.truncate() - print(f'--- Engine ID has been writen into the project file') + print(f'--- Engine ID has been written into the project file') if dev_mode or preset["dev_mode"]: u_build_tool = get_path_to_ubt(engine_path, ue_version) From 283a5fb8e4cafc33eb6ad4bd36a82a02e5893222 Mon Sep 17 00:00:00 2001 From: Joseff Date: Fri, 3 Feb 2023 11:07:47 +0100 Subject: [PATCH 643/912] Shortened lines for the error message --- openpype/hosts/unreal/lib.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/unreal/lib.py b/openpype/hosts/unreal/lib.py index 04171f3ac0..2e1f59d439 100644 --- a/openpype/hosts/unreal/lib.py +++ b/openpype/hosts/unreal/lib.py @@ -229,7 +229,7 @@ def create_unreal_project(project_name: str, print("--- Generating a new project ...") commandlet_cmd = [f'{ue_editor_exe.as_posix()}', f'{cmdlet_project.as_posix()}', - f'-run=OPGenerateProject', + f'-run=OPGenerateProjec', f'{project_file.resolve().as_posix()}'] if dev_mode or preset["dev_mode"]: @@ -245,7 +245,8 @@ def create_unreal_project(project_name: str, return_code = gen_process.wait() if return_code and return_code != 0: - raise RuntimeError(f'Failed to generate \'{project_name}\' project! Exited with return code {return_code}') + raise RuntimeError(f'Failed to generate \'{project_name}\' project! ' + f'Exited with return code {return_code}') print("--- Project has been generated successfully.") From 5ad3bfbaf2cd732a08fc0f9e00600017b4ef0e95 Mon Sep 17 00:00:00 2001 From: Joseff Date: Mon, 20 Feb 2023 15:57:45 +0100 Subject: [PATCH 644/912] Fixed the generation of the project, added copyrights notices, removed .ini files. --- openpype/hosts/unreal/addon.py | 3 +- .../unreal/hooks/pre_workfile_preparation.py | 3 +- .../UE_4.7/CommandletProject/.gitignore | 2 + .../Config/DefaultEditor.ini | 0 .../Config/DefaultEngine.ini | 16 ------- .../CommandletProject/Config/DefaultGame.ini | 4 -- .../integration/UE_4.7/OpenPype/.gitignore | 6 +++ .../UE_4.7/OpenPype/OpenPype.uplugin | 1 - .../Source/OpenPype/OpenPype.Build.cs | 2 +- .../OPGenerateProjectCommandlet.cpp | 1 + .../Private/Commandlets/OPActionResult.cpp | 2 +- .../Source/OpenPype/Private/OpenPype.cpp | 1 + .../Source/OpenPype/Private/OpenPypeLib.cpp | 1 + .../Private/OpenPypePublishInstance.cpp | 1 + .../OpenPypePublishInstanceFactory.cpp | 1 + .../OpenPype/Private/OpenPypePythonBridge.cpp | 1 + .../OpenPype/Private/OpenPypeSettings.cpp | 2 +- .../Source/OpenPype/Private/OpenPypeStyle.cpp | 1 + .../OPGenerateProjectCommandlet.h | 2 +- .../Public/Commandlets/OPActionResult.h | 2 +- .../Source/OpenPype/Public/Logging/OP_Log.h | 1 + .../Source/OpenPype/Public/OPConstants.h | 1 + .../Source/OpenPype/Public/OpenPype.h | 2 +- .../Source/OpenPype/Public/OpenPypeLib.h | 1 + .../OpenPype/Public/OpenPypePublishInstance.h | 1 + .../Public/OpenPypePublishInstanceFactory.h | 1 + .../OpenPype/Public/OpenPypePythonBridge.h | 1 + .../Source/OpenPype/Public/OpenPypeSettings.h | 2 +- .../Source/OpenPype/Public/OpenPypeStyle.h | 1 + .../UE_5.0/CommandletProject/.gitignore | 35 ++++++++++++++++ .../Config/DefaultEditor.ini | 0 .../Config/DefaultEngine.ini | 42 ------------------- .../CommandletProject/Config/DefaultGame.ini | 4 -- .../UE_5.0/OpenPype/OpenPype.uplugin | 3 +- .../Source/OpenPype/OpenPype.Build.cs | 2 +- .../OPGenerateProjectCommandlet.cpp | 1 + .../Private/Commandlets/OPActionResult.cpp | 3 +- .../OpenPype/Private/Logging/OP_Log.cpp | 2 + .../Source/OpenPype/Private/OpenPype.cpp | 1 + .../OpenPype/Private/OpenPypeCommands.cpp | 2 +- .../Source/OpenPype/Private/OpenPypeLib.cpp | 1 + .../Private/OpenPypePublishInstance.cpp | 1 + .../OpenPypePublishInstanceFactory.cpp | 1 + .../OpenPype/Private/OpenPypePythonBridge.cpp | 1 + .../OpenPype/Private/OpenPypeSettings.cpp | 2 +- .../Source/OpenPype/Private/OpenPypeStyle.cpp | 2 + .../OPGenerateProjectCommandlet.h | 1 + .../Public/Commandlets/OPActionResult.h | 2 +- .../Source/OpenPype/Public/Logging/OP_Log.h | 1 + .../Source/OpenPype/Public/OPConstants.h | 1 + .../Source/OpenPype/Public/OpenPype.h | 2 +- .../Source/OpenPype/Public/OpenPypeCommands.h | 2 +- .../Source/OpenPype/Public/OpenPypeLib.h | 1 + .../OpenPype/Public/OpenPypePublishInstance.h | 1 + .../Public/OpenPypePublishInstanceFactory.h | 1 + .../OpenPype/Public/OpenPypePythonBridge.h | 1 + .../Source/OpenPype/Public/OpenPypeSettings.h | 2 +- .../Source/OpenPype/Public/OpenPypeStyle.h | 1 + openpype/hosts/unreal/lib.py | 6 +-- 59 files changed, 97 insertions(+), 91 deletions(-) delete mode 100644 openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultEditor.ini delete mode 100644 openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultEngine.ini delete mode 100644 openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultGame.ini delete mode 100644 openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultEditor.ini delete mode 100644 openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultEngine.ini delete mode 100644 openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultGame.ini diff --git a/openpype/hosts/unreal/addon.py b/openpype/hosts/unreal/addon.py index c92a44870f..24e2db975d 100644 --- a/openpype/hosts/unreal/addon.py +++ b/openpype/hosts/unreal/addon.py @@ -19,7 +19,8 @@ class UnrealAddon(OpenPypeModule, IHostAddon): unreal_plugin_path = os.path.join( UNREAL_ROOT_DIR, "integration", ue_plugin, "OpenPype" ) - if not env.get("OPENPYPE_UNREAL_PLUGIN"): + if not env.get("OPENPYPE_UNREAL_PLUGIN") or \ + env.get("OPENPYPE_UNREAL_PLUGIN") != unreal_plugin_path: env["OPENPYPE_UNREAL_PLUGIN"] = unreal_plugin_path # Set default environments if are not set via settings diff --git a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py index 821018ba9d..14285cb78c 100644 --- a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py +++ b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py @@ -127,6 +127,7 @@ class UnrealPrelaunchHook(PreLaunchHook): # Set "OPENPYPE_UNREAL_PLUGIN" to current process environment for # execution of `create_unreal_project` + if self.launch_context.env.get("OPENPYPE_UNREAL_PLUGIN"): self.log.info(( f"{self.signature} using OpenPype plugin from " @@ -138,7 +139,7 @@ class UnrealPrelaunchHook(PreLaunchHook): engine_path = detected[engine_version] - unreal_lib.try_installing_plugin(Path(engine_path), engine_version) + unreal_lib.try_installing_plugin(Path(engine_path), os.environ) project_file = project_path / unreal_project_filename if not project_file.is_file(): diff --git a/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/.gitignore b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/.gitignore index 1004610e4f..e74e6886b7 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/.gitignore +++ b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/.gitignore @@ -1,6 +1,8 @@ /Saved /DerivedDataCache /Intermediate +/Content +/Config /Binaries /.idea /.vs \ No newline at end of file diff --git a/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultEditor.ini b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultEditor.ini deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultEngine.ini b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultEngine.ini deleted file mode 100644 index 2845baccca..0000000000 --- a/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultEngine.ini +++ /dev/null @@ -1,16 +0,0 @@ - - -[/Script/EngineSettings.GameMapsSettings] -GameDefaultMap=/Engine/Maps/Templates/Template_Default.Template_Default - - -[/Script/HardwareTargeting.HardwareTargetingSettings] -TargetedHardwareClass=Desktop -AppliedTargetedHardwareClass=Desktop -DefaultGraphicsPerformance=Maximum -AppliedDefaultGraphicsPerformance=Maximum - -[/Script/Engine.Engine] -+ActiveGameNameRedirects=(OldGameName="TP_BlankBP",NewGameName="/Script/CommandletProject") -+ActiveGameNameRedirects=(OldGameName="/Script/TP_BlankBP",NewGameName="/Script/CommandletProject") - diff --git a/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultGame.ini b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultGame.ini deleted file mode 100644 index 40956de961..0000000000 --- a/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/Config/DefaultGame.ini +++ /dev/null @@ -1,4 +0,0 @@ - - -[/Script/EngineSettings.GeneralProjectSettings] -ProjectID=95AED0BF45A918DF73ABB3BB27D25356 diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/.gitignore b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/.gitignore index b32a6f55e5..5add07aef8 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/.gitignore +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/.gitignore @@ -33,3 +33,9 @@ /Binaries /Intermediate +/Saved +/DerivedDataCache +/Content +/Config +/.idea +/.vs diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/OpenPype.uplugin b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/OpenPype.uplugin index 23155cb74d..b2cbe3cff3 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/OpenPype.uplugin +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/OpenPype.uplugin @@ -12,7 +12,6 @@ "SupportURL": "https://pype.club/", "EngineVersion": "4.27", "CanContainContent": true, - "IsBetaVersion": true, "Installed": true, "Modules": [ { diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/OpenPype.Build.cs b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/OpenPype.Build.cs index 13afb11003..f77c1383eb 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/OpenPype.Build.cs +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/OpenPype.Build.cs @@ -1,4 +1,4 @@ -// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved. +// Copyright 2023, Ayon, All rights reserved. using UnrealBuildTool; diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp index 024a6097b3..abb1975027 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #include "Commandlets/Implementations/OPGenerateProjectCommandlet.h" #include "Editor.h" diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp index 9236fbb057..6e50ef2221 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp @@ -1,4 +1,4 @@ -// Fill out your copyright notice in the Description page of Project Settings. +// Copyright 2023, Ayon, All rights reserved. #include "Commandlets/OPActionResult.h" diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPype.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPype.cpp index a510a5e3bf..9bf7b341c5 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPype.cpp +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPype.cpp @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #include "OpenPype.h" #include "ISettingsContainer.h" diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp index a58e921288..008025e816 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #include "OpenPypeLib.h" #include "AssetViewUtils.h" diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp index 424c4ed491..05638fbd0b 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once #include "OpenPypePublishInstance.h" diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp index 9b26da7fa4..a32ebe32cb 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #include "OpenPypePublishInstanceFactory.h" #include "OpenPypePublishInstance.h" diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp index 8113231503..6ebfc528f0 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #include "OpenPypePythonBridge.h" UOpenPypePythonBridge* UOpenPypePythonBridge::Get() diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp index 951b522308..dd4228dfd0 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp @@ -1,4 +1,4 @@ -// Fill out your copyright notice in the Description page of Project Settings. +// Copyright 2023, Ayon, All rights reserved. #include "OpenPypeSettings.h" diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp index b7abc38156..0cc854c5ef 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #include "OpenPypeStyle.h" #include "Framework/Application/SlateApplication.h" #include "Styling/SlateStyle.h" diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h index 8738de6d4a..d1129aa070 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h @@ -1,6 +1,6 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once - #include "GameProjectUtils.h" #include "Commandlets/OPActionResult.h" #include "ProjectDescriptor.h" diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h index f46ba9c62a..c960bbf190 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h @@ -1,4 +1,4 @@ -// Fill out your copyright notice in the Description page of Project Settings. +// Copyright 2023, Ayon, All rights reserved. #pragma once diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h index 4f8af3e2e6..3740c5285a 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once DEFINE_LOG_CATEGORY_STATIC(LogCommandletOPGenerateProject, Log, All); \ No newline at end of file diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OPConstants.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OPConstants.h index 21a033e426..f4587f7a50 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OPConstants.h +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OPConstants.h @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once namespace OPConstants diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPype.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPype.h index 9cfa60176c..2454344128 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPype.h +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPype.h @@ -1,4 +1,4 @@ -// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved. +// Copyright 2023, Ayon, All rights reserved. #pragma once diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeLib.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeLib.h index 06425c7c7d..ef4d1027ea 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeLib.h +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeLib.h @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once #include "Engine.h" diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h index 16b3194b96..8cfcd067c0 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once #include "Engine.h" diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h index 7d2c77fe6e..3fdb984411 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once #include "CoreMinimal.h" diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h index 692aab2e5e..827f76f56b 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once #include "Engine.h" #include "OpenPypePythonBridge.generated.h" diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h index 9bdcfb2399..88defaa773 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h @@ -1,4 +1,4 @@ -// Fill out your copyright notice in the Description page of Project Settings. +// Copyright 2023, Ayon, All rights reserved. #pragma once diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h index fbc8bcdd5b..0e4af129d0 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once #include "CoreMinimal.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/.gitignore b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/.gitignore index 1004610e4f..80814ef0a6 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/.gitignore +++ b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/.gitignore @@ -1,6 +1,41 @@ +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + /Saved /DerivedDataCache /Intermediate /Binaries +/Content +/Config /.idea /.vs \ No newline at end of file diff --git a/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultEditor.ini b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultEditor.ini deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultEngine.ini b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultEngine.ini deleted file mode 100644 index 3f5357dac4..0000000000 --- a/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultEngine.ini +++ /dev/null @@ -1,42 +0,0 @@ - - -[/Script/EngineSettings.GameMapsSettings] -GameDefaultMap=/Engine/Maps/Templates/OpenWorld - - -[/Script/HardwareTargeting.HardwareTargetingSettings] -TargetedHardwareClass=Desktop -AppliedTargetedHardwareClass=Desktop -DefaultGraphicsPerformance=Maximum -AppliedDefaultGraphicsPerformance=Maximum - -[/Script/WindowsTargetPlatform.WindowsTargetSettings] -DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 - -[/Script/Engine.RendererSettings] -r.GenerateMeshDistanceFields=True -r.DynamicGlobalIlluminationMethod=1 -r.ReflectionMethod=1 -r.Shadow.Virtual.Enable=1 - -[/Script/WorldPartitionEditor.WorldPartitionEditorSettings] -CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet' - -[/Script/Engine.Engine] -+ActiveGameNameRedirects=(OldGameName="TP_BlankBP",NewGameName="/Script/CommandletProject") -+ActiveGameNameRedirects=(OldGameName="/Script/TP_BlankBP",NewGameName="/Script/CommandletProject") - -[/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings] -bEnablePlugin=True -bAllowNetworkConnection=True -SecurityToken=684C16AF4BD96F1D6828A6B067693175 -bIncludeInShipping=False -bAllowExternalStartInShipping=False -bCompileAFSProject=False -bUseCompression=False -bLogFiles=False -bReportStats=False -ConnectionType=USBOnly -bUseManualIPAddress=False -ManualIPAddress= - diff --git a/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultGame.ini b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultGame.ini deleted file mode 100644 index c661b739ab..0000000000 --- a/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/Config/DefaultGame.ini +++ /dev/null @@ -1,4 +0,0 @@ - - -[/Script/EngineSettings.GeneralProjectSettings] -ProjectID=D528076140C577E5807BA5BA135366BB diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/OpenPype.uplugin b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/OpenPype.uplugin index b89eb43949..ff08edc13e 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/OpenPype.uplugin +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/OpenPype.uplugin @@ -12,9 +12,8 @@ "SupportURL": "https://pype.club/", "CanContainContent": true, "EngineVersion": "5.0", - "IsBetaVersion": true, "IsExperimentalVersion": false, - "Installed": false, + "Installed": true, "Modules": [ { "Name": "OpenPype", diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/OpenPype.Build.cs b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/OpenPype.Build.cs index 99c1c7b306..e1087fd720 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/OpenPype.Build.cs +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/OpenPype.Build.cs @@ -1,4 +1,4 @@ -// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved. +// Copyright 2023, Ayon, All rights reserved. using UnrealBuildTool; diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp index 024a6097b3..abb1975027 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #include "Commandlets/Implementations/OPGenerateProjectCommandlet.h" #include "Editor.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp index 9236fbb057..23ae2dd329 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp @@ -1,5 +1,4 @@ -// Fill out your copyright notice in the Description page of Project Settings. - +// Copyright 2023, Ayon, All rights reserved. #include "Commandlets/OPActionResult.h" #include "Logging/OP_Log.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp index 29b1068c21..198fb9df0c 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp @@ -1 +1,3 @@ +// Copyright 2023, Ayon, All rights reserved. + #include "Logging/OP_Log.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPype.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPype.cpp index d23de61102..65da29da35 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPype.cpp +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPype.cpp @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #include "OpenPype.h" #include "ISettingsContainer.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeCommands.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeCommands.cpp index 6187bd7c7e..881814e278 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeCommands.cpp +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeCommands.cpp @@ -1,4 +1,4 @@ -// Copyright Epic Games, Inc. All Rights Reserved. +// Copyright 2023, Ayon, All rights reserved. #include "OpenPypeCommands.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp index a58e921288..008025e816 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #include "OpenPypeLib.h" #include "AssetViewUtils.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp index e6a85002c7..05d5c8a87d 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once #include "OpenPypePublishInstance.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp index 9b26da7fa4..a32ebe32cb 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #include "OpenPypePublishInstanceFactory.h" #include "OpenPypePublishInstance.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp index 8113231503..6ebfc528f0 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #include "OpenPypePythonBridge.h" UOpenPypePythonBridge* UOpenPypePythonBridge::Get() diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp index a6b9eba749..6562a81138 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp @@ -1,4 +1,4 @@ -// Fill out your copyright notice in the Description page of Project Settings. +// Copyright 2023, Ayon, All rights reserved. #include "OpenPypeSettings.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp index 49e805da4d..a4d75e048e 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp @@ -1,3 +1,5 @@ +// Copyright 2023, Ayon, All rights reserved. + #include "OpenPypeStyle.h" #include "OpenPype.h" #include "Framework/Application/SlateApplication.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h index 8738de6d4a..6a6c6406e7 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h index f46ba9c62a..c960bbf190 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h @@ -1,4 +1,4 @@ -// Fill out your copyright notice in the Description page of Project Settings. +// Copyright 2023, Ayon, All rights reserved. #pragma once diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h index 4f8af3e2e6..3740c5285a 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once DEFINE_LOG_CATEGORY_STATIC(LogCommandletOPGenerateProject, Log, All); \ No newline at end of file diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OPConstants.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OPConstants.h index 21a033e426..f4587f7a50 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OPConstants.h +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OPConstants.h @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once namespace OPConstants diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPype.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPype.h index 4261476da8..b89760099b 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPype.h +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPype.h @@ -1,4 +1,4 @@ -// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved. +// Copyright 2023, Ayon, All rights reserved. #pragma once diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeCommands.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeCommands.h index 62ffb8de33..99b0be26f0 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeCommands.h +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeCommands.h @@ -1,4 +1,4 @@ -// Copyright Epic Games, Inc. All Rights Reserved. +// Copyright 2023, Ayon, All rights reserved. #pragma once diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeLib.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeLib.h index 06425c7c7d..ef4d1027ea 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeLib.h +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeLib.h @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once #include "Engine.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h index c221f64135..bce41ef1b1 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once #include "Engine.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h index 7d2c77fe6e..3fdb984411 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once #include "CoreMinimal.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h index 692aab2e5e..827f76f56b 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once #include "Engine.h" #include "OpenPypePythonBridge.generated.h" diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h index aca80946bb..b818fe0e95 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h @@ -1,4 +1,4 @@ -// Fill out your copyright notice in the Description page of Project Settings. +// Copyright 2023, Ayon, All rights reserved. #pragma once diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h index ae704251e1..039abe96ef 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h @@ -1,3 +1,4 @@ +// Copyright 2023, Ayon, All rights reserved. #pragma once #include "CoreMinimal.h" #include "Styling/SlateStyle.h" diff --git a/openpype/hosts/unreal/lib.py b/openpype/hosts/unreal/lib.py index 2e1f59d439..28a5106042 100644 --- a/openpype/hosts/unreal/lib.py +++ b/openpype/hosts/unreal/lib.py @@ -229,7 +229,7 @@ def create_unreal_project(project_name: str, print("--- Generating a new project ...") commandlet_cmd = [f'{ue_editor_exe.as_posix()}', f'{cmdlet_project.as_posix()}', - f'-run=OPGenerateProjec', + f'-run=OPGenerateProject', f'{project_file.resolve().as_posix()}'] if dev_mode or preset["dev_mode"]: @@ -365,9 +365,7 @@ def _get_build_id(engine_path: Path, ue_version: str) -> str: return "{" + loaded_modules.get("BuildId") + "}" -def try_installing_plugin(engine_path: Path, - ue_version: str, - env: dict = None) -> None: +def try_installing_plugin(engine_path: Path, env: dict = None) -> None: env = env or os.environ integration_plugin_path: Path = Path(env.get("OPENPYPE_UNREAL_PLUGIN", "")) From f91cefa2fd1089ac564848254e16b7a0ba95ea37 Mon Sep 17 00:00:00 2001 From: Joseff Date: Mon, 20 Feb 2023 16:03:03 +0100 Subject: [PATCH 645/912] Updated .gitignore for the OpenPype plugin --- .../hosts/unreal/integration/UE_4.7/OpenPype/.gitignore | 6 ------ 1 file changed, 6 deletions(-) diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/.gitignore b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/.gitignore index 5add07aef8..b32a6f55e5 100644 --- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/.gitignore +++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/.gitignore @@ -33,9 +33,3 @@ /Binaries /Intermediate -/Saved -/DerivedDataCache -/Content -/Config -/.idea -/.vs From b1fa39439603a19b8884d1613f4a67ca55d33ff6 Mon Sep 17 00:00:00 2001 From: Joseff Date: Tue, 21 Feb 2023 20:23:32 +0100 Subject: [PATCH 646/912] Replaced the warning for exceeding the project name length with an exception. --- openpype/hosts/unreal/hooks/pre_workfile_preparation.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py index 14285cb78c..4c9f8258f5 100644 --- a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py +++ b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py @@ -79,9 +79,9 @@ class UnrealPrelaunchHook(PreLaunchHook): unreal_project_name = os.path.splitext(unreal_project_filename)[0] # Unreal is sensitive about project names longer then 20 chars if len(unreal_project_name) > 20: - self.log.warning(( - f"Project name exceed 20 characters ({unreal_project_name})!" - )) + raise ApplicationLaunchFailed( + f"Project name exceeds 20 characters ({unreal_project_name})!" + ) # Unreal doesn't accept non alphabet characters at the start # of the project name. This is because project name is then used From c2685a6c57394a4fb839a1618846f1363f470657 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 24 Feb 2023 17:02:18 +0100 Subject: [PATCH 647/912] Nuke: caching settings and retrieved active farm module --- openpype/hosts/nuke/api/lib_rendersettings.py | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/nuke/api/lib_rendersettings.py b/openpype/hosts/nuke/api/lib_rendersettings.py index 4d5440fe48..6784890160 100644 --- a/openpype/hosts/nuke/api/lib_rendersettings.py +++ b/openpype/hosts/nuke/api/lib_rendersettings.py @@ -12,25 +12,40 @@ class RenderFarmSettings: log = Logger.get_logger("RenderFarmSettings") _active_farm_module: str = None - _farm_modules: list = [ - "deadline", "muster", "royalrender"] + _farm_modules: list = ["deadline"] _farm_plugins: dict = { "deadline": "NukeSubmitDeadline" } _creator_farm_keys: list = [ "chunk_size", "priority", "concurrent_tasks"] + _cached_project_settings = None + _cached_system_settings = None + def __init__(self, project_settings=None, log=None): """ Get project settings and active farm module """ if log: self.log = log - self._project_settings = ( - project_settings or get_current_project_settings() - ) - # Get active farm module from system settings - self._get_active_farm_module_from_system_settings() + if project_settings: + self._cached_project_settings = project_settings + + @property + def project_settings(self): + """ returning cached project settings or getting new one + """ + if not self._cached_project_settings: + self._cached_project_settings = get_current_project_settings() + return self._cached_project_settings + + @property + def system_settings(self): + """ returning cached project settings or getting new one + """ + if not self._cached_system_settings: + self._cached_system_settings = get_system_settings() + return self._cached_system_settings def _get_active_farm_module_from_system_settings(self): """ Get active farm module from system settings @@ -38,7 +53,7 @@ class RenderFarmSettings: active_modules = [ module_ for module_ in self._farm_modules - if get_system_settings()["modules"][module_]["enabled"] + if self.system_settings["modules"][module_]["enabled"] ] if not active_modules: raise ValueError(( @@ -54,6 +69,10 @@ class RenderFarmSettings: @property def active_farm_module(self): + # cache active farm module + if self._active_farm_module is None: + self._get_active_farm_module_from_system_settings() + return self._active_farm_module def get_rendering_attributes(self): From 61cf3a068d5aea4daab92201540e6b33c9a0fe0a Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 24 Feb 2023 17:07:43 +0100 Subject: [PATCH 648/912] Nuke: missing bits --- openpype/hosts/nuke/api/lib_rendersettings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/nuke/api/lib_rendersettings.py b/openpype/hosts/nuke/api/lib_rendersettings.py index 6784890160..5c23bcb1bc 100644 --- a/openpype/hosts/nuke/api/lib_rendersettings.py +++ b/openpype/hosts/nuke/api/lib_rendersettings.py @@ -41,7 +41,7 @@ class RenderFarmSettings: @property def system_settings(self): - """ returning cached project settings or getting new one + """ returning cached system settings or getting new one """ if not self._cached_system_settings: self._cached_system_settings = get_system_settings() @@ -91,7 +91,7 @@ class RenderFarmSettings: ).format(farm_plugin)) # Get farm module settings - module_settings = self._project_settings[self.active_farm_module] + module_settings = self.project_settings[self.active_farm_module] # Get farm plugin settings farm_plugin_settings = ( From 9bd3ff7184c14394057e96568fff574a5e0a22cb Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Fri, 24 Feb 2023 17:51:24 +0000 Subject: [PATCH 649/912] Fix broken lib. --- openpype/hosts/maya/api/lib.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index ce80396326..4324d321dc 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -403,9 +403,9 @@ def lsattrs(attrs): """ - dep_fn = om.MFnDependencyNode() - dag_fn = om.MFnDagNode() - selection_list = om.MSelectionList() + dep_fn = OpenMaya.MFnDependencyNode() + dag_fn = OpenMaya.MFnDagNode() + selection_list = OpenMaya.MSelectionList() first_attr = next(iter(attrs)) @@ -419,7 +419,7 @@ def lsattrs(attrs): matches = set() for i in range(selection_list.length()): node = selection_list.getDependNode(i) - if node.hasFn(om.MFn.kDagNode): + if node.hasFn(OpenMaya.MFn.kDagNode): fn_node = dag_fn.setObject(node) full_path_names = [path.fullPathName() for path in fn_node.getAllPaths()] @@ -868,11 +868,11 @@ def maintained_selection_api(): Warning: This is *not* added to the undo stack. """ - original = om.MGlobal.getActiveSelectionList() + original = OpenMaya.MGlobal.getActiveSelectionList() try: yield finally: - om.MGlobal.setActiveSelectionList(original) + OpenMaya.MGlobal.setActiveSelectionList(original) @contextlib.contextmanager @@ -1282,11 +1282,11 @@ def get_id(node): if node is None: return - sel = om.MSelectionList() + sel = OpenMaya.MSelectionList() sel.add(node) api_node = sel.getDependNode(0) - fn = om.MFnDependencyNode(api_node) + fn = OpenMaya.MFnDependencyNode(api_node) if not fn.hasAttribute("cbId"): return @@ -3341,15 +3341,15 @@ def iter_visible_nodes_in_range(nodes, start, end): @memodict def get_visibility_mplug(node): """Return api 2.0 MPlug with cached memoize decorator""" - sel = om.MSelectionList() + sel = OpenMaya.MSelectionList() sel.add(node) dag = sel.getDagPath(0) - return om.MFnDagNode(dag).findPlug("visibility", True) + return OpenMaya.MFnDagNode(dag).findPlug("visibility", True) @contextlib.contextmanager def dgcontext(mtime): """MDGContext context manager""" - context = om.MDGContext(mtime) + context = OpenMaya.MDGContext(mtime) try: previous = context.makeCurrent() yield context @@ -3358,9 +3358,9 @@ def iter_visible_nodes_in_range(nodes, start, end): # We skip the first frame as we already used that frame to check for # overall visibilities. And end+1 to include the end frame. - scene_units = om.MTime.uiUnit() + scene_units = OpenMaya.MTime.uiUnit() for frame in range(start + 1, end + 1): - mtime = om.MTime(frame, unit=scene_units) + mtime = OpenMaya.MTime(frame, unit=scene_units) # Build little cache so we don't query the same MPlug's value # again if it was checked on this frame and also is a dependency From 3ae3d01a200ee0b007d38964ffa22573f441ee62 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 23 Feb 2023 22:02:03 +0100 Subject: [PATCH 650/912] Don't use ObjectId in scene inventory view --- openpype/tools/sceneinventory/view.py | 42 ++++++++++++--------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/openpype/tools/sceneinventory/view.py b/openpype/tools/sceneinventory/view.py index 3c4e03a195..d7c80df692 100644 --- a/openpype/tools/sceneinventory/view.py +++ b/openpype/tools/sceneinventory/view.py @@ -4,7 +4,6 @@ from functools import partial from qtpy import QtWidgets, QtCore import qtawesome -from bson.objectid import ObjectId from openpype.client import ( get_version_by_id, @@ -84,22 +83,20 @@ class SceneInventoryView(QtWidgets.QTreeView): if not items: return - repre_ids = [] - for item in items: - item_id = ObjectId(item["representation"]) - if item_id not in repre_ids: - repre_ids.append(item_id) + repre_ids = { + item["representation"] + for item in items + } project_name = legacy_io.active_project() repre_docs = get_representations( project_name, representation_ids=repre_ids, fields=["parent"] ) - version_ids = [] - for repre_doc in repre_docs: - version_id = repre_doc["parent"] - if version_id not in version_ids: - version_ids.append(version_id) + version_ids = { + repre_doc["parent"] + for repre_doc in repre_docs + } loaded_versions = get_versions( project_name, version_ids=version_ids, hero=True @@ -107,18 +104,17 @@ class SceneInventoryView(QtWidgets.QTreeView): loaded_hero_versions = [] versions_by_parent_id = collections.defaultdict(list) - version_parents = [] + subset_ids = set() for version in loaded_versions: if version["type"] == "hero_version": loaded_hero_versions.append(version) else: parent_id = version["parent"] versions_by_parent_id[parent_id].append(version) - if parent_id not in version_parents: - version_parents.append(parent_id) + subset_ids.add(parent_id) all_versions = get_versions( - project_name, subset_ids=version_parents, hero=True + project_name, subset_ids=subset_ids, hero=True ) hero_versions = [] versions = [] @@ -146,11 +142,11 @@ class SceneInventoryView(QtWidgets.QTreeView): switch_to_versioned = None if has_loaded_hero_versions: def _on_switch_to_versioned(items): - repre_ids = [] + repre_ids = set() for item in items: - item_id = ObjectId(item["representation"]) + item_id = item["representation"] if item_id not in repre_ids: - repre_ids.append(item_id) + repre_ids.add(item_id) repre_docs = get_representations( project_name, @@ -158,13 +154,13 @@ class SceneInventoryView(QtWidgets.QTreeView): fields=["parent"] ) - version_ids = [] + version_ids = set() version_id_by_repre_id = {} for repre_doc in repre_docs: version_id = repre_doc["parent"] - version_id_by_repre_id[repre_doc["_id"]] = version_id - if version_id not in version_ids: - version_ids.append(version_id) + repre_id = str(repre_doc["_id"]) + version_id_by_repre_id[repre_id] = version_id + version_ids.add(version_id) hero_versions = get_hero_versions( project_name, @@ -194,7 +190,7 @@ class SceneInventoryView(QtWidgets.QTreeView): version_doc["name"] for item in items: - repre_id = ObjectId(item["representation"]) + repre_id = item["representation"] version_id = version_id_by_repre_id.get(repre_id) version_name = version_name_by_id.get(version_id) if version_name is not None: From cba1b46765ca2d03b3881b8fdb19fa73b205be30 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 23 Feb 2023 22:02:28 +0100 Subject: [PATCH 651/912] don't use ObjectId in switch dialog --- openpype/tools/sceneinventory/switch_dialog.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/openpype/tools/sceneinventory/switch_dialog.py b/openpype/tools/sceneinventory/switch_dialog.py index 47baeaebea..e9575f254b 100644 --- a/openpype/tools/sceneinventory/switch_dialog.py +++ b/openpype/tools/sceneinventory/switch_dialog.py @@ -2,7 +2,6 @@ import collections import logging from qtpy import QtWidgets, QtCore import qtawesome -from bson.objectid import ObjectId from openpype.client import ( get_asset_by_name, @@ -161,7 +160,7 @@ class SwitchAssetDialog(QtWidgets.QDialog): repre_ids = set() content_loaders = set() for item in self._items: - repre_ids.add(ObjectId(item["representation"])) + repre_ids.add(str(item["representation"])) content_loaders.add(item["loader"]) project_name = self.active_project() @@ -170,7 +169,7 @@ class SwitchAssetDialog(QtWidgets.QDialog): representation_ids=repre_ids, archived=True )) - repres_by_id = {repre["_id"]: repre for repre in repres} + repres_by_id = {str(repre["_id"]): repre for repre in repres} # stash context values, works only for single representation if len(repres) == 1: @@ -181,18 +180,18 @@ class SwitchAssetDialog(QtWidgets.QDialog): content_repres = {} archived_repres = [] missing_repres = [] - version_ids = [] + version_ids = set() for repre_id in repre_ids: if repre_id not in repres_by_id: missing_repres.append(repre_id) elif repres_by_id[repre_id]["type"] == "archived_representation": repre = repres_by_id[repre_id] archived_repres.append(repre) - version_ids.append(repre["parent"]) + version_ids.add(repre["parent"]) else: repre = repres_by_id[repre_id] content_repres[repre_id] = repres_by_id[repre_id] - version_ids.append(repre["parent"]) + version_ids.add(repre["parent"]) versions = get_versions( project_name, @@ -1249,7 +1248,7 @@ class SwitchAssetDialog(QtWidgets.QDialog): repre_docs_by_parent_id_by_name[parent_id][name] = repre_doc for container in self._items: - container_repre_id = ObjectId(container["representation"]) + container_repre_id = container["representation"] container_repre = self.content_repres[container_repre_id] container_repre_name = container_repre["name"] From 81ed872905bb1d43ef1c2340e1890e329cf31867 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 24 Feb 2023 10:31:49 +0100 Subject: [PATCH 652/912] apply suggested changes --- openpype/tools/sceneinventory/switch_dialog.py | 2 +- openpype/tools/sceneinventory/view.py | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/openpype/tools/sceneinventory/switch_dialog.py b/openpype/tools/sceneinventory/switch_dialog.py index e9575f254b..4aaad38bbc 100644 --- a/openpype/tools/sceneinventory/switch_dialog.py +++ b/openpype/tools/sceneinventory/switch_dialog.py @@ -195,7 +195,7 @@ class SwitchAssetDialog(QtWidgets.QDialog): versions = get_versions( project_name, - version_ids=set(version_ids), + version_ids=version_ids, hero=True ) content_versions = {} diff --git a/openpype/tools/sceneinventory/view.py b/openpype/tools/sceneinventory/view.py index d7c80df692..a04171e429 100644 --- a/openpype/tools/sceneinventory/view.py +++ b/openpype/tools/sceneinventory/view.py @@ -142,11 +142,10 @@ class SceneInventoryView(QtWidgets.QTreeView): switch_to_versioned = None if has_loaded_hero_versions: def _on_switch_to_versioned(items): - repre_ids = set() - for item in items: - item_id = item["representation"] - if item_id not in repre_ids: - repre_ids.add(item_id) + repre_ids = { + item["representation"] + for item in items + } repre_docs = get_representations( project_name, @@ -168,10 +167,10 @@ class SceneInventoryView(QtWidgets.QTreeView): fields=["version_id"] ) - version_ids = set() + hero_src_version_ids = set() for hero_version in hero_versions: version_id = hero_version["version_id"] - version_ids.add(version_id) + hero_src_version_ids.add(version_id) hero_version_id = hero_version["_id"] for _repre_id, current_version_id in ( version_id_by_repre_id.items() @@ -181,7 +180,7 @@ class SceneInventoryView(QtWidgets.QTreeView): version_docs = get_versions( project_name, - version_ids=version_ids, + version_ids=hero_src_version_ids, fields=["name"] ) version_name_by_id = {} From eb72d10f934e816f8df966cb200e1b686d366e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Je=C5=BEek?= Date: Fri, 24 Feb 2023 21:43:21 +0100 Subject: [PATCH 653/912] global: source template fixed frame duplication (#4503) --- openpype/settings/defaults/project_anatomy/templates.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_anatomy/templates.json b/openpype/settings/defaults/project_anatomy/templates.json index 99a869963b..02c0e35377 100644 --- a/openpype/settings/defaults/project_anatomy/templates.json +++ b/openpype/settings/defaults/project_anatomy/templates.json @@ -55,7 +55,7 @@ }, "source": { "folder": "{root[work]}/{originalDirname}", - "file": "{originalBasename}<.{@frame}><_{udim}>.{ext}", + "file": "{originalBasename}.{ext}", "path": "{@folder}/{@file}" }, "__dynamic_keys_labels__": { From 0e896d981e87068659deda3f4daabcd79ca21490 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 14 Feb 2023 15:48:32 +0000 Subject: [PATCH 654/912] Simplify pointcache proxy integration --- .../plugins/publish/extract_pointcache.py | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/extract_pointcache.py b/openpype/hosts/maya/plugins/publish/extract_pointcache.py index e551858d48..153c177043 100644 --- a/openpype/hosts/maya/plugins/publish/extract_pointcache.py +++ b/openpype/hosts/maya/plugins/publish/extract_pointcache.py @@ -1,5 +1,4 @@ import os -import copy from maya import cmds @@ -10,7 +9,6 @@ from openpype.hosts.maya.api.lib import ( maintained_selection, iter_visible_nodes_in_range ) -from openpype.lib import StringTemplate class ExtractAlembic(publish.Extractor): @@ -135,26 +133,14 @@ class ExtractAlembic(publish.Extractor): **options ) - template_data = copy.deepcopy(instance.data["anatomyData"]) - template_data.update({"ext": "abc"}) - templates = instance.context.data["anatomy"].templates["publish"] - published_filename_without_extension = StringTemplate( - templates["file"] - ).format(template_data).replace(".abc", "_proxy") - transfers = [] - destination = os.path.join( - instance.data["resourcesDir"], - filename.replace( - filename.split(".")[0], - published_filename_without_extension - ) - ) - transfers.append((path, destination)) - - for source, destination in transfers: - self.log.debug("Transfer: {} > {}".format(source, destination)) - - instance.data["transfers"] = transfers + representation = { + "name": "proxy", + "ext": "abc", + "files": path, + "stagingDir": dirname, + "outputName": "proxy" + } + instance.data["representations"].append(representation) def get_members_and_roots(self, instance): return instance[:], instance.data.get("setMembers") From 458eaa8d80889a9d2f1e812b8bd56e2aac500dad Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 16 Feb 2023 16:09:15 +0000 Subject: [PATCH 655/912] Fix pointcache proxy publishing --- openpype/hosts/maya/plugins/publish/extract_pointcache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/publish/extract_pointcache.py b/openpype/hosts/maya/plugins/publish/extract_pointcache.py index 153c177043..892603535c 100644 --- a/openpype/hosts/maya/plugins/publish/extract_pointcache.py +++ b/openpype/hosts/maya/plugins/publish/extract_pointcache.py @@ -136,7 +136,7 @@ class ExtractAlembic(publish.Extractor): representation = { "name": "proxy", "ext": "abc", - "files": path, + "files": os.path.basename(path), "stagingDir": dirname, "outputName": "proxy" } From 2a213ec5618923336cb9abe38192c0aa5f606252 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Fri, 17 Feb 2023 15:18:01 +0000 Subject: [PATCH 656/912] Inform about skipping proxy extraction. --- openpype/hosts/maya/plugins/publish/extract_pointcache.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/maya/plugins/publish/extract_pointcache.py b/openpype/hosts/maya/plugins/publish/extract_pointcache.py index 892603535c..a3b0560099 100644 --- a/openpype/hosts/maya/plugins/publish/extract_pointcache.py +++ b/openpype/hosts/maya/plugins/publish/extract_pointcache.py @@ -114,6 +114,7 @@ class ExtractAlembic(publish.Extractor): # Extract proxy. if not instance.data.get("proxy"): + self.log.info("No proxy nodes found. Skipping proxy extraction.") return path = path.replace(".abc", "_proxy.abc") From 604f66b71e374f7f2f573a01ecf93ee1ff5465b8 Mon Sep 17 00:00:00 2001 From: Ynbot Date: Sat, 25 Feb 2023 03:28:37 +0000 Subject: [PATCH 657/912] [Automated] Bump version --- openpype/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/version.py b/openpype/version.py index bb5171764c..bd1ba5309d 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.15.2-nightly.1" +__version__ = "3.15.2-nightly.2" From d81debdc1050a008597515b1655dfe341566eba5 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 16:18:14 +0100 Subject: [PATCH 658/912] implemented methods to get active site type from sync server module --- .../modules/sync_server/sync_server_module.py | 101 +++++++++++++++++- 1 file changed, 99 insertions(+), 2 deletions(-) diff --git a/openpype/modules/sync_server/sync_server_module.py b/openpype/modules/sync_server/sync_server_module.py index ba0abe7d3b..1c2e820031 100644 --- a/openpype/modules/sync_server/sync_server_module.py +++ b/openpype/modules/sync_server/sync_server_module.py @@ -3,7 +3,6 @@ import sys import time from datetime import datetime import threading -import platform import copy import signal from collections import deque, defaultdict @@ -25,7 +24,11 @@ from openpype.lib import Logger, get_local_site_id from openpype.pipeline import AvalonMongoDB, Anatomy from openpype.settings.lib import ( get_default_anatomy_settings, - get_anatomy_settings + get_anatomy_settings, + get_local_settings, +) +from openpype.settings.constants import ( + DEFAULT_PROJECT_KEY ) from .providers.local_drive import LocalDriveHandler @@ -639,6 +642,100 @@ class SyncServerModule(OpenPypeModule, ITrayModule): return get_local_site_id() return active_site + def get_active_site_type(self, project_name, local_settings=None): + """Active site which is defined by artist. + + Unlike 'get_active_site' is this method also checking local settings + where might be different active site set by user. The output is limited + to "studio" and "local". + + This method is used by Anatomy when is decided which + + Todos: + Check if sync server is enabled for the project. + - To be able to do that the sync settings MUST NOT be cached for + all projects at once. The sync settings preparation for all + projects is reasonable only in sync server loop. + + Args: + project_name (str): Name of project where to look for active site. + local_settings (Optional[dict[str, Any]]): Prepared local settings. + + Returns: + Literal["studio", "local"]: Active site. + """ + + if not self.enabled: + return "studio" + + if local_settings is None: + local_settings = get_local_settings() + + local_project_settings = local_settings.get("projects") + project_settings = get_project_settings(project_name) + sync_server_settings = project_settings["global"]["sync_server"] + if not sync_server_settings["enabled"]: + return "studio" + + project_active_site = sync_server_settings["config"]["active_site"] + if not local_project_settings: + return project_active_site + + project_locals = local_project_settings.get(project_name) or {} + default_locals = local_project_settings.get(DEFAULT_PROJECT_KEY) or {} + active_site = ( + project_locals.get("active_site") + or default_locals.get("active_site") + ) + if active_site: + return active_site + return project_active_site + + def get_local_site_root_overrides( + self, project_name, site_name, local_settings=None + ): + """Get root overrides for project on a site. + + Implemented to be used in 'Anatomy' for other than 'studio' site. + + Args: + project_name (str): Project for which root overrides should be + received. + site_name (str): Name of site for which should be received roots. + local_settings (Optional[dict[str, Any]]): Prepare local settigns + values. + + Returns: + Union[dict[str, Any], None]: Root overrides for this machine. + """ + + if local_settings is None: + local_settings = get_local_settings() + + if not local_settings: + return + + local_project_settings = local_settings.get("projects") or {} + + # Check for roots existence in local settings first + roots_project_locals = ( + local_project_settings + .get(project_name, {}) + ) + roots_default_locals = ( + local_project_settings + .get(DEFAULT_PROJECT_KEY, {}) + ) + + # Skip rest of processing if roots are not set + if not roots_project_locals and not roots_default_locals: + return + + # Combine roots from local settings + roots_locals = roots_default_locals.get(site_name) or {} + roots_locals.update(roots_project_locals.get(site_name) or {}) + return roots_locals + # remote sites def get_remote_sites(self, project_name): """ From ded3933a0c461f734a07c86e3495479fb64f4573 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 16:22:29 +0100 Subject: [PATCH 659/912] Base anatomy expect only root overrides --- openpype/pipeline/anatomy.py | 63 +++++++----------------------------- 1 file changed, 12 insertions(+), 51 deletions(-) diff --git a/openpype/pipeline/anatomy.py b/openpype/pipeline/anatomy.py index 49d86d69d6..0768167885 100644 --- a/openpype/pipeline/anatomy.py +++ b/openpype/pipeline/anatomy.py @@ -57,20 +57,13 @@ class BaseAnatomy(object): root_key_regex = re.compile(r"{(root?[^}]+)}") root_name_regex = re.compile(r"root\[([^]]+)\]") - def __init__(self, project_doc, local_settings, site_name): + def __init__(self, project_doc, root_overrides=None): project_name = project_doc["name"] self.project_name = project_name self.project_code = project_doc["data"]["code"] - if (site_name and - site_name not in ["studio", "local", get_local_site_id()]): - raise RuntimeError("Anatomy could be created only for default " - "local sites not for {}".format(site_name)) - - self._site_name = site_name - self._data = self._prepare_anatomy_data( - project_doc, local_settings, site_name + project_doc, root_overrides ) self._templates_obj = AnatomyTemplates(self) self._roots_obj = Roots(self) @@ -92,28 +85,18 @@ class BaseAnatomy(object): def items(self): return copy.deepcopy(self._data).items() - def _prepare_anatomy_data(self, project_doc, local_settings, site_name): + def _prepare_anatomy_data(self, project_doc, root_overrides): """Prepare anatomy data for further processing. Method added to replace `{task}` with `{task[name]}` in templates. """ - project_name = project_doc["name"] + anatomy_data = self._project_doc_to_anatomy_data(project_doc) - templates_data = anatomy_data.get("templates") - if templates_data: - # Replace `{task}` with `{task[name]}` in templates - value_queue = collections.deque() - value_queue.append(templates_data) - while value_queue: - item = value_queue.popleft() - if not isinstance(item, dict): - continue - - self._apply_local_settings_on_anatomy_data(anatomy_data, - local_settings, - project_name, - site_name) + self._apply_local_settings_on_anatomy_data( + anatomy_data, + root_overrides + ) return anatomy_data @@ -347,7 +330,7 @@ class BaseAnatomy(object): return output def _apply_local_settings_on_anatomy_data( - self, anatomy_data, local_settings, project_name, site_name + self, anatomy_data, root_overrides ): """Apply local settings on anatomy data. @@ -366,40 +349,18 @@ class BaseAnatomy(object): Args: anatomy_data (dict): Data for anatomy. - local_settings (dict): Data of local settings. - project_name (str): Name of project for which anatomy data are. + root_overrides (dict): Data of local settings. """ - if not local_settings: - return - local_project_settings = local_settings.get("projects") or {} - - # Check for roots existence in local settings first - roots_project_locals = ( - local_project_settings - .get(project_name, {}) - ) - roots_default_locals = ( - local_project_settings - .get(DEFAULT_PROJECT_KEY, {}) - ) - - # Skip rest of processing if roots are not set - if not roots_project_locals and not roots_default_locals: - return - - # Combine roots from local settings - roots_locals = roots_default_locals.get(site_name) or {} - roots_locals.update(roots_project_locals.get(site_name) or {}) # Skip processing if roots for current active site are not available in # local settings - if not roots_locals: + if not root_overrides: return current_platform = platform.system().lower() root_data = anatomy_data["roots"] - for root_name, path in roots_locals.items(): + for root_name, path in root_overrides.items(): if root_name not in root_data: continue anatomy_data["roots"][root_name][current_platform] = ( From c55104afdb868a4b5dea6ec69c5a164250cc51be Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 16:22:53 +0100 Subject: [PATCH 660/912] Use CacheItem for keeping track about caches --- openpype/pipeline/anatomy.py | 57 ++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/openpype/pipeline/anatomy.py b/openpype/pipeline/anatomy.py index 0768167885..a5cb97b60f 100644 --- a/openpype/pipeline/anatomy.py +++ b/openpype/pipeline/anatomy.py @@ -368,9 +368,62 @@ class BaseAnatomy(object): ) +class CacheItem: + """Helper to cache data. + + Helper does not handle refresh of data and does not mark data as outdated. + Who uses the object should check of outdated state on his own will. + """ + + default_lifetime = 10 + + def __init__(self, lifetime=None): + self._data = None + self._cached = None + self._lifetime = lifetime or self.default_lifetime + + @property + def data(self): + """Cached data/object. + + Returns: + Any: Whatever was cached. + """ + + return self._data + + @property + def is_outdated(self): + """Item has outdated cache. + + Lifetime of cache item expired or was not yet set. + + Returns: + bool: Item is outdated. + """ + + if self._cached is None: + return True + return (time.time() - self._cached) > self._lifetime + + def update_data(self, data): + """Update cache of data. + + Args: + data (Any): Data to cache. + """ + + self._data = data + self._cached = time.time() + + class Anatomy(BaseAnatomy): - _project_cache = {} - _site_cache = {} + _sync_server_addon_cache = CacheItem() + _project_cache = collections.defaultdict(CacheItem) + _default_site_id_cache = collections.defaultdict(CacheItem) + _root_overrides_cache = collections.defaultdict( + lambda: collections.defaultdict(CacheItem) + ) def __init__(self, project_name=None, site_name=None): if not project_name: From 72eac0b31edaed55347f0f047f28eec894417055 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 16:23:28 +0100 Subject: [PATCH 661/912] change how site resolving and it's root overrides work --- openpype/pipeline/anatomy.py | 170 +++++++++++++++++++++++------------ 1 file changed, 114 insertions(+), 56 deletions(-) diff --git a/openpype/pipeline/anatomy.py b/openpype/pipeline/anatomy.py index a5cb97b60f..7f5be18b12 100644 --- a/openpype/pipeline/anatomy.py +++ b/openpype/pipeline/anatomy.py @@ -9,7 +9,6 @@ import six import time from openpype.settings.lib import ( - get_project_settings, get_local_settings, ) from openpype.settings.constants import ( @@ -25,6 +24,7 @@ from openpype.lib.path_templates import ( ) from openpype.lib.log import Logger from openpype.lib import get_local_site_id +from openpype.modules import ModulesManager log = Logger.get_logger(__name__) @@ -436,73 +436,131 @@ class Anatomy(BaseAnatomy): )) project_doc = self.get_project_doc_from_cache(project_name) - local_settings = get_local_settings() - if not site_name: - site_name = self.get_site_name_from_cache( - project_name, local_settings - ) + root_overrides = self._get_site_root_overrides(project_name, site_name) - super(Anatomy, self).__init__( - project_doc, - local_settings, - site_name - ) + super(Anatomy, self).__init__(project_doc, root_overrides) @classmethod def get_project_doc_from_cache(cls, project_name): - project_cache = cls._project_cache.get(project_name) - if project_cache is not None: - if time.time() - project_cache["start"] > 10: - cls._project_cache.pop(project_name) - project_cache = None - - if project_cache is None: - project_cache = { - "project_doc": get_project(project_name), - "start": time.time() - } - cls._project_cache[project_name] = project_cache - - return copy.deepcopy( - cls._project_cache[project_name]["project_doc"] - ) + project_cache = cls._project_cache[project_name] + if project_cache.is_outdated: + project_cache.update_data(get_project(project_name)) + return copy.deepcopy(project_cache.data) @classmethod - def get_site_name_from_cache(cls, project_name, local_settings): - site_cache = cls._site_cache.get(project_name) - if site_cache is not None: - if time.time() - site_cache["start"] > 10: - cls._site_cache.pop(project_name) - site_cache = None + def get_sync_server_addon(cls): + if cls._sync_server_addon_cache.is_outdated: + manager = ModulesManager() + cls._sync_server_addon_cache.update_data( + manager.enabled_modules.get("sync_server") + ) + return cls._sync_server_addon_cache.data - if site_cache: - return site_cache["site_name"] + @classmethod + def _get_studio_roots_overrides(cls, project_name, local_settings=None): + """This would return 'studio' site override by local settings. - local_project_settings = local_settings.get("projects") + Notes: + This logic handles local overrides of studio site which may be + available even when sync server is not enabled. + Handling of 'studio' and 'local' site was separated as preparation + for AYON development where that will be received from + separated sources. + + Args: + project_name (str): Name of project. + local_settings (Optional[dict[str, Any]]): Prepared local settings. + + Returns: + Union[Dict[str, str], None]): Local root overrides. + """ + + if local_settings is None: + local_settings = get_local_settings() + + local_project_settings = local_settings.get("projects") or {} if not local_project_settings: + return None + + # Check for roots existence in local settings first + roots_project_locals = ( + local_project_settings + .get(project_name, {}) + ) + roots_default_locals = ( + local_project_settings + .get(DEFAULT_PROJECT_KEY, {}) + ) + + # Skip rest of processing if roots are not set + if not roots_project_locals and not roots_default_locals: return - project_locals = local_project_settings.get(project_name) or {} - default_locals = local_project_settings.get(DEFAULT_PROJECT_KEY) or {} - active_site = ( - project_locals.get("active_site") - or default_locals.get("active_site") - ) - if not active_site: - project_settings = get_project_settings(project_name) - active_site = ( - project_settings - ["global"] - ["sync_server"] - ["config"] - ["active_site"] - ) + # Combine roots from local settings + roots_locals = roots_default_locals.get("studio") or {} + roots_locals.update_data(roots_project_locals.get("studio") or {}) + return roots_locals - cls._site_cache[project_name] = { - "site_name": active_site, - "start": time.time() - } - return active_site + + @classmethod + def _get_site_root_overrides(cls, project_name, site_name): + """Get root overrides for site. + + Args: + project_name (str): Project name for which root overrides should be + received. + site_name (Union[str, None]): Name of site for which root overrides + should be returned. + """ + + # Local settings may be used more than once or may not be used at all + # - to avoid slowdowns 'get_local_settings' is not called until it's + # really needed + local_settings = None + local_site_id = get_local_site_id() + + # First check if sync server is available and enabled + sync_server = cls.get_sync_server_addon() + if sync_server is None or not sync_server.enabled: + # QUESTION is ok to force 'studio' when site sync is not enabled? + site_name = "studio" + + elif not site_name: + # Use sync server to receive active site name + project_cache = cls._default_site_id_cache[project_name] + if project_cache.is_outdated: + local_settings = get_local_settings() + project_cache.update_data( + sync_server.get_active_site_type( + project_name, local_settings + ) + ) + site_name = project_cache.data + + elif site_name not in ("studio", "local"): + # Validate that site name is valid + if site_name != local_site_id: + raise RuntimeError(( + "Anatomy could be created only for" + " default local sites not for {}" + ).format(site_name)) + site_name = "local" + + site_cache = cls._root_overrides_cache[project_name][site_name] + if site_cache.is_outdated: + if site_name == "studio": + # Handle studio root overrides without sync server + # - studio root overrides can be done even without sync server + roots_overrides = cls._get_studio_roots_overrides( + project_name, local_settings + ) + else: + # Ask sync server to get roots overrides + roots_overrides = sync_server.get_local_site_root_overrides( + project_name, site_name, local_settings + ) + site_cache.update_data(roots_overrides) + return site_cache.data class AnatomyTemplateUnsolved(TemplateUnsolved): From 43179444397f57cfbeca04803caf503a3635e1a5 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 16:32:59 +0100 Subject: [PATCH 662/912] fix modules access --- openpype/pipeline/anatomy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/pipeline/anatomy.py b/openpype/pipeline/anatomy.py index 7f5be18b12..bbc696d7f1 100644 --- a/openpype/pipeline/anatomy.py +++ b/openpype/pipeline/anatomy.py @@ -452,7 +452,7 @@ class Anatomy(BaseAnatomy): if cls._sync_server_addon_cache.is_outdated: manager = ModulesManager() cls._sync_server_addon_cache.update_data( - manager.enabled_modules.get("sync_server") + manager.get_enabled_module("sync_server") ) return cls._sync_server_addon_cache.data From f4c47d41d493050adc40324ab0c32c77efc217ae Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 18:12:34 +0100 Subject: [PATCH 663/912] move validation of site name to sync server --- openpype/modules/sync_server/sync_server_module.py | 10 ++++++++++ openpype/pipeline/anatomy.py | 11 ----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/openpype/modules/sync_server/sync_server_module.py b/openpype/modules/sync_server/sync_server_module.py index 1c2e820031..c3e28bc4f2 100644 --- a/openpype/modules/sync_server/sync_server_module.py +++ b/openpype/modules/sync_server/sync_server_module.py @@ -709,6 +709,16 @@ class SyncServerModule(OpenPypeModule, ITrayModule): Union[dict[str, Any], None]: Root overrides for this machine. """ + # Validate that site name is valid + if site_name not in ("studio", "local"): + # Considure local site id as 'local' + if site_name != get_local_site_id(): + raise RuntimeError(( + "Anatomy could be created only for" + " default local sites not for {}" + ).format(site_name)) + site_name = "local" + if local_settings is None: local_settings = get_local_settings() diff --git a/openpype/pipeline/anatomy.py b/openpype/pipeline/anatomy.py index bbc696d7f1..bb365c916e 100644 --- a/openpype/pipeline/anatomy.py +++ b/openpype/pipeline/anatomy.py @@ -23,7 +23,6 @@ from openpype.lib.path_templates import ( FormatObject, ) from openpype.lib.log import Logger -from openpype.lib import get_local_site_id from openpype.modules import ModulesManager log = Logger.get_logger(__name__) @@ -517,7 +516,6 @@ class Anatomy(BaseAnatomy): # - to avoid slowdowns 'get_local_settings' is not called until it's # really needed local_settings = None - local_site_id = get_local_site_id() # First check if sync server is available and enabled sync_server = cls.get_sync_server_addon() @@ -537,15 +535,6 @@ class Anatomy(BaseAnatomy): ) site_name = project_cache.data - elif site_name not in ("studio", "local"): - # Validate that site name is valid - if site_name != local_site_id: - raise RuntimeError(( - "Anatomy could be created only for" - " default local sites not for {}" - ).format(site_name)) - site_name = "local" - site_cache = cls._root_overrides_cache[project_name][site_name] if site_cache.is_outdated: if site_name == "studio": From 5de35b48e57ac958eadb6cfd387a146e962bc90d Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 18:13:14 +0100 Subject: [PATCH 664/912] change exception type and message --- openpype/modules/sync_server/sync_server_module.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/modules/sync_server/sync_server_module.py b/openpype/modules/sync_server/sync_server_module.py index c3e28bc4f2..7ea8f62d03 100644 --- a/openpype/modules/sync_server/sync_server_module.py +++ b/openpype/modules/sync_server/sync_server_module.py @@ -713,9 +713,9 @@ class SyncServerModule(OpenPypeModule, ITrayModule): if site_name not in ("studio", "local"): # Considure local site id as 'local' if site_name != get_local_site_id(): - raise RuntimeError(( - "Anatomy could be created only for" - " default local sites not for {}" + raise ValueError(( + "Root overrides are available only for" + " default sites not for \"{}\"" ).format(site_name)) site_name = "local" From 1b5d7a1d385b275d84fcc2bb4ee8d3a71b569f3e Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 18:13:37 +0100 Subject: [PATCH 665/912] rename method --- openpype/modules/sync_server/sync_server_module.py | 2 +- openpype/pipeline/anatomy.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/modules/sync_server/sync_server_module.py b/openpype/modules/sync_server/sync_server_module.py index 7ea8f62d03..28863c091a 100644 --- a/openpype/modules/sync_server/sync_server_module.py +++ b/openpype/modules/sync_server/sync_server_module.py @@ -691,7 +691,7 @@ class SyncServerModule(OpenPypeModule, ITrayModule): return active_site return project_active_site - def get_local_site_root_overrides( + def get_site_root_overrides( self, project_name, site_name, local_settings=None ): """Get root overrides for project on a site. diff --git a/openpype/pipeline/anatomy.py b/openpype/pipeline/anatomy.py index bb365c916e..d1bda2cf18 100644 --- a/openpype/pipeline/anatomy.py +++ b/openpype/pipeline/anatomy.py @@ -545,7 +545,7 @@ class Anatomy(BaseAnatomy): ) else: # Ask sync server to get roots overrides - roots_overrides = sync_server.get_local_site_root_overrides( + roots_overrides = sync_server.get_site_root_overrides( project_name, site_name, local_settings ) site_cache.update_data(roots_overrides) From 3408c25f7957805ac5b250c154ef2da464e0662e Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 18:24:35 +0100 Subject: [PATCH 666/912] remove doubled empty line --- openpype/pipeline/anatomy.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/pipeline/anatomy.py b/openpype/pipeline/anatomy.py index d1bda2cf18..ac915b61f0 100644 --- a/openpype/pipeline/anatomy.py +++ b/openpype/pipeline/anatomy.py @@ -500,7 +500,6 @@ class Anatomy(BaseAnatomy): roots_locals.update_data(roots_project_locals.get("studio") or {}) return roots_locals - @classmethod def _get_site_root_overrides(cls, project_name, site_name): """Get root overrides for site. From afec68dcba636ccc345ab080bf049c37ec692068 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 27 Feb 2023 10:56:11 +0100 Subject: [PATCH 667/912] fix dict update --- openpype/pipeline/anatomy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/pipeline/anatomy.py b/openpype/pipeline/anatomy.py index ac915b61f0..683960f3d8 100644 --- a/openpype/pipeline/anatomy.py +++ b/openpype/pipeline/anatomy.py @@ -497,7 +497,7 @@ class Anatomy(BaseAnatomy): # Combine roots from local settings roots_locals = roots_default_locals.get("studio") or {} - roots_locals.update_data(roots_project_locals.get("studio") or {}) + roots_locals.update(roots_project_locals.get("studio") or {}) return roots_locals @classmethod From 3c215350931b4b65d5eab9a51cdc804ed128478a Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 27 Feb 2023 11:34:30 +0100 Subject: [PATCH 668/912] removed unnecessary try catch --- openpype/modules/sync_server/sync_server.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/openpype/modules/sync_server/sync_server.py b/openpype/modules/sync_server/sync_server.py index aef3623efa..5b873a37cf 100644 --- a/openpype/modules/sync_server/sync_server.py +++ b/openpype/modules/sync_server/sync_server.py @@ -50,13 +50,10 @@ async def upload(module, project_name, file, representation, provider_name, presets=preset) file_path = file.get("path", "") - try: - local_file_path, remote_file_path = resolve_paths( - module, file_path, project_name, - remote_site_name, remote_handler - ) - except Exception as exp: - print(exp) + local_file_path, remote_file_path = resolve_paths( + module, file_path, project_name, + remote_site_name, remote_handler + ) target_folder = os.path.dirname(remote_file_path) folder_id = remote_handler.create_folder(target_folder) From 557ce7c016515f15878d9c37d6a8cf6fb777be43 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 27 Feb 2023 15:08:03 +0100 Subject: [PATCH 669/912] Nuke, Deadline: moving to module plugin centric approach --- openpype/hosts/nuke/api/lib_rendersettings.py | 111 ------------------ .../plugins/create/create_write_prerender.py | 37 +----- .../plugins/create/create_write_render.py | 36 +----- .../plugins/publish/submit_nuke_deadline.py | 81 +++++++++---- 4 files changed, 60 insertions(+), 205 deletions(-) delete mode 100644 openpype/hosts/nuke/api/lib_rendersettings.py diff --git a/openpype/hosts/nuke/api/lib_rendersettings.py b/openpype/hosts/nuke/api/lib_rendersettings.py deleted file mode 100644 index 5c23bcb1bc..0000000000 --- a/openpype/hosts/nuke/api/lib_rendersettings.py +++ /dev/null @@ -1,111 +0,0 @@ - -from openpype.lib import Logger -from openpype.settings import ( - get_current_project_settings, - get_system_settings -) - - -class RenderFarmSettings: - """ Class for getting farm settings from project settings - """ - log = Logger.get_logger("RenderFarmSettings") - - _active_farm_module: str = None - _farm_modules: list = ["deadline"] - _farm_plugins: dict = { - "deadline": "NukeSubmitDeadline" - } - _creator_farm_keys: list = [ - "chunk_size", "priority", "concurrent_tasks"] - - _cached_project_settings = None - _cached_system_settings = None - - def __init__(self, project_settings=None, log=None): - """ Get project settings and active farm module - """ - if log: - self.log = log - - if project_settings: - self._cached_project_settings = project_settings - - @property - def project_settings(self): - """ returning cached project settings or getting new one - """ - if not self._cached_project_settings: - self._cached_project_settings = get_current_project_settings() - return self._cached_project_settings - - @property - def system_settings(self): - """ returning cached system settings or getting new one - """ - if not self._cached_system_settings: - self._cached_system_settings = get_system_settings() - return self._cached_system_settings - - def _get_active_farm_module_from_system_settings(self): - """ Get active farm module from system settings - """ - active_modules = [ - module_ - for module_ in self._farm_modules - if self.system_settings["modules"][module_]["enabled"] - ] - if not active_modules: - raise ValueError(( - "No active farm module found in system settings." - )) - if len(active_modules) > 1: - raise ValueError(( - "Multiple active farm modules " - "found in system settings. {}".format(active_modules) - )) - - self._active_farm_module = active_modules.pop() - - @property - def active_farm_module(self): - # cache active farm module - if self._active_farm_module is None: - self._get_active_farm_module_from_system_settings() - - return self._active_farm_module - - def get_rendering_attributes(self): - ''' Get rendering attributes from project settings - - Returns: - dict: rendering attributes - ''' - return_dict = {} - farm_plugin = self._farm_plugins.get(self.active_farm_module) - self.log.debug("Farm plugin: \"{}\"".format(farm_plugin)) - - if not farm_plugin: - raise ValueError(( - "Farm plugin \"{}\" not found in farm plugins." - ).format(farm_plugin)) - - # Get farm module settings - module_settings = self.project_settings[self.active_farm_module] - - # Get farm plugin settings - farm_plugin_settings = ( - module_settings["publish"][farm_plugin]) - self.log.debug( - "Farm plugin settings: \"{}\"".format(farm_plugin_settings)) - - # Get all keys from farm_plugin_settings - for key in self._creator_farm_keys: - if key not in farm_plugin_settings: - self.log.warning(( - "Key \"{}\" not found in farm plugin \"{}\" settings." - ).format(key, farm_plugin)) - continue - return_dict[key] = farm_plugin_settings[key] - - return return_dict diff --git a/openpype/hosts/nuke/plugins/create/create_write_prerender.py b/openpype/hosts/nuke/plugins/create/create_write_prerender.py index 411a79dbf4..1603bf17e3 100644 --- a/openpype/hosts/nuke/plugins/create/create_write_prerender.py +++ b/openpype/hosts/nuke/plugins/create/create_write_prerender.py @@ -6,13 +6,9 @@ from openpype.pipeline import ( CreatedInstance ) from openpype.lib import ( - BoolDef, - NumberDef, - UISeparatorDef, - UILabelDef + BoolDef ) from openpype.hosts.nuke import api as napi -from openpype.hosts.nuke.api.lib_rendersettings import RenderFarmSettings class CreateWritePrerender(napi.NukeWriteCreator): @@ -50,37 +46,6 @@ class CreateWritePrerender(napi.NukeWriteCreator): self._get_render_target_enum(), self._get_reviewable_bool() ] - if "farm_rendering" in self.instance_attributes: - render_farm_settings = RenderFarmSettings( - log=self.log).get_rendering_attributes() - - - attr_defs.extend([ - UISeparatorDef(), - UILabelDef("Farm rendering attributes"), - BoolDef("suspended_publish", label="Suspended publishing"), - NumberDef( - "farm_priority", - label="Priority", - minimum=1, - maximum=99, - default=render_farm_settings.get("priority", 50) - ), - NumberDef( - "farm_chunk", - label="Chunk size", - minimum=1, - maximum=99, - default=render_farm_settings.get("chunk_size", 10) - ), - NumberDef( - "farm_concurrency", - label="Concurrent tasks", - minimum=1, - maximum=10, - default=render_farm_settings.get("concurrent_tasks", 1) - ) - ]) return attr_defs def create_instance_node(self, subset_name, instance_data): diff --git a/openpype/hosts/nuke/plugins/create/create_write_render.py b/openpype/hosts/nuke/plugins/create/create_write_render.py index a51661425f..72fcb4f232 100644 --- a/openpype/hosts/nuke/plugins/create/create_write_render.py +++ b/openpype/hosts/nuke/plugins/create/create_write_render.py @@ -6,13 +6,9 @@ from openpype.pipeline import ( CreatedInstance ) from openpype.lib import ( - BoolDef, - NumberDef, - UISeparatorDef, - UILabelDef + BoolDef ) from openpype.hosts.nuke import api as napi -from openpype.hosts.nuke.api.lib_rendersettings import RenderFarmSettings class CreateWriteRender(napi.NukeWriteCreator): @@ -47,36 +43,6 @@ class CreateWriteRender(napi.NukeWriteCreator): self._get_render_target_enum(), self._get_reviewable_bool() ] - if "farm_rendering" in self.instance_attributes: - render_farm_settings = RenderFarmSettings( - log=self.log).get_rendering_attributes() - - attr_defs.extend([ - UISeparatorDef(), - UILabelDef("Farm rendering attributes"), - BoolDef("suspended_publish", label="Suspended publishing"), - NumberDef( - "farm_priority", - label="Priority", - minimum=1, - maximum=99, - default=render_farm_settings.get("priority", 50) - ), - NumberDef( - "farm_chunk", - label="Chunk size", - minimum=1, - maximum=99, - default=render_farm_settings.get("chunk_size", 10) - ), - NumberDef( - "farm_concurrency", - label="Concurrent tasks", - minimum=1, - maximum=10, - default=render_farm_settings.get("concurrent_tasks", 1) - ) - ]) return attr_defs def create_instance_node(self, subset_name, instance_data): diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py index b4b59c4c77..51e380dc03 100644 --- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py @@ -9,11 +9,19 @@ import pyblish.api import nuke from openpype.pipeline import legacy_io +from openpype.pipeline.publish import ( + OpenPypePyblishPluginMixin +) from openpype.tests.lib import is_in_tests -from openpype.lib import is_running_from_build +from openpype.lib import ( + is_running_from_build, + BoolDef, + NumberDef, + UISeparatorDef +) - -class NukeSubmitDeadline(pyblish.api.InstancePlugin): +class NukeSubmitDeadline(pyblish.api.InstancePlugin, + OpenPypePyblishPluginMixin): """Submit write to Deadline Renders are submitted to a Deadline Web Service as @@ -21,10 +29,10 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): """ - label = "Submit to Deadline" + label = "Submit Nuke to Deadline" order = pyblish.api.IntegratorOrder + 0.1 hosts = ["nuke"] - families = ["render.farm", "prerender.farm"] + families = ["render", "prerender.farm"] optional = True targets = ["local"] @@ -39,7 +47,42 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): env_allowed_keys = [] env_search_replace_values = {} + @classmethod + def get_attribute_defs(cls): + return [ + NumberDef( + "priority", + label="Priority", + default=cls.priority, + decimals=0 + ), + NumberDef( + "chunk", + label="Frames Per Task", + default=cls.chunk_size, + decimals=0, + minimum=1, + maximum=1000 + ), + NumberDef( + "concurrency", + label="Concurency", + default=cls.concurrent_tasks, + decimals=0, + minimum=1, + maximum=10 + ), + BoolDef( + "use_gpu", + default=cls.use_gpu, + label="Use GPU" + ) + ] + def process(self, instance): + instance.data["attributeValues"] = self.get_attr_values_from_data( + instance.data) + instance.data["toBeRenderedOn"] = "deadline" families = instance.data["families"] @@ -161,20 +204,6 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): except OSError: pass - # define chunk and priority - chunk_size = instance.data.get("farm_chunk") - if not chunk_size: - chunk_size = self.chunk_size - - # define chunk and priority - concurrent_tasks = instance.data.get("farm_concurrency") - if not concurrent_tasks: - concurrent_tasks = self.concurrent_tasks - - priority = instance.data.get("farm_priority") - if not priority: - priority = self.priority - # resolve any limit groups limit_groups = self.get_limit_groups() self.log.info("Limit groups: `{}`".format(limit_groups)) @@ -193,9 +222,14 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): # Arbitrary username, for visualisation in Monitor "UserName": self._deadline_user, - "Priority": priority, - "ChunkSize": chunk_size, - "ConcurrentTasks": concurrent_tasks, + "Priority": instance.data["attributeValues"].get( + "priority", self.priority), + "ChunkSize": instance.data["attributeValues"].get( + "chunk", self.chunk_size), + "ConcurrentTasks": instance.data["attributeValues"].get( + "concurrency", + self.concurrent_tasks + ), "Department": self.department, @@ -234,7 +268,8 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin): "AWSAssetFile0": render_path, # using GPU by default - "UseGpu": self.use_gpu, + "UseGpu": instance.data["attributeValues"].get( + "use_gpu", self.use_gpu), # Only the specific write node is rendered. "WriteNode": exe_node_name From e444ab3f5e3037cc0528a748df4f0554a597fb78 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 27 Feb 2023 15:16:27 +0100 Subject: [PATCH 670/912] hound comments --- .../modules/deadline/plugins/publish/submit_nuke_deadline.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py index 51e380dc03..aff34c7e4a 100644 --- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py @@ -16,10 +16,10 @@ from openpype.tests.lib import is_in_tests from openpype.lib import ( is_running_from_build, BoolDef, - NumberDef, - UISeparatorDef + NumberDef ) + class NukeSubmitDeadline(pyblish.api.InstancePlugin, OpenPypePyblishPluginMixin): """Submit write to Deadline From fa879c9beb1982cb02f12d36925d28c81943589a Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 27 Feb 2023 17:06:14 +0100 Subject: [PATCH 671/912] fix UI definitions for publish plugins (#4534) --- openpype/tools/publisher/control.py | 3 ++ openpype/tools/publisher/widgets/widgets.py | 36 +++++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/openpype/tools/publisher/control.py b/openpype/tools/publisher/control.py index 023a20ca5e..49e7eeb4f7 100644 --- a/openpype/tools/publisher/control.py +++ b/openpype/tools/publisher/control.py @@ -18,6 +18,7 @@ from openpype.client import ( ) from openpype.lib.events import EventSystem from openpype.lib.attribute_definitions import ( + UIDef, serialize_attr_defs, deserialize_attr_defs, ) @@ -1938,6 +1939,8 @@ class PublisherController(BasePublisherController): plugin_values = all_plugin_values[plugin_name] for attr_def in attr_defs: + if isinstance(attr_def, UIDef): + continue if attr_def.key not in plugin_values: plugin_values[attr_def.key] = [] attr_values = plugin_values[attr_def.key] diff --git a/openpype/tools/publisher/widgets/widgets.py b/openpype/tools/publisher/widgets/widgets.py index 8da3886419..86475460aa 100644 --- a/openpype/tools/publisher/widgets/widgets.py +++ b/openpype/tools/publisher/widgets/widgets.py @@ -9,7 +9,7 @@ import collections from qtpy import QtWidgets, QtCore, QtGui import qtawesome -from openpype.lib.attribute_definitions import UnknownDef +from openpype.lib.attribute_definitions import UnknownDef, UIDef from openpype.tools.attribute_defs import create_widget_for_attr_def from openpype.tools import resources from openpype.tools.flickcharm import FlickCharm @@ -1442,7 +1442,16 @@ class PublishPluginAttrsWidget(QtWidgets.QWidget): ) content_widget = QtWidgets.QWidget(self._scroll_area) - content_layout = QtWidgets.QFormLayout(content_widget) + attr_def_widget = QtWidgets.QWidget(content_widget) + attr_def_layout = QtWidgets.QGridLayout(attr_def_widget) + attr_def_layout.setColumnStretch(0, 0) + attr_def_layout.setColumnStretch(1, 1) + + content_layout = QtWidgets.QVBoxLayout(content_widget) + content_layout.addWidget(attr_def_widget, 0) + content_layout.addStretch(1) + + row = 0 for plugin_name, attr_defs, all_plugin_values in result: plugin_values = all_plugin_values[plugin_name] @@ -1459,8 +1468,29 @@ class PublishPluginAttrsWidget(QtWidgets.QWidget): hidden_widget = True if not hidden_widget: + expand_cols = 2 + if attr_def.is_value_def and attr_def.is_label_horizontal: + expand_cols = 1 + + col_num = 2 - expand_cols label = attr_def.label or attr_def.key - content_layout.addRow(label, widget) + if label: + label_widget = QtWidgets.QLabel(label, content_widget) + tooltip = attr_def.tooltip + if tooltip: + label_widget.setToolTip(tooltip) + attr_def_layout.addWidget( + label_widget, row, 0, 1, expand_cols + ) + if not attr_def.is_label_horizontal: + row += 1 + attr_def_layout.addWidget( + widget, row, col_num, 1, expand_cols + ) + row += 1 + + if isinstance(attr_def, UIDef): + continue widget.value_changed.connect(self._input_value_changed) From 2839e775e43eaddaa28d58bb11471c450198b4dd Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 27 Feb 2023 18:55:23 +0100 Subject: [PATCH 672/912] Deadline: Hint to use Python 3 (#4518) * add shebank for python 3 --- .../deadline/repository/custom/plugins/GlobalJobPreLoad.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py b/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py index e4fc64269a..20a58c9131 100644 --- a/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py +++ b/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py @@ -1,3 +1,4 @@ +# /usr/bin/env python3 # -*- coding: utf-8 -*- import os import tempfile @@ -341,7 +342,7 @@ def inject_openpype_environment(deadlinePlugin): "app": job.GetJobEnvironmentKeyValue("AVALON_APP_NAME"), "envgroup": "farm" } - + if job.GetJobEnvironmentKeyValue('IS_TEST'): args.append("--automatic-tests") From 8a6efcd6ef9699f977e58ab8fc6042a6e8e3a0f5 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 28 Feb 2023 10:00:25 +0100 Subject: [PATCH 673/912] Nuke: new version builder from tempate wip --- .../nuke/api/workfile_template_builder.py | 3 +- .../workfile/workfile_template_builder.py | 29 ++++++++++++++++++- .../defaults/project_settings/nuke.json | 12 +++++++- .../schema_templated_workfile_build.json | 6 ++++ 4 files changed, 47 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/nuke/api/workfile_template_builder.py b/openpype/hosts/nuke/api/workfile_template_builder.py index 1b81f24e86..739c10d56b 100644 --- a/openpype/hosts/nuke/api/workfile_template_builder.py +++ b/openpype/hosts/nuke/api/workfile_template_builder.py @@ -1,3 +1,4 @@ +import os import collections import nuke @@ -45,7 +46,7 @@ class NukeTemplateBuilder(AbstractTemplateBuilder): get_template_preset implementation) Returns: - bool: Wether the template was succesfully imported or not + bool: Wether the template was successfully imported or not """ # TODO check if the template is already imported diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py index 119e4aaeb7..6bbe5f5d13 100644 --- a/openpype/pipeline/workfile/workfile_template_builder.py +++ b/openpype/pipeline/workfile/workfile_template_builder.py @@ -28,6 +28,7 @@ from openpype.settings import ( get_project_settings, get_system_settings, ) +from openpype.host import IWorkfileHost from openpype.host import HostBase from openpype.lib import ( Logger, @@ -416,7 +417,8 @@ class AbstractTemplateBuilder(object): self, template_path=None, level_limit=None, - keep_placeholders=None + keep_placeholders=None, + create_first_version=None ): """Main callback for building workfile from template path. @@ -433,6 +435,7 @@ class AbstractTemplateBuilder(object): keep_placeholders (bool): Add flag to placeholder data for hosts to decide if they want to remove placeholder after it is used. + create_first_version (bool): create first version of a workfile """ template_preset = self.get_template_preset() @@ -441,6 +444,11 @@ class AbstractTemplateBuilder(object): if keep_placeholders is None: keep_placeholders = template_preset["keep_placeholder"] + if create_first_version is None: + create_first_version = template_preset["create_first_version"] + + if create_first_version: + self.create_first_workfile_version() self.import_template(template_path) self.populate_scene_placeholders( @@ -492,6 +500,25 @@ class AbstractTemplateBuilder(object): pass + @abstractmethod + def create_first_workfile_version(self): + """ + Create first version of workfile. + + Should load the content of template into scene so + 'populate_scene_placeholders' can be started. + + Args: + template_path (str): Fullpath for current task and + host's template file. + """ + last_workfile_path = os.environ.get("AVALON_LAST_WORKFILE") + # Save current scene, continue to open file + if isinstance(self.host, IWorkfileHost): + self.host.save_workfile(last_workfile_path) + else: + self.host.save_file(last_workfile_path) + def _prepare_placeholders(self, placeholders): """Run preparation part for placeholders on plugins. diff --git a/openpype/settings/defaults/project_settings/nuke.json b/openpype/settings/defaults/project_settings/nuke.json index 2545411e0a..c249955dc8 100644 --- a/openpype/settings/defaults/project_settings/nuke.json +++ b/openpype/settings/defaults/project_settings/nuke.json @@ -565,7 +565,17 @@ ] }, "templated_workfile_build": { - "profiles": [] + "profiles": [ + { + "task_types": [ + "Compositing" + ], + "task_names": [], + "path": "{project[name]}/templates/comp.nk", + "keep_placeholder": true, + "create_first_version": true + } + ] }, "filters": {} } diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_templated_workfile_build.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_templated_workfile_build.json index b244460bbf..7bab28fd88 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_templated_workfile_build.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_templated_workfile_build.json @@ -34,6 +34,12 @@ "label": "Keep placeholders", "type": "boolean", "default": true + }, + { + "key": "create_first_version", + "label": "Create first version", + "type": "boolean", + "default": true } ] } From 86f0383f183251cb2b725f06ad33ba887e2305ef Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 28 Feb 2023 11:13:44 +0100 Subject: [PATCH 674/912] Publisher: Prevent access to create tab after publish start (#4528) make sure it is not possible to go to create tab if the tab is not enabled --- openpype/tools/publisher/widgets/overview_widget.py | 3 +++ openpype/tools/publisher/window.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/openpype/tools/publisher/widgets/overview_widget.py b/openpype/tools/publisher/widgets/overview_widget.py index 022de2dc34..8706daeda6 100644 --- a/openpype/tools/publisher/widgets/overview_widget.py +++ b/openpype/tools/publisher/widgets/overview_widget.py @@ -146,6 +146,7 @@ class OverviewWidget(QtWidgets.QFrame): self._subset_list_view = subset_list_view self._subset_views_layout = subset_views_layout + self._create_btn = create_btn self._delete_btn = delete_btn self._subset_attributes_widget = subset_attributes_widget @@ -388,11 +389,13 @@ class OverviewWidget(QtWidgets.QFrame): def _on_publish_start(self): """Publish started.""" + self._create_btn.setEnabled(False) self._subset_attributes_wrap.setEnabled(False) def _on_publish_reset(self): """Context in controller has been refreshed.""" + self._create_btn.setEnabled(True) self._subset_attributes_wrap.setEnabled(True) self._subset_content_widget.setEnabled(self._controller.host_is_valid) diff --git a/openpype/tools/publisher/window.py b/openpype/tools/publisher/window.py index 6f7ffdb8ea..74977d65d8 100644 --- a/openpype/tools/publisher/window.py +++ b/openpype/tools/publisher/window.py @@ -561,7 +561,8 @@ class PublisherWindow(QtWidgets.QDialog): return self._tabs_widget.is_current_tab(identifier) def _go_to_create_tab(self): - self._set_current_tab("create") + if self._create_tab.isEnabled(): + self._set_current_tab("create") def _go_to_publish_tab(self): self._set_current_tab("publish") From f83fefd8a91f90133216f819a251594a72fe920c Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 20 Feb 2023 18:35:21 +0100 Subject: [PATCH 675/912] Added support for extensions filtering --- openpype/pipeline/load/plugins.py | 82 +++++++++++++++++++++++++++---- 1 file changed, 72 insertions(+), 10 deletions(-) diff --git a/openpype/pipeline/load/plugins.py b/openpype/pipeline/load/plugins.py index 9b891a4da3..8372743a23 100644 --- a/openpype/pipeline/load/plugins.py +++ b/openpype/pipeline/load/plugins.py @@ -21,16 +21,18 @@ class LoaderPlugin(list): Arguments: context (dict): avalon-core:context-1.0 - name (str, optional): Use pre-defined name - namespace (str, optional): Use pre-defined namespace .. versionadded:: 4.0 This class was introduced """ - families = list() - representations = list() + families = [] + representations = [] + # Extensions filtering was not available until 20/2/2023 + # - filtering by extensions is not enabled if is set to 'None' + # which is to keep backwards compatibility + extensions = None order = 0 is_multiple_contexts_compatible = False enabled = True @@ -82,20 +84,72 @@ class LoaderPlugin(list): print(" - setting `{}`: `{}`".format(option, value)) setattr(cls, option, value) + @classmethod + def has_valid_extension(cls, repre_doc): + """Has representation document valid extension for loader. + + Args: + repre_doc (dict[str, Any]): Representation document. + + Returns: + bool: Representation has valid extension + """ + + # Empty list of extensions is considered as all representations are + # invalid -> use '["*"]' to support all extensions + valid_extensions = cls.extensions + if not valid_extensions: + return False + + # Get representation main file extension from 'context' + repre_context = repre_doc.get("context") or {} + ext = repre_context.get("ext") + if not ext: + # Legacy way how to get extensions + path = repre_doc["data"].get("path") + if not path: + cls.log.info( + "Representation doesn't have known source of extension" + " information." + ) + return False + + cls.log.info("Using legacy source of extension on representation.") + ext = os.path.splitext(path)[-1] + while ext.startswith("."): + ext = ext[1:] + + # If representation does not have extension then can't be valid + if not ext: + return False + + if "*" in valid_extensions: + return True + + valid_extensions_low = {ext.lower() for ext in valid_extensions} + return ext.lower() in valid_extensions_low + + @classmethod def is_compatible_loader(cls, context): """Return whether a loader is compatible with a context. + On override make sure it is overriden as class or static method. + This checks the version's families and the representation for the given - Loader. + loader plugin. + + Args: + context (dict[str, Any]): Documents of context for which should + be loader used. Returns: - bool + bool: Is loader compatible for context. """ plugin_repre_names = cls.get_representations() plugin_families = cls.families - if not plugin_repre_names or not plugin_families: + if not plugin_repre_names or not plugin_families or not cls.extensions: return False repre_doc = context.get("representation") @@ -109,11 +163,19 @@ class LoaderPlugin(list): ): return False - maj_version, _ = schema.get_schema_version(context["subset"]["schema"]) + if ( + cls.extensions is not None + and not cls.has_valid_extension(repre_doc) + ): + return False + + verison_doc = context["version"] + subset_doc = context["subset"] + maj_version, _ = schema.get_schema_version(subset_doc["schema"]) if maj_version < 3: - families = context["version"]["data"].get("families", []) + families = verison_doc["data"].get("families", []) else: - families = context["subset"]["data"]["families"] + families = subset_doc["families"] plugin_families = set(plugin_families) return ( From 1b7af3e2c6299df7d6aee1f9c3e5f3e12e60db3f Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 23 Feb 2023 18:53:32 +0100 Subject: [PATCH 676/912] fix filtering --- openpype/pipeline/load/plugins.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/openpype/pipeline/load/plugins.py b/openpype/pipeline/load/plugins.py index 8372743a23..4ce7d47fd9 100644 --- a/openpype/pipeline/load/plugins.py +++ b/openpype/pipeline/load/plugins.py @@ -149,7 +149,7 @@ class LoaderPlugin(list): plugin_repre_names = cls.get_representations() plugin_families = cls.families - if not plugin_repre_names or not plugin_families or not cls.extensions: + if not plugin_repre_names or not plugin_families: return False repre_doc = context.get("representation") @@ -173,14 +173,21 @@ class LoaderPlugin(list): subset_doc = context["subset"] maj_version, _ = schema.get_schema_version(subset_doc["schema"]) if maj_version < 3: - families = verison_doc["data"].get("families", []) + families = verison_doc["data"].get("families") else: - families = subset_doc["families"] + families = context["subset"]["data"].get("families") + if families is None: + family = context["subset"]["data"].get("family") + if family: + families = [family] plugin_families = set(plugin_families) return ( "*" in plugin_families - or any(family in plugin_families for family in families) + or any( + family in plugin_families + for family in (families or []) + ) ) @classmethod From 7a8aa123ff8bc159cbc7b4a0c7acedb01847b9e9 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 23 Feb 2023 21:48:32 +0100 Subject: [PATCH 677/912] cleanup changes based on comments --- openpype/pipeline/load/plugins.py | 57 ++++++++++++------------------- 1 file changed, 22 insertions(+), 35 deletions(-) diff --git a/openpype/pipeline/load/plugins.py b/openpype/pipeline/load/plugins.py index 4ce7d47fd9..f5b6e858b4 100644 --- a/openpype/pipeline/load/plugins.py +++ b/openpype/pipeline/load/plugins.py @@ -29,10 +29,7 @@ class LoaderPlugin(list): families = [] representations = [] - # Extensions filtering was not available until 20/2/2023 - # - filtering by extensions is not enabled if is set to 'None' - # which is to keep backwards compatibility - extensions = None + extensions = {"*"} order = 0 is_multiple_contexts_compatible = False enabled = True @@ -95,11 +92,8 @@ class LoaderPlugin(list): bool: Representation has valid extension """ - # Empty list of extensions is considered as all representations are - # invalid -> use '["*"]' to support all extensions - valid_extensions = cls.extensions - if not valid_extensions: - return False + if "*" in cls.extensions: + return True # Get representation main file extension from 'context' repre_context = repre_doc.get("context") or {} @@ -114,22 +108,16 @@ class LoaderPlugin(list): ) return False - cls.log.info("Using legacy source of extension on representation.") - ext = os.path.splitext(path)[-1] - while ext.startswith("."): - ext = ext[1:] + cls.log.info("Using legacy source of extension from path.") + ext = os.path.splitext(path)[-1].lstrip(".") # If representation does not have extension then can't be valid if not ext: return False - if "*" in valid_extensions: - return True - - valid_extensions_low = {ext.lower() for ext in valid_extensions} + valid_extensions_low = {ext.lower() for ext in cls.extensions} return ext.lower() in valid_extensions_low - @classmethod def is_compatible_loader(cls, context): """Return whether a loader is compatible with a context. @@ -149,7 +137,11 @@ class LoaderPlugin(list): plugin_repre_names = cls.get_representations() plugin_families = cls.families - if not plugin_repre_names or not plugin_families: + if ( + not plugin_repre_names + or not plugin_families + or not cls.extensions + ): return False repre_doc = context.get("representation") @@ -163,32 +155,27 @@ class LoaderPlugin(list): ): return False - if ( - cls.extensions is not None - and not cls.has_valid_extension(repre_doc) - ): + if not cls.has_valid_extension(repre_doc): return False - verison_doc = context["version"] + plugin_families = set(plugin_families) + if "*" in plugin_families: + return True + subset_doc = context["subset"] maj_version, _ = schema.get_schema_version(subset_doc["schema"]) if maj_version < 3: - families = verison_doc["data"].get("families") + families = context["version"]["data"].get("families") else: - families = context["subset"]["data"].get("families") + families = subset_doc["data"].get("families") if families is None: - family = context["subset"]["data"].get("family") + family = subset_doc["data"].get("family") if family: families = [family] - plugin_families = set(plugin_families) - return ( - "*" in plugin_families - or any( - family in plugin_families - for family in (families or []) - ) - ) + if not families: + return False + return any(family in plugin_families for family in families) @classmethod def get_representations(cls): From 8180076c08efa2e1ad3e1ece939b1b40899b3ef2 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 24 Feb 2023 10:20:40 +0100 Subject: [PATCH 678/912] safer data access Co-authored-by: Roy Nieterau --- openpype/pipeline/load/plugins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/pipeline/load/plugins.py b/openpype/pipeline/load/plugins.py index f5b6e858b4..d35281e823 100644 --- a/openpype/pipeline/load/plugins.py +++ b/openpype/pipeline/load/plugins.py @@ -100,7 +100,7 @@ class LoaderPlugin(list): ext = repre_context.get("ext") if not ext: # Legacy way how to get extensions - path = repre_doc["data"].get("path") + path = repre_doc.get("data", {}).get("path") if not path: cls.log.info( "Representation doesn't have known source of extension" From 9e432f7c5c7fa19dec06123d6e0867c9735be147 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 24 Feb 2023 10:55:30 +0100 Subject: [PATCH 679/912] add data and context to repre document fields --- openpype/tools/loader/widgets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/tools/loader/widgets.py b/openpype/tools/loader/widgets.py index 0c5c9391cf..538925d141 100644 --- a/openpype/tools/loader/widgets.py +++ b/openpype/tools/loader/widgets.py @@ -339,7 +339,7 @@ class SubsetWidget(QtWidgets.QWidget): repre_docs = get_representations( project_name, version_ids=version_ids, - fields=["name", "parent"] + fields=["name", "parent", "data", "context"] ) repre_docs_by_version_id = { From 8a34313b97b7d6dc370aac485f188ffdb705a3f9 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 24 Feb 2023 11:01:24 +0100 Subject: [PATCH 680/912] added 'data' and 'context' to representations widget too --- openpype/tools/loader/widgets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/tools/loader/widgets.py b/openpype/tools/loader/widgets.py index 538925d141..98ac9c871f 100644 --- a/openpype/tools/loader/widgets.py +++ b/openpype/tools/loader/widgets.py @@ -1264,7 +1264,7 @@ class RepresentationWidget(QtWidgets.QWidget): repre_docs = list(get_representations( project_name, representation_ids=repre_ids, - fields=["name", "parent"] + fields=["name", "parent", "data", "context"] )) version_ids = [ From 1bd5f04880611a4461ead821dc2a14cf60d466b3 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 24 Feb 2023 11:16:25 +0100 Subject: [PATCH 681/912] nuke: extension to loaders --- openpype/hosts/nuke/plugins/load/load_clip.py | 28 ++++++++++--------- .../hosts/nuke/plugins/load/load_image.py | 10 +++++-- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/openpype/hosts/nuke/plugins/load/load_clip.py b/openpype/hosts/nuke/plugins/load/load_clip.py index 8f9b463037..18ecaf4d2b 100644 --- a/openpype/hosts/nuke/plugins/load/load_clip.py +++ b/openpype/hosts/nuke/plugins/load/load_clip.py @@ -21,6 +21,10 @@ from openpype.hosts.nuke.api import ( viewer_update_and_undo_stop, colorspace_exists_on_node ) +from openpype.lib.transcoding import ( + VIDEO_EXTENSIONS, + IMAGE_EXTENSIONS +) from openpype.hosts.nuke.api import plugin @@ -38,13 +42,11 @@ class LoadClip(plugin.NukeLoader): "prerender", "review" ] - representations = [ - "exr", - "dpx", - "mov", - "review", - "mp4" - ] + representations = ["*"] + + extensions = set( + ext.lstrip(".") for ext in IMAGE_EXTENSIONS.union(VIDEO_EXTENSIONS) + ) label = "Load Clip" order = -20 @@ -81,17 +83,17 @@ class LoadClip(plugin.NukeLoader): @classmethod def get_representations(cls): - return ( - cls.representations - + cls._representations - + plugin.get_review_presets_config() - ) + return cls._representations or cls.representations def load(self, context, name, namespace, options): + """Load asset via database + """ representation = context["representation"] - # reste container id so it is always unique for each instance + # reset container id so it is always unique for each instance self.reset_container_id() + self.log.warning(self.extensions) + is_sequence = len(representation["files"]) > 1 if is_sequence: diff --git a/openpype/hosts/nuke/plugins/load/load_image.py b/openpype/hosts/nuke/plugins/load/load_image.py index 49dc12f588..f82ee4db88 100644 --- a/openpype/hosts/nuke/plugins/load/load_image.py +++ b/openpype/hosts/nuke/plugins/load/load_image.py @@ -19,6 +19,9 @@ from openpype.hosts.nuke.api import ( update_container, viewer_update_and_undo_stop ) +from openpype.lib.transcoding import ( + IMAGE_EXTENSIONS +) class LoadImage(load.LoaderPlugin): @@ -33,7 +36,10 @@ class LoadImage(load.LoaderPlugin): "review", "image" ] - representations = ["exr", "dpx", "jpg", "jpeg", "png", "psd", "tiff"] + representations = ["*"] + extensions = set( + ext.lstrip(".") for ext in IMAGE_EXTENSIONS + ) label = "Load Image" order = -10 @@ -58,7 +64,7 @@ class LoadImage(load.LoaderPlugin): @classmethod def get_representations(cls): - return cls.representations + cls._representations + return cls._representations or cls.representations def load(self, context, name, namespace, options): self.log.info("__ options: `{}`".format(options)) From f432fb29de1cc9e01ea59a2482a9430086c987fa Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 24 Feb 2023 11:26:46 +0100 Subject: [PATCH 682/912] nuke: adding extension to plugins --- openpype/hosts/nuke/plugins/load/actions.py | 1 + openpype/hosts/nuke/plugins/load/load_backdrop.py | 3 ++- openpype/hosts/nuke/plugins/load/load_camera_abc.py | 3 ++- openpype/hosts/nuke/plugins/load/load_clip.py | 1 - openpype/hosts/nuke/plugins/load/load_effects.py | 3 ++- openpype/hosts/nuke/plugins/load/load_effects_ip.py | 3 ++- openpype/hosts/nuke/plugins/load/load_gizmo.py | 3 ++- openpype/hosts/nuke/plugins/load/load_gizmo_ip.py | 3 ++- openpype/hosts/nuke/plugins/load/load_matchmove.py | 4 +++- openpype/hosts/nuke/plugins/load/load_model.py | 3 ++- openpype/hosts/nuke/plugins/load/load_script_precomp.py | 3 ++- 11 files changed, 20 insertions(+), 10 deletions(-) diff --git a/openpype/hosts/nuke/plugins/load/actions.py b/openpype/hosts/nuke/plugins/load/actions.py index 69f56c7305..e562c74c58 100644 --- a/openpype/hosts/nuke/plugins/load/actions.py +++ b/openpype/hosts/nuke/plugins/load/actions.py @@ -17,6 +17,7 @@ class SetFrameRangeLoader(load.LoaderPlugin): "yeticache", "pointcache"] representations = ["*"] + extension = {"*"} label = "Set frame range" order = 11 diff --git a/openpype/hosts/nuke/plugins/load/load_backdrop.py b/openpype/hosts/nuke/plugins/load/load_backdrop.py index d1fb763500..f227aa161a 100644 --- a/openpype/hosts/nuke/plugins/load/load_backdrop.py +++ b/openpype/hosts/nuke/plugins/load/load_backdrop.py @@ -25,8 +25,9 @@ from openpype.hosts.nuke.api import containerise, update_container class LoadBackdropNodes(load.LoaderPlugin): """Loading Published Backdrop nodes (workfile, nukenodes)""" - representations = ["nk"] families = ["workfile", "nukenodes"] + representations = ["*"] + extension = {"nk"} label = "Import Nuke Nodes" order = 0 diff --git a/openpype/hosts/nuke/plugins/load/load_camera_abc.py b/openpype/hosts/nuke/plugins/load/load_camera_abc.py index 9fef7424c8..11cc63d25c 100644 --- a/openpype/hosts/nuke/plugins/load/load_camera_abc.py +++ b/openpype/hosts/nuke/plugins/load/load_camera_abc.py @@ -25,7 +25,8 @@ class AlembicCameraLoader(load.LoaderPlugin): """ families = ["camera"] - representations = ["abc"] + representations = ["*"] + extension = {"abc"} label = "Load Alembic Camera" icon = "camera" diff --git a/openpype/hosts/nuke/plugins/load/load_clip.py b/openpype/hosts/nuke/plugins/load/load_clip.py index 18ecaf4d2b..d170276add 100644 --- a/openpype/hosts/nuke/plugins/load/load_clip.py +++ b/openpype/hosts/nuke/plugins/load/load_clip.py @@ -43,7 +43,6 @@ class LoadClip(plugin.NukeLoader): "review" ] representations = ["*"] - extensions = set( ext.lstrip(".") for ext in IMAGE_EXTENSIONS.union(VIDEO_EXTENSIONS) ) diff --git a/openpype/hosts/nuke/plugins/load/load_effects.py b/openpype/hosts/nuke/plugins/load/load_effects.py index cef4b0a5fc..d49f87a094 100644 --- a/openpype/hosts/nuke/plugins/load/load_effects.py +++ b/openpype/hosts/nuke/plugins/load/load_effects.py @@ -22,8 +22,9 @@ from openpype.hosts.nuke.api import ( class LoadEffects(load.LoaderPlugin): """Loading colorspace soft effect exported from nukestudio""" - representations = ["effectJson"] families = ["effect"] + representations = ["*"] + extension = {"json"} label = "Load Effects - nodes" order = 0 diff --git a/openpype/hosts/nuke/plugins/load/load_effects_ip.py b/openpype/hosts/nuke/plugins/load/load_effects_ip.py index 9bd40be816..bfe32c1ed9 100644 --- a/openpype/hosts/nuke/plugins/load/load_effects_ip.py +++ b/openpype/hosts/nuke/plugins/load/load_effects_ip.py @@ -23,8 +23,9 @@ from openpype.hosts.nuke.api import ( class LoadEffectsInputProcess(load.LoaderPlugin): """Loading colorspace soft effect exported from nukestudio""" - representations = ["effectJson"] families = ["effect"] + representations = ["*"] + extension = {"json"} label = "Load Effects - Input Process" order = 0 diff --git a/openpype/hosts/nuke/plugins/load/load_gizmo.py b/openpype/hosts/nuke/plugins/load/load_gizmo.py index 9a18eeef5c..2aa7c49723 100644 --- a/openpype/hosts/nuke/plugins/load/load_gizmo.py +++ b/openpype/hosts/nuke/plugins/load/load_gizmo.py @@ -24,8 +24,9 @@ from openpype.hosts.nuke.api import ( class LoadGizmo(load.LoaderPlugin): """Loading nuke Gizmo""" - representations = ["gizmo"] families = ["gizmo"] + representations = ["*"] + extension = {"gizmo"} label = "Load Gizmo" order = 0 diff --git a/openpype/hosts/nuke/plugins/load/load_gizmo_ip.py b/openpype/hosts/nuke/plugins/load/load_gizmo_ip.py index 2890dbfd2c..2514a28299 100644 --- a/openpype/hosts/nuke/plugins/load/load_gizmo_ip.py +++ b/openpype/hosts/nuke/plugins/load/load_gizmo_ip.py @@ -26,8 +26,9 @@ from openpype.hosts.nuke.api import ( class LoadGizmoInputProcess(load.LoaderPlugin): """Loading colorspace soft effect exported from nukestudio""" - representations = ["gizmo"] families = ["gizmo"] + representations = ["*"] + extension = {"gizmo"} label = "Load Gizmo - Input Process" order = 0 diff --git a/openpype/hosts/nuke/plugins/load/load_matchmove.py b/openpype/hosts/nuke/plugins/load/load_matchmove.py index f5a90706c7..a7d124d472 100644 --- a/openpype/hosts/nuke/plugins/load/load_matchmove.py +++ b/openpype/hosts/nuke/plugins/load/load_matchmove.py @@ -8,7 +8,9 @@ class MatchmoveLoader(load.LoaderPlugin): """ families = ["matchmove"] - representations = ["py"] + representations = ["*"] + extension = {"py"} + defaults = ["Camera", "Object"] label = "Run matchmove script" diff --git a/openpype/hosts/nuke/plugins/load/load_model.py b/openpype/hosts/nuke/plugins/load/load_model.py index ad985e83c6..f968da8475 100644 --- a/openpype/hosts/nuke/plugins/load/load_model.py +++ b/openpype/hosts/nuke/plugins/load/load_model.py @@ -23,7 +23,8 @@ class AlembicModelLoader(load.LoaderPlugin): """ families = ["model", "pointcache", "animation"] - representations = ["abc"] + representations = ["*"] + extension = {"abc"} label = "Load Alembic" icon = "cube" diff --git a/openpype/hosts/nuke/plugins/load/load_script_precomp.py b/openpype/hosts/nuke/plugins/load/load_script_precomp.py index f0972f85d2..90581c2f22 100644 --- a/openpype/hosts/nuke/plugins/load/load_script_precomp.py +++ b/openpype/hosts/nuke/plugins/load/load_script_precomp.py @@ -20,8 +20,9 @@ from openpype.hosts.nuke.api import ( class LinkAsGroup(load.LoaderPlugin): """Copy the published file to be pasted at the desired location""" - representations = ["nk"] families = ["workfile", "nukenodes"] + representations = ["*"] + extension = {"nk"} label = "Load Precomp" order = 0 From 1b479f7eb7919c114efa7537f4a9922eb9e01a4b Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 24 Feb 2023 11:52:26 +0100 Subject: [PATCH 683/912] resolve: adding extensions to loader --- openpype/hosts/resolve/plugins/load/load_clip.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/resolve/plugins/load/load_clip.py b/openpype/hosts/resolve/plugins/load/load_clip.py index a0c78c182f..d30a7ea272 100644 --- a/openpype/hosts/resolve/plugins/load/load_clip.py +++ b/openpype/hosts/resolve/plugins/load/load_clip.py @@ -14,7 +14,10 @@ from openpype.hosts.resolve.api.pipeline import ( containerise, update_container, ) - +from openpype.lib.transcoding import ( + VIDEO_EXTENSIONS, + IMAGE_EXTENSIONS +) class LoadClip(plugin.TimelineItemLoader): """Load a subset to timeline as clip @@ -24,7 +27,11 @@ class LoadClip(plugin.TimelineItemLoader): """ families = ["render2d", "source", "plate", "render", "review"] - representations = ["exr", "dpx", "jpg", "jpeg", "png", "h264", "mov"] + + representations = ["*"] + extensions = set( + ext.lstrip(".") for ext in IMAGE_EXTENSIONS.union(VIDEO_EXTENSIONS) + ) label = "Load as clip" order = -10 From 339417c5055cdb8f77ee603a32a9caa630ab695d Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 24 Feb 2023 15:14:31 +0100 Subject: [PATCH 684/912] hiero: adding extension to load plugins also removing representation from settings and ignoring settings for representation on plugin --- .../hosts/hiero/plugins/load/load_clip.py | 41 ++++++++++++++++++- .../hosts/hiero/plugins/load/load_effects.py | 3 +- .../defaults/project_settings/hiero.json | 10 ----- .../projects_schema/schema_project_hiero.json | 8 +--- 4 files changed, 43 insertions(+), 19 deletions(-) diff --git a/openpype/hosts/hiero/plugins/load/load_clip.py b/openpype/hosts/hiero/plugins/load/load_clip.py index 2a7d1af41e..77844d2448 100644 --- a/openpype/hosts/hiero/plugins/load/load_clip.py +++ b/openpype/hosts/hiero/plugins/load/load_clip.py @@ -6,6 +6,10 @@ from openpype.pipeline import ( legacy_io, get_representation_path, ) +from openpype.lib.transcoding import ( + VIDEO_EXTENSIONS, + IMAGE_EXTENSIONS +) import openpype.hosts.hiero.api as phiero @@ -17,7 +21,10 @@ class LoadClip(phiero.SequenceLoader): """ families = ["render2d", "source", "plate", "render", "review"] - representations = ["exr", "dpx", "jpg", "jpeg", "png", "h264"] + representations = ["*"] + extensions = set( + ext.lstrip(".") for ext in IMAGE_EXTENSIONS.union(VIDEO_EXTENSIONS) + ) label = "Load as clip" order = -10 @@ -34,6 +41,38 @@ class LoadClip(phiero.SequenceLoader): clip_name_template = "{asset}_{subset}_{representation}" + def apply_settings(cls, project_settings, system_settings): + + plugin_type_settings = ( + project_settings + .get("hiero", {}) + .get("load", {}) + ) + + if not plugin_type_settings: + return + + plugin_name = cls.__name__ + + plugin_settings = None + # Look for plugin settings in host specific settings + if plugin_name in plugin_type_settings: + plugin_settings = plugin_type_settings[plugin_name] + + if not plugin_settings: + return + + print(">>> We have preset for {}".format(plugin_name)) + for option, value in plugin_settings.items(): + if option == "enabled" and value is False: + print(" - is disabled by preset") + elif option == "representations": + continue + else: + print(" - setting `{}`: `{}`".format(option, value)) + setattr(cls, option, value) + + def load(self, context, name, namespace, options): # add clip name template to options options.update({ diff --git a/openpype/hosts/hiero/plugins/load/load_effects.py b/openpype/hosts/hiero/plugins/load/load_effects.py index a3fcd63b5b..b61cca9731 100644 --- a/openpype/hosts/hiero/plugins/load/load_effects.py +++ b/openpype/hosts/hiero/plugins/load/load_effects.py @@ -19,8 +19,9 @@ from openpype.lib import Logger class LoadEffects(load.LoaderPlugin): """Loading colorspace soft effect exported from nukestudio""" - representations = ["effectJson"] families = ["effect"] + representations = ["*"] + extension = {"json"} label = "Load Effects" order = 0 diff --git a/openpype/settings/defaults/project_settings/hiero.json b/openpype/settings/defaults/project_settings/hiero.json index 0412967eaa..100c1f5b47 100644 --- a/openpype/settings/defaults/project_settings/hiero.json +++ b/openpype/settings/defaults/project_settings/hiero.json @@ -60,16 +60,6 @@ "render", "review" ], - "representations": [ - "exr", - "dpx", - "jpg", - "jpeg", - "png", - "h264", - "mov", - "mp4" - ], "clip_name_template": "{asset}_{subset}_{representation}" } }, diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json b/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json index 03bfb56ad1..f44f92438c 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json @@ -266,12 +266,6 @@ "label": "Families", "object_type": "text" }, - { - "type": "list", - "key": "representations", - "label": "Representations", - "object_type": "text" - }, { "type": "text", "key": "clip_name_template", @@ -334,4 +328,4 @@ "name": "schema_scriptsmenu" } ] -} \ No newline at end of file +} From 6d43fa21902f0b9cfa2beee43bf9e9d8ff362eb0 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 24 Feb 2023 15:19:50 +0100 Subject: [PATCH 685/912] flame: adding extensions to loaders also removing representations from settings and ignoring them in plugin settings loader --- openpype/hosts/flame/api/plugin.py | 31 +++++++++++++++++++ .../hosts/flame/plugins/load/load_clip.py | 9 +++++- .../flame/plugins/load/load_clip_batch.py | 10 ++++-- .../defaults/project_settings/flame.json | 22 ------------- .../projects_schema/schema_project_flame.json | 12 ------- 5 files changed, 47 insertions(+), 37 deletions(-) diff --git a/openpype/hosts/flame/api/plugin.py b/openpype/hosts/flame/api/plugin.py index b1db612671..983d7486b3 100644 --- a/openpype/hosts/flame/api/plugin.py +++ b/openpype/hosts/flame/api/plugin.py @@ -702,6 +702,37 @@ class ClipLoader(LoaderPlugin): _mapping = None + def apply_settings(cls, project_settings, system_settings): + + plugin_type_settings = ( + project_settings + .get("flame", {}) + .get("load", {}) + ) + + if not plugin_type_settings: + return + + plugin_name = cls.__name__ + + plugin_settings = None + # Look for plugin settings in host specific settings + if plugin_name in plugin_type_settings: + plugin_settings = plugin_type_settings[plugin_name] + + if not plugin_settings: + return + + print(">>> We have preset for {}".format(plugin_name)) + for option, value in plugin_settings.items(): + if option == "enabled" and value is False: + print(" - is disabled by preset") + elif option == "representations": + continue + else: + print(" - setting `{}`: `{}`".format(option, value)) + setattr(cls, option, value) + def get_colorspace(self, context): """Get colorspace name diff --git a/openpype/hosts/flame/plugins/load/load_clip.py b/openpype/hosts/flame/plugins/load/load_clip.py index 6f47c23d57..25b31c94a3 100644 --- a/openpype/hosts/flame/plugins/load/load_clip.py +++ b/openpype/hosts/flame/plugins/load/load_clip.py @@ -4,6 +4,10 @@ import flame from pprint import pformat import openpype.hosts.flame.api as opfapi from openpype.lib import StringTemplate +from openpype.lib.transcoding import ( + VIDEO_EXTENSIONS, + IMAGE_EXTENSIONS +) class LoadClip(opfapi.ClipLoader): @@ -14,7 +18,10 @@ class LoadClip(opfapi.ClipLoader): """ families = ["render2d", "source", "plate", "render", "review"] - representations = ["exr", "dpx", "jpg", "jpeg", "png", "h264"] + representations = ["*"] + extensions = set( + ext.lstrip(".") for ext in IMAGE_EXTENSIONS.union(VIDEO_EXTENSIONS) + ) label = "Load as clip" order = -10 diff --git a/openpype/hosts/flame/plugins/load/load_clip_batch.py b/openpype/hosts/flame/plugins/load/load_clip_batch.py index 5975c6e42f..86bc0f8f1e 100644 --- a/openpype/hosts/flame/plugins/load/load_clip_batch.py +++ b/openpype/hosts/flame/plugins/load/load_clip_batch.py @@ -4,7 +4,10 @@ import flame from pprint import pformat import openpype.hosts.flame.api as opfapi from openpype.lib import StringTemplate - +from openpype.lib.transcoding import ( + VIDEO_EXTENSIONS, + IMAGE_EXTENSIONS +) class LoadClipBatch(opfapi.ClipLoader): """Load a subset to timeline as clip @@ -14,7 +17,10 @@ class LoadClipBatch(opfapi.ClipLoader): """ families = ["render2d", "source", "plate", "render", "review"] - representations = ["exr", "dpx", "jpg", "jpeg", "png", "h264"] + representations = ["*"] + extensions = set( + ext.lstrip(".") for ext in IMAGE_EXTENSIONS.union(VIDEO_EXTENSIONS) + ) label = "Load as clip to current batch" order = -10 diff --git a/openpype/settings/defaults/project_settings/flame.json b/openpype/settings/defaults/project_settings/flame.json index 3190bdb3bf..5a13d81384 100644 --- a/openpype/settings/defaults/project_settings/flame.json +++ b/openpype/settings/defaults/project_settings/flame.json @@ -114,17 +114,6 @@ "render", "review" ], - "representations": [ - "exr", - "dpx", - "jpg", - "jpeg", - "png", - "h264", - "mov", - "mp4", - "exr16fpdwaa" - ], "reel_group_name": "OpenPype_Reels", "reel_name": "Loaded", "clip_name_template": "{asset}_{subset}<_{output}>", @@ -143,17 +132,6 @@ "render", "review" ], - "representations": [ - "exr", - "dpx", - "jpg", - "jpeg", - "png", - "h264", - "mov", - "mp4", - "exr16fpdwaa" - ], "reel_name": "OP_LoadedReel", "clip_name_template": "{batch}_{asset}_{subset}<_{output}>", "layer_rename_template": "{asset}_{subset}<_{output}>", diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_flame.json b/openpype/settings/entities/schemas/projects_schema/schema_project_flame.json index 0f20c0efbe..aab8f21d15 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_flame.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_flame.json @@ -494,12 +494,6 @@ "label": "Families", "object_type": "text" }, - { - "type": "list", - "key": "representations", - "label": "Representations", - "object_type": "text" - }, { "type": "separator" }, @@ -552,12 +546,6 @@ "label": "Families", "object_type": "text" }, - { - "type": "list", - "key": "representations", - "label": "Representations", - "object_type": "text" - }, { "type": "separator" }, From a2d7ab24f60609096b58fbb8e6b891e743a1892e Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 24 Feb 2023 15:24:22 +0100 Subject: [PATCH 686/912] fusion: adding extensions to loaders --- openpype/hosts/fusion/plugins/load/actions.py | 1 + openpype/hosts/fusion/plugins/load/load_alembic.py | 3 ++- openpype/hosts/fusion/plugins/load/load_fbx.py | 3 ++- openpype/hosts/fusion/plugins/load/load_sequence.py | 6 ++++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/plugins/load/actions.py b/openpype/hosts/fusion/plugins/load/actions.py index 819c9272fd..3b14f022e5 100644 --- a/openpype/hosts/fusion/plugins/load/actions.py +++ b/openpype/hosts/fusion/plugins/load/actions.py @@ -15,6 +15,7 @@ class FusionSetFrameRangeLoader(load.LoaderPlugin): "pointcache", "render"] representations = ["*"] + extensions = {"*"} label = "Set frame range" order = 11 diff --git a/openpype/hosts/fusion/plugins/load/load_alembic.py b/openpype/hosts/fusion/plugins/load/load_alembic.py index f8b8c2cb0a..11bf59af12 100644 --- a/openpype/hosts/fusion/plugins/load/load_alembic.py +++ b/openpype/hosts/fusion/plugins/load/load_alembic.py @@ -13,7 +13,8 @@ class FusionLoadAlembicMesh(load.LoaderPlugin): """Load Alembic mesh into Fusion""" families = ["pointcache", "model"] - representations = ["abc"] + representations = ["*"] + extensions = {"abc"} label = "Load alembic mesh" order = -10 diff --git a/openpype/hosts/fusion/plugins/load/load_fbx.py b/openpype/hosts/fusion/plugins/load/load_fbx.py index 70fe82ffef..b8f501ae7e 100644 --- a/openpype/hosts/fusion/plugins/load/load_fbx.py +++ b/openpype/hosts/fusion/plugins/load/load_fbx.py @@ -14,7 +14,8 @@ class FusionLoadFBXMesh(load.LoaderPlugin): """Load FBX mesh into Fusion""" families = ["*"] - representations = ["fbx"] + representations = ["*"] + extensions = {"fbx"} label = "Load FBX mesh" order = -10 diff --git a/openpype/hosts/fusion/plugins/load/load_sequence.py b/openpype/hosts/fusion/plugins/load/load_sequence.py index 6f44c61d1b..465df757b1 100644 --- a/openpype/hosts/fusion/plugins/load/load_sequence.py +++ b/openpype/hosts/fusion/plugins/load/load_sequence.py @@ -12,6 +12,9 @@ from openpype.hosts.fusion.api import ( get_current_comp, comp_lock_and_undo_chunk ) +from openpype.lib.transcoding import ( + IMAGE_EXTENSIONS +) comp = get_current_comp() @@ -129,6 +132,9 @@ class FusionLoadSequence(load.LoaderPlugin): families = ["imagesequence", "review", "render", "plate"] representations = ["*"] + extensions = set( + ext.lstrip(".") for ext in IMAGE_EXTENSIONS + ) label = "Load sequence" order = -10 From 3a02a03efad89fe50850c270a55ee028e3f6ec91 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 24 Feb 2023 16:38:34 +0100 Subject: [PATCH 687/912] fusion: adding video extensions to sequence loader --- openpype/hosts/fusion/plugins/load/load_sequence.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/plugins/load/load_sequence.py b/openpype/hosts/fusion/plugins/load/load_sequence.py index 465df757b1..542c3c1a51 100644 --- a/openpype/hosts/fusion/plugins/load/load_sequence.py +++ b/openpype/hosts/fusion/plugins/load/load_sequence.py @@ -13,7 +13,8 @@ from openpype.hosts.fusion.api import ( comp_lock_and_undo_chunk ) from openpype.lib.transcoding import ( - IMAGE_EXTENSIONS + IMAGE_EXTENSIONS, + VIDEO_EXTENSIONS ) comp = get_current_comp() @@ -133,7 +134,7 @@ class FusionLoadSequence(load.LoaderPlugin): families = ["imagesequence", "review", "render", "plate"] representations = ["*"] extensions = set( - ext.lstrip(".") for ext in IMAGE_EXTENSIONS + ext.lstrip(".") for ext in IMAGE_EXTENSIONS.union(VIDEO_EXTENSIONS) ) label = "Load sequence" From 42cc7152334bb59485470a6bb3a56d8eb76f8dde Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 24 Feb 2023 16:50:11 +0100 Subject: [PATCH 688/912] changed info to debug --- openpype/pipeline/load/plugins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/pipeline/load/plugins.py b/openpype/pipeline/load/plugins.py index d35281e823..e380d65bbe 100644 --- a/openpype/pipeline/load/plugins.py +++ b/openpype/pipeline/load/plugins.py @@ -108,7 +108,7 @@ class LoaderPlugin(list): ) return False - cls.log.info("Using legacy source of extension from path.") + cls.log.debug("Using legacy source of extension from path.") ext = os.path.splitext(path)[-1].lstrip(".") # If representation does not have extension then can't be valid From 956fbb780badbd2bcbf052f4646d3014b5fe9df8 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 28 Feb 2023 11:24:02 +0100 Subject: [PATCH 689/912] change Harmony loader to use extensions --- openpype/hosts/harmony/plugins/load/load_imagesequence.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/harmony/plugins/load/load_imagesequence.py b/openpype/hosts/harmony/plugins/load/load_imagesequence.py index 1b64aff595..7c3185fd75 100644 --- a/openpype/hosts/harmony/plugins/load/load_imagesequence.py +++ b/openpype/hosts/harmony/plugins/load/load_imagesequence.py @@ -20,8 +20,9 @@ class ImageSequenceLoader(load.LoaderPlugin): Stores the imported asset in a container named after the asset. """ - families = ["shot", "render", "image", "plate", "reference"] - representations = ["jpeg", "png", "jpg"] + families = ["shot", "render", "image", "plate", "reference", "review"] + representations = ["*"] + extensions = set(["jpeg", "png", "jpg"]) def load(self, context, name=None, namespace=None, data=None): """Plugin entry point. From 0765602ce3aabfc6751662d1026a7638385d67a8 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 28 Feb 2023 11:27:13 +0100 Subject: [PATCH 690/912] simpler set initialization --- openpype/hosts/harmony/plugins/load/load_imagesequence.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/harmony/plugins/load/load_imagesequence.py b/openpype/hosts/harmony/plugins/load/load_imagesequence.py index 7c3185fd75..b95d25f507 100644 --- a/openpype/hosts/harmony/plugins/load/load_imagesequence.py +++ b/openpype/hosts/harmony/plugins/load/load_imagesequence.py @@ -22,7 +22,7 @@ class ImageSequenceLoader(load.LoaderPlugin): families = ["shot", "render", "image", "plate", "reference", "review"] representations = ["*"] - extensions = set(["jpeg", "png", "jpg"]) + extensions = {"jpeg", "png", "jpg"} def load(self, context, name=None, namespace=None, data=None): """Plugin entry point. From 9229ff9c0b229db2d9d25c8d91b6cb6f7b58de9b Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 28 Feb 2023 13:58:01 +0100 Subject: [PATCH 691/912] hiero: fix effect item node class --- .../hosts/hiero/plugins/publish/collect_clip_effects.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/hiero/plugins/publish/collect_clip_effects.py b/openpype/hosts/hiero/plugins/publish/collect_clip_effects.py index 9489b1c4fb..95e4b09504 100644 --- a/openpype/hosts/hiero/plugins/publish/collect_clip_effects.py +++ b/openpype/hosts/hiero/plugins/publish/collect_clip_effects.py @@ -120,13 +120,10 @@ class CollectClipEffects(pyblish.api.InstancePlugin): track = sitem.parentTrack().name() # node serialization node = sitem.node() - node_serialized = self.node_serialisation(node) + node_serialized = self.node_serialization(node) node_name = sitem.name() + node_class = node.Class() - if "_" in node_name: - node_class = re.sub(r"(?:_)[_0-9]+", "", node_name) # more numbers - else: - node_class = re.sub(r"\d+", "", node_name) # one number # collect timelineIn/Out effect_t_in = int(sitem.timelineIn()) @@ -148,7 +145,7 @@ class CollectClipEffects(pyblish.api.InstancePlugin): "node": node_serialized }} - def node_serialisation(self, node): + def node_serialization(self, node): node_serialized = {} # adding ignoring knob keys From 2bd4e5c3c91b453bca3b21aed3c1cfd6cf19be37 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 28 Feb 2023 14:11:01 +0100 Subject: [PATCH 692/912] hound comments --- openpype/hosts/hiero/plugins/publish/collect_clip_effects.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/hiero/plugins/publish/collect_clip_effects.py b/openpype/hosts/hiero/plugins/publish/collect_clip_effects.py index 95e4b09504..d455ad4a4e 100644 --- a/openpype/hosts/hiero/plugins/publish/collect_clip_effects.py +++ b/openpype/hosts/hiero/plugins/publish/collect_clip_effects.py @@ -124,7 +124,6 @@ class CollectClipEffects(pyblish.api.InstancePlugin): node_name = sitem.name() node_class = node.Class() - # collect timelineIn/Out effect_t_in = int(sitem.timelineIn()) effect_t_out = int(sitem.timelineOut()) From 2ed1a97864ba7c9b557b6159c03a78056d804b6f Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 28 Feb 2023 14:22:38 +0100 Subject: [PATCH 693/912] nuke: start new workfile from tempate wip --- openpype/hosts/nuke/api/lib.py | 12 ++++++++++- openpype/hosts/nuke/api/pipeline.py | 3 ++- .../nuke/api/workfile_template_builder.py | 20 +++++++++++++++++- .../workfile/workfile_template_builder.py | 21 +++++++------------ 4 files changed, 39 insertions(+), 17 deletions(-) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index c08db978d3..2b7aaa9d70 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -48,7 +48,6 @@ from openpype.pipeline.colorspace import ( get_imageio_config ) from openpype.pipeline.workfile import BuildWorkfile - from . import gizmo_menu from .constants import ASSIST @@ -2678,6 +2677,17 @@ def process_workfile_builder(): open_file(last_workfile_path) +def start_workfile_template_builder(): + from .workfile_template_builder import ( + build_workfile_template + ) + + # to avoid looping of the callback, remove it! + # nuke.removeOnCreate(start_workfile_template_builder, nodeClass="Root") + log.info("Starting workfile template builder...") + build_workfile_template() + + @deprecated def recreate_instance(origin_node, avalon_data=None): """Recreate input instance to different data diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index 2496d66c1d..30270a4e5f 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -33,6 +33,7 @@ from .lib import ( add_publish_knob, WorkfileSettings, process_workfile_builder, + start_workfile_template_builder, launch_workfiles_app, check_inventory_versions, set_avalon_knob_data, @@ -48,7 +49,6 @@ from .workfile_template_builder import ( NukePlaceholderLoadPlugin, NukePlaceholderCreatePlugin, build_workfile_template, - update_workfile_template, create_placeholder, update_placeholder, ) @@ -155,6 +155,7 @@ def add_nuke_callbacks(): # Set context settings. nuke.addOnCreate( workfile_settings.set_context_settings, nodeClass="Root") + nuke.addOnCreate(start_workfile_template_builder, nodeClass="Root") nuke.addOnCreate(workfile_settings.set_favorites, nodeClass="Root") nuke.addOnCreate(process_workfile_builder, nodeClass="Root") diff --git a/openpype/hosts/nuke/api/workfile_template_builder.py b/openpype/hosts/nuke/api/workfile_template_builder.py index 739c10d56b..1c0a41456a 100644 --- a/openpype/hosts/nuke/api/workfile_template_builder.py +++ b/openpype/hosts/nuke/api/workfile_template_builder.py @@ -15,7 +15,7 @@ from openpype.pipeline.workfile.workfile_template_builder import ( from openpype.tools.workfile_template_build import ( WorkfileBuildPlaceholderDialog, ) - +from openpype.host import IWorkfileHost from .lib import ( find_free_space_to_paste_nodes, get_extreme_positions, @@ -56,6 +56,24 @@ class NukeTemplateBuilder(AbstractTemplateBuilder): return True + def create_first_workfile_version(self): + """ + Create first version of workfile. + + Should load the content of template into scene so + 'populate_scene_placeholders' can be started. + + Args: + template_path (str): Fullpath for current task and + host's template file. + """ + last_workfile_path = os.environ.get("AVALON_LAST_WORKFILE") + # Save current scene, continue to open file + if isinstance(self.host, IWorkfileHost): + self.host.save_workfile(last_workfile_path) + else: + self.host.save_file(last_workfile_path) + class NukePlaceholderPlugin(PlaceholderPlugin): node_color = 4278190335 diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py index 6bbe5f5d13..1758c30a8b 100644 --- a/openpype/pipeline/workfile/workfile_template_builder.py +++ b/openpype/pipeline/workfile/workfile_template_builder.py @@ -505,19 +505,8 @@ class AbstractTemplateBuilder(object): """ Create first version of workfile. - Should load the content of template into scene so - 'populate_scene_placeholders' can be started. - - Args: - template_path (str): Fullpath for current task and - host's template file. """ - last_workfile_path = os.environ.get("AVALON_LAST_WORKFILE") - # Save current scene, continue to open file - if isinstance(self.host, IWorkfileHost): - self.host.save_workfile(last_workfile_path) - else: - self.host.save_file(last_workfile_path) + pass def _prepare_placeholders(self, placeholders): """Run preparation part for placeholders on plugins. @@ -702,6 +691,8 @@ class AbstractTemplateBuilder(object): # switch to remove placeholders after they are used keep_placeholder = profile.get("keep_placeholder") + create_first_version = profile.get("create_first_version") + # backward compatibility, since default is True if keep_placeholder is None: keep_placeholder = True @@ -735,7 +726,8 @@ class AbstractTemplateBuilder(object): self.log.info("Found template at: '{}'".format(path)) return { "path": path, - "keep_placeholder": keep_placeholder + "keep_placeholder": keep_placeholder, + "create_first_version": create_first_version } solved_path = None @@ -764,7 +756,8 @@ class AbstractTemplateBuilder(object): return { "path": solved_path, - "keep_placeholder": keep_placeholder + "keep_placeholder": keep_placeholder, + "create_first_version": create_first_version } From 477d2e24143ef5caebe6801d094541ab012ffe39 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Mon, 27 Feb 2023 18:15:44 +0100 Subject: [PATCH 694/912] :bug: return AssetContainer to allow loading --- .../OpenPype/Private/AssetContainer.cpp | 114 ++++++++++++++++++ .../Private/AssetContainerFactory.cpp | 20 +++ .../Source/OpenPype/Public/AssetContainer.h | 37 ++++++ .../OpenPype/Public/AssetContainerFactory.h | 21 ++++ 4 files changed, 192 insertions(+) create mode 100644 openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/AssetContainer.cpp create mode 100644 openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/AssetContainerFactory.cpp create mode 100644 openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/AssetContainer.h create mode 100644 openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/AssetContainerFactory.h diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/AssetContainer.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/AssetContainer.cpp new file mode 100644 index 0000000000..0bea9e3d78 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/AssetContainer.cpp @@ -0,0 +1,114 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#include "AssetContainer.h" +#include "AssetRegistry/AssetRegistryModule.h" +#include "Misc/PackageName.h" +#include "Engine.h" +#include "Containers/UnrealString.h" + +UAssetContainer::UAssetContainer(const FObjectInitializer& ObjectInitializer) +: UAssetUserData(ObjectInitializer) +{ + FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked("AssetRegistry"); + FString path = UAssetContainer::GetPathName(); + UE_LOG(LogTemp, Warning, TEXT("UAssetContainer %s"), *path); + FARFilter Filter; + Filter.PackagePaths.Add(FName(*path)); + + AssetRegistryModule.Get().OnAssetAdded().AddUObject(this, &UAssetContainer::OnAssetAdded); + AssetRegistryModule.Get().OnAssetRemoved().AddUObject(this, &UAssetContainer::OnAssetRemoved); + AssetRegistryModule.Get().OnAssetRenamed().AddUObject(this, &UAssetContainer::OnAssetRenamed); +} + +void UAssetContainer::OnAssetAdded(const FAssetData& AssetData) +{ + TArray split; + + // get directory of current container + FString selfFullPath = UAssetContainer::GetPathName(); + FString selfDir = FPackageName::GetLongPackagePath(*selfFullPath); + + // get asset path and class + FString assetPath = AssetData.GetFullName(); + FString assetFName = AssetData.AssetClassPath.ToString(); + UE_LOG(LogTemp, Log, TEXT("asset name %s"), *assetFName); + // split path + assetPath.ParseIntoArray(split, TEXT(" "), true); + + FString assetDir = FPackageName::GetLongPackagePath(*split[1]); + + // take interest only in paths starting with path of current container + if (assetDir.StartsWith(*selfDir)) + { + // exclude self + if (assetFName != "AssetContainer") + { + assets.Add(assetPath); + assetsData.Add(AssetData); + UE_LOG(LogTemp, Log, TEXT("%s: asset added to %s"), *selfFullPath, *selfDir); + } + } +} + +void UAssetContainer::OnAssetRemoved(const FAssetData& AssetData) +{ + TArray split; + + // get directory of current container + FString selfFullPath = UAssetContainer::GetPathName(); + FString selfDir = FPackageName::GetLongPackagePath(*selfFullPath); + + // get asset path and class + FString assetPath = AssetData.GetFullName(); + FString assetFName = AssetData.AssetClassPath.ToString(); + + // split path + assetPath.ParseIntoArray(split, TEXT(" "), true); + + FString assetDir = FPackageName::GetLongPackagePath(*split[1]); + + // take interest only in paths starting with path of current container + FString path = UAssetContainer::GetPathName(); + FString lpp = FPackageName::GetLongPackagePath(*path); + + if (assetDir.StartsWith(*selfDir)) + { + // exclude self + if (assetFName != "AssetContainer") + { + // UE_LOG(LogTemp, Warning, TEXT("%s: asset removed"), *lpp); + assets.Remove(assetPath); + assetsData.Remove(AssetData); + } + } +} + +void UAssetContainer::OnAssetRenamed(const FAssetData& AssetData, const FString& str) +{ + TArray split; + + // get directory of current container + FString selfFullPath = UAssetContainer::GetPathName(); + FString selfDir = FPackageName::GetLongPackagePath(*selfFullPath); + + // get asset path and class + FString assetPath = AssetData.GetFullName(); + FString assetFName = AssetData.AssetClassPath.ToString(); + + // split path + assetPath.ParseIntoArray(split, TEXT(" "), true); + + FString assetDir = FPackageName::GetLongPackagePath(*split[1]); + if (assetDir.StartsWith(*selfDir)) + { + // exclude self + if (assetFName != "AssetContainer") + { + + assets.Remove(str); + assets.Add(assetPath); + assetsData.Remove(AssetData); + // UE_LOG(LogTemp, Warning, TEXT("%s: asset renamed %s"), *lpp, *str); + } + } +} diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/AssetContainerFactory.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/AssetContainerFactory.cpp new file mode 100644 index 0000000000..b943150bdd --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/AssetContainerFactory.cpp @@ -0,0 +1,20 @@ +#include "AssetContainerFactory.h" +#include "AssetContainer.h" + +UAssetContainerFactory::UAssetContainerFactory(const FObjectInitializer& ObjectInitializer) + : UFactory(ObjectInitializer) +{ + SupportedClass = UAssetContainer::StaticClass(); + bCreateNew = false; + bEditorImport = true; +} + +UObject* UAssetContainerFactory::FactoryCreateNew(UClass* Class, UObject* InParent, FName Name, EObjectFlags Flags, UObject* Context, FFeedbackContext* Warn) +{ + UAssetContainer* AssetContainer = NewObject(InParent, Class, Name, Flags); + return AssetContainer; +} + +bool UAssetContainerFactory::ShouldShowInNewMenu() const { + return false; +} diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/AssetContainer.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/AssetContainer.h new file mode 100644 index 0000000000..9157569c08 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/AssetContainer.h @@ -0,0 +1,37 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "UObject/NoExportTypes.h" +#include "Engine/AssetUserData.h" +#include "AssetRegistry/AssetData.h" +#include "AssetContainer.generated.h" + +/** + * + */ +UCLASS(Blueprintable) +class OPENPYPE_API UAssetContainer : public UAssetUserData +{ + GENERATED_BODY() + +public: + + UAssetContainer(const FObjectInitializer& ObjectInitalizer); + // ~UAssetContainer(); + + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category="Assets") + TArray assets; + + // There seems to be no reflection option to expose array of FAssetData + /* + UPROPERTY(Transient, BlueprintReadOnly, Category = "Python", meta=(DisplayName="Assets Data")) + TArray assetsData; + */ +private: + TArray assetsData; + void OnAssetAdded(const FAssetData& AssetData); + void OnAssetRemoved(const FAssetData& AssetData); + void OnAssetRenamed(const FAssetData& AssetData, const FString& str); +}; diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/AssetContainerFactory.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/AssetContainerFactory.h new file mode 100644 index 0000000000..9095f8a3d7 --- /dev/null +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/AssetContainerFactory.h @@ -0,0 +1,21 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Factories/Factory.h" +#include "AssetContainerFactory.generated.h" + +/** + * + */ +UCLASS() +class OPENPYPE_API UAssetContainerFactory : public UFactory +{ + GENERATED_BODY() + +public: + UAssetContainerFactory(const FObjectInitializer& ObjectInitializer); + virtual UObject* FactoryCreateNew(UClass* Class, UObject* InParent, FName Name, EObjectFlags Flags, UObject* Context, FFeedbackContext* Warn) override; + virtual bool ShouldShowInNewMenu() const override; +}; From 1ef786afb8c7dacfd219bdf3733a52e777082c3f Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 28 Feb 2023 14:39:12 +0100 Subject: [PATCH 695/912] added option to use new creating system in workfile template builder --- .../maya/api/workfile_template_builder.py | 2 + .../workfile/workfile_template_builder.py | 97 ++++++++++++++----- 2 files changed, 74 insertions(+), 25 deletions(-) diff --git a/openpype/hosts/maya/api/workfile_template_builder.py b/openpype/hosts/maya/api/workfile_template_builder.py index 2f550e787a..90ab6e21e0 100644 --- a/openpype/hosts/maya/api/workfile_template_builder.py +++ b/openpype/hosts/maya/api/workfile_template_builder.py @@ -22,6 +22,8 @@ PLACEHOLDER_SET = "PLACEHOLDERS_SET" class MayaTemplateBuilder(AbstractTemplateBuilder): """Concrete implementation of AbstractTemplateBuilder for maya""" + use_legacy_creators = True + def import_template(self, path): """Import template into current scene. Block if a template is already loaded. diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py index 119e4aaeb7..0167224cb0 100644 --- a/openpype/pipeline/workfile/workfile_template_builder.py +++ b/openpype/pipeline/workfile/workfile_template_builder.py @@ -43,7 +43,8 @@ from openpype.pipeline.load import ( load_with_repre_context, ) from openpype.pipeline.create import ( - discover_legacy_creator_plugins + discover_legacy_creator_plugins, + CreateContext, ) @@ -91,6 +92,7 @@ class AbstractTemplateBuilder(object): """ _log = None + use_legacy_creators = False def __init__(self, host): # Get host name @@ -110,6 +112,7 @@ class AbstractTemplateBuilder(object): self._placeholder_plugins = None self._loaders_by_name = None self._creators_by_name = None + self._create_context = None self._system_settings = None self._project_settings = None @@ -171,6 +174,14 @@ class AbstractTemplateBuilder(object): .get("type") ) + @property + def create_context(self): + if self._create_context is None: + self._create_context = CreateContext( + self.host, discover_publish_plugins=False + ) + return self._create_context + def get_placeholder_plugin_classes(self): """Get placeholder plugin classes that can be used to build template. @@ -235,18 +246,29 @@ class AbstractTemplateBuilder(object): self._loaders_by_name = get_loaders_by_name() return self._loaders_by_name + def _collect_legacy_creators(self): + creators_by_name = {} + for creator in discover_legacy_creator_plugins(): + if not creator.enabled: + continue + creator_name = creator.__name__ + if creator_name in creators_by_name: + raise KeyError( + "Duplicated creator name {} !".format(creator_name) + ) + creators_by_name[creator_name] = creator + self._creators_by_name = creators_by_name + + def _collect_creators(self): + self._creators_by_name = dict(self.create_context.creators) + def get_creators_by_name(self): if self._creators_by_name is None: - self._creators_by_name = {} - for creator in discover_legacy_creator_plugins(): - if not creator.enabled: - continue - creator_name = creator.__name__ - if creator_name in self._creators_by_name: - raise KeyError( - "Duplicated creator name {} !".format(creator_name) - ) - self._creators_by_name[creator_name] = creator + if self.use_legacy_creators: + self._collect_legacy_creators() + else: + self._collect_creators() + return self._creators_by_name def get_shared_data(self, key): @@ -1579,6 +1601,8 @@ class PlaceholderCreateMixin(object): placeholder (PlaceholderItem): Placeholder item with information about requested publishable instance. """ + + legacy_create = self.builder.use_legacy_creators creator_name = placeholder.data["creator"] create_variant = placeholder.data["create_variant"] @@ -1589,17 +1613,28 @@ class PlaceholderCreateMixin(object): task_name = legacy_io.Session["AVALON_TASK"] asset_name = legacy_io.Session["AVALON_ASSET"] - # get asset id - asset_doc = get_asset_by_name(project_name, asset_name, fields=["_id"]) - assert asset_doc, "No current asset found in Session" - asset_id = asset_doc['_id'] + if legacy_create: + asset_doc = get_asset_by_name( + project_name, asset_name, fields=["_id"] + ) + assert asset_doc, "No current asset found in Session" + subset_name = creator_plugin.get_subset_name( + create_variant, + task_name, + asset_doc["_id"], + project_name + ) - subset_name = creator_plugin.get_subset_name( - create_variant, - task_name, - asset_id, - project_name - ) + else: + asset_doc = get_asset_by_name(project_name, asset_name) + assert asset_doc, "No current asset found in Session" + subset_name = creator_plugin.get_subset_name( + create_variant, + task_name, + asset_doc, + project_name, + self.builder.host_name + ) creator_data = { "creator_name": creator_name, @@ -1612,10 +1647,22 @@ class PlaceholderCreateMixin(object): # compile subset name from variant try: - creator_instance = creator_plugin( - subset_name, - asset_name - ).process() + if legacy_create: + creator_instance = creator_plugin( + subset_name, + asset_name + ).process() + else: + creator_instance = creator_plugin.create( + subset_name, + { + "asset": asset_doc["name"], + "task": task_name, + "family": creator_plugin.family, + "variant": create_variant + }, + {} + ) except Exception: failed = True From ee3e346c8df68515d72221bb2e3fe84ab92e9b0e Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 28 Feb 2023 14:53:49 +0100 Subject: [PATCH 696/912] Global: refactory colormanaged exctractor into plugin mixin --- .../plugins/publish/extract_render_local.py | 3 +- openpype/pipeline/publish/__init__.py | 4 +- openpype/pipeline/publish/publish_plugins.py | 40 ++++++++++--------- .../publish/extract_colorspace_data.py | 3 +- 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/openpype/hosts/nuke/plugins/publish/extract_render_local.py b/openpype/hosts/nuke/plugins/publish/extract_render_local.py index b99a7a9548..4d7ade9c7a 100644 --- a/openpype/hosts/nuke/plugins/publish/extract_render_local.py +++ b/openpype/hosts/nuke/plugins/publish/extract_render_local.py @@ -9,7 +9,8 @@ from openpype.pipeline import publish from openpype.lib import collect_frames -class NukeRenderLocal(publish.ExtractorColormanaged): +class NukeRenderLocal(publish.Extractor, + publish.ColormanagedPyblishPluginMixin): """Render the current Nuke composition locally. Extract the result of savers by starting a comp render diff --git a/openpype/pipeline/publish/__init__.py b/openpype/pipeline/publish/__init__.py index 05ba1c9c33..36252c9f3d 100644 --- a/openpype/pipeline/publish/__init__.py +++ b/openpype/pipeline/publish/__init__.py @@ -19,7 +19,7 @@ from .publish_plugins import ( RepairContextAction, Extractor, - ExtractorColormanaged, + ColormanagedPyblishPluginMixin ) from .lib import ( @@ -64,7 +64,7 @@ __all__ = ( "RepairContextAction", "Extractor", - "ExtractorColormanaged", + "ColormanagedPyblishPluginMixin", "get_publish_template_name", diff --git a/openpype/pipeline/publish/publish_plugins.py b/openpype/pipeline/publish/publish_plugins.py index e2ae893aa9..0142919e76 100644 --- a/openpype/pipeline/publish/publish_plugins.py +++ b/openpype/pipeline/publish/publish_plugins.py @@ -3,7 +3,7 @@ from abc import ABCMeta from pprint import pformat import pyblish.api from pyblish.plugin import MetaPlugin, ExplicitMetaPlugin - +from openpype.lib.transcoding import VIDEO_EXTENSIONS, IMAGE_EXTENSIONS from openpype.lib import BoolDef from .lib import ( @@ -288,24 +288,25 @@ class Extractor(pyblish.api.InstancePlugin): return get_instance_staging_dir(instance) -class ExtractorColormanaged(Extractor): - """Extractor base for color managed image data. - - Each Extractor intended to export pixel data representation - should inherit from this class to allow color managed data. - Class implements "get_colorspace_settings" and - "set_representation_colorspace" functions used - for injecting colorspace data to representation data for farther - integration into db document. +class ColormanagedPyblishPluginMixin(object): + """Mixin for colormanaged plugins. + This class is used to set colorspace data to a publishing + representation. It contains a static method, + get_colorspace_settings, which returns config and + file rules data for the host context. + It also contains a method, set_representation_colorspace, + which sets colorspace data to the representation. + The allowed file extensions are listed in the allowed_ext variable. + he method first checks if the file extension is in + the list of allowed extensions. If it is, it then gets the + colorspace settings from the host context and gets a + matching colorspace from rules. Finally, it infuses this + data into the representation. """ - - allowed_ext = [ - "cin", "dpx", "avi", "dv", "gif", "flv", "mkv", "mov", "mpg", "mpeg", - "mp4", "m4v", "mxf", "iff", "z", "ifl", "jpeg", "jpg", "jfif", "lut", - "1dl", "exr", "pic", "png", "ppm", "pnm", "pgm", "pbm", "rla", "rpf", - "sgi", "rgba", "rgb", "bw", "tga", "tiff", "tif", "img" - ] + allowed_ext = set( + ext.lstrip(".") for ext in IMAGE_EXTENSIONS.union(VIDEO_EXTENSIONS) + ) @staticmethod def get_colorspace_settings(context): @@ -375,7 +376,10 @@ class ExtractorColormanaged(Extractor): ext = representation["ext"] # check extension self.log.debug("__ ext: `{}`".format(ext)) - if ext.lower() not in self.allowed_ext: + + # check if ext in lower case is in self.allowed_ext + if ext.lstrip(".").lower() not in self.allowed_ext: + self.log.debug("Extension is not in allowed extensions.") return if colorspace_settings is None: diff --git a/openpype/plugins/publish/extract_colorspace_data.py b/openpype/plugins/publish/extract_colorspace_data.py index 611fb91cbb..363df28fb5 100644 --- a/openpype/plugins/publish/extract_colorspace_data.py +++ b/openpype/plugins/publish/extract_colorspace_data.py @@ -2,7 +2,8 @@ import pyblish.api from openpype.pipeline import publish -class ExtractColorspaceData(publish.ExtractorColormanaged): +class ExtractColorspaceData(publish.Extractor, + publish.ColormanagedPyblishPluginMixin): """ Inject Colorspace data to available representations. Input data: From 76f312a3ff026d04feda901b98bc0ad523e3b00b Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 28 Feb 2023 15:04:54 +0100 Subject: [PATCH 697/912] Nuke: adding colorspace to representation when rendered mode --- .../hosts/nuke/plugins/publish/collect_writes.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py index 3054e5a30c..2b741426e6 100644 --- a/openpype/hosts/nuke/plugins/publish/collect_writes.py +++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py @@ -3,9 +3,10 @@ from pprint import pformat import nuke import pyblish.api from openpype.hosts.nuke import api as napi +from openpype.pipeline import publish - -class CollectNukeWrites(pyblish.api.InstancePlugin): +class CollectNukeWrites(pyblish.api.InstancePlugin, + publish.ColormanagedPyblishPluginMixin): """Collect all write nodes.""" order = pyblish.api.CollectorOrder - 0.48 @@ -128,6 +129,12 @@ class CollectNukeWrites(pyblish.api.InstancePlugin): else: representation['files'] = collected_frames + # inject colorspace data + self.set_representation_colorspace( + representation, instance.context, + colorspace=colorspace + ) + instance.data["representations"].append(representation) self.log.info("Publishing rendered frames ...") @@ -147,6 +154,8 @@ class CollectNukeWrites(pyblish.api.InstancePlugin): # get colorspace and add to version data colorspace = napi.get_colorspace_from_node(write_node) + + # TODO: remove this when we have proper colorspace support version_data = { "colorspace": colorspace } From 9bb36864be3911b25c37c873d68ae4871fdcf57a Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 28 Feb 2023 15:05:16 +0100 Subject: [PATCH 698/912] Nuke: colorspace from node unified --- openpype/hosts/nuke/plugins/publish/extract_render_local.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/nuke/plugins/publish/extract_render_local.py b/openpype/hosts/nuke/plugins/publish/extract_render_local.py index 4d7ade9c7a..e5feda4cd8 100644 --- a/openpype/hosts/nuke/plugins/publish/extract_render_local.py +++ b/openpype/hosts/nuke/plugins/publish/extract_render_local.py @@ -4,7 +4,7 @@ import shutil import pyblish.api import clique import nuke - +from openpype.hosts.nuke import api as napi from openpype.pipeline import publish from openpype.lib import collect_frames @@ -86,7 +86,7 @@ class NukeRenderLocal(publish.Extractor, ) ext = node["file_type"].value() - colorspace = node["colorspace"].value() + colorspace = napi.get_colorspace_from_node(node) if "representations" not in instance.data: instance.data["representations"] = [] From b7e99dacb8b5107a90cbdd933c6b5985dc5bbb79 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 28 Feb 2023 15:45:12 +0100 Subject: [PATCH 699/912] fix spaces --- openpype/pipeline/workfile/workfile_template_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py index 0167224cb0..7ef2e7378b 100644 --- a/openpype/pipeline/workfile/workfile_template_builder.py +++ b/openpype/pipeline/workfile/workfile_template_builder.py @@ -1653,7 +1653,7 @@ class PlaceholderCreateMixin(object): asset_name ).process() else: - creator_instance = creator_plugin.create( + creator_instance = creator_plugin.create( subset_name, { "asset": asset_doc["name"], From d68cc23d32aabb7773b40ff2896fb8ea6390cae7 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 28 Feb 2023 14:37:41 +0100 Subject: [PATCH 700/912] hardcode Poetry to 1.3.2 temporarily New 1.4.0 breaks sphinxcontrib-applehelp. Change in poetry.lock would need new minor version. --- tools/create_env.ps1 | 2 +- tools/create_env.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/create_env.ps1 b/tools/create_env.ps1 index f79bc2a076..7d1f6635d0 100644 --- a/tools/create_env.ps1 +++ b/tools/create_env.ps1 @@ -68,7 +68,7 @@ function Install-Poetry() { } $env:POETRY_HOME="$openpype_root\.poetry" - # $env:POETRY_VERSION="1.1.15" + $env:POETRY_VERSION="1.3.2" (Invoke-WebRequest -Uri https://install.python-poetry.org/ -UseBasicParsing).Content | & $($python) - } diff --git a/tools/create_env.sh b/tools/create_env.sh index fbae69e56d..6915d3f000 100755 --- a/tools/create_env.sh +++ b/tools/create_env.sh @@ -109,7 +109,7 @@ detect_python () { install_poetry () { echo -e "${BIGreen}>>>${RST} Installing Poetry ..." export POETRY_HOME="$openpype_root/.poetry" - # export POETRY_VERSION="1.1.15" + export POETRY_VERSION="1.3.2" command -v curl >/dev/null 2>&1 || { echo -e "${BIRed}!!!${RST}${BIYellow} Missing ${RST}${BIBlue}curl${BIYellow} command.${RST}"; return 1; } curl -sSL https://install.python-poetry.org/ | python - } From 9f35ed2a63ce38f0d7c6b1c29fec305116896a04 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 28 Feb 2023 16:33:18 +0100 Subject: [PATCH 701/912] Fix - store target_colorspace as new colorspace (#4544) When transcoding into new colorspace, representation must carry this information instead original color space. --- openpype/plugins/publish/extract_color_transcode.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py index a6fa710425..58e0350a2e 100644 --- a/openpype/plugins/publish/extract_color_transcode.py +++ b/openpype/plugins/publish/extract_color_transcode.py @@ -129,11 +129,14 @@ class ExtractOIIOTranscode(publish.Extractor): colorspace_data.get("display")) # both could be already collected by DCC, - # but could be overwritten + # but could be overwritten when transcoding if view: new_repre["colorspaceData"]["view"] = view if display: new_repre["colorspaceData"]["display"] = display + if target_colorspace: + new_repre["colorspaceData"]["colorspace"] = \ + target_colorspace additional_command_args = (output_def["oiiotool_args"] ["additional_command_args"]) From 6b2c10da04cb4494d709d612ba06d9d5b7482bf4 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 28 Feb 2023 16:51:18 +0100 Subject: [PATCH 702/912] use 'create' method on create context to trigger creation --- .../pipeline/workfile/workfile_template_builder.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py index 7ef2e7378b..26735d77d0 100644 --- a/openpype/pipeline/workfile/workfile_template_builder.py +++ b/openpype/pipeline/workfile/workfile_template_builder.py @@ -1653,15 +1653,11 @@ class PlaceholderCreateMixin(object): asset_name ).process() else: - creator_instance = creator_plugin.create( - subset_name, - { - "asset": asset_doc["name"], - "task": task_name, - "family": creator_plugin.family, - "variant": create_variant - }, - {} + creator_instance = self.create_context.create( + creator_plugin.identifier, + create_variant, + asset_doc, + task_name=task_name ) except Exception: From 9acf634d1363d08a580bc8341f45419f2effe721 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 28 Feb 2023 17:09:43 +0100 Subject: [PATCH 703/912] fix attribute access --- openpype/pipeline/workfile/workfile_template_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py index 26735d77d0..6ffe0116e5 100644 --- a/openpype/pipeline/workfile/workfile_template_builder.py +++ b/openpype/pipeline/workfile/workfile_template_builder.py @@ -1653,7 +1653,7 @@ class PlaceholderCreateMixin(object): asset_name ).process() else: - creator_instance = self.create_context.create( + creator_instance = self.builder.create_context.create( creator_plugin.identifier, create_variant, asset_doc, From 7c90b6616d50d8106dd6be0811af372d0e5b486c Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 28 Feb 2023 17:32:49 +0100 Subject: [PATCH 704/912] adding headless to creators and workfile builder abstraction --- openpype/hosts/nuke/api/plugin.py | 6 +++++- openpype/hosts/nuke/plugins/create/create_write_image.py | 2 +- .../hosts/nuke/plugins/create/create_write_prerender.py | 2 +- openpype/hosts/nuke/plugins/create/create_write_render.py | 2 +- openpype/pipeline/workfile/workfile_template_builder.py | 6 ++++-- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/nuke/api/plugin.py b/openpype/hosts/nuke/api/plugin.py index 160ca820a4..9518598238 100644 --- a/openpype/hosts/nuke/api/plugin.py +++ b/openpype/hosts/nuke/api/plugin.py @@ -239,7 +239,11 @@ class NukeCreator(NewCreator): def get_pre_create_attr_defs(self): return [ - BoolDef("use_selection", label="Use selection") + BoolDef( + "use_selection", + default=not self.create_context.headless, + label="Use selection" + ) ] def get_creator_settings(self, project_settings, settings_key=None): diff --git a/openpype/hosts/nuke/plugins/create/create_write_image.py b/openpype/hosts/nuke/plugins/create/create_write_image.py index 1e23b3ad7f..d38253ab2f 100644 --- a/openpype/hosts/nuke/plugins/create/create_write_image.py +++ b/openpype/hosts/nuke/plugins/create/create_write_image.py @@ -35,7 +35,7 @@ class CreateWriteImage(napi.NukeWriteCreator): attr_defs = [ BoolDef( "use_selection", - default=True, + default=not self.create_context.headless, label="Use selection" ), self._get_render_target_enum(), diff --git a/openpype/hosts/nuke/plugins/create/create_write_prerender.py b/openpype/hosts/nuke/plugins/create/create_write_prerender.py index a15f362dd1..d0d7f8edfd 100644 --- a/openpype/hosts/nuke/plugins/create/create_write_prerender.py +++ b/openpype/hosts/nuke/plugins/create/create_write_prerender.py @@ -37,7 +37,7 @@ class CreateWritePrerender(napi.NukeWriteCreator): attr_defs = [ BoolDef( "use_selection", - default=True, + default=not self.create_context.headless, label="Use selection" ), self._get_render_target_enum() diff --git a/openpype/hosts/nuke/plugins/create/create_write_render.py b/openpype/hosts/nuke/plugins/create/create_write_render.py index 481d1d2201..4e0b42361d 100644 --- a/openpype/hosts/nuke/plugins/create/create_write_render.py +++ b/openpype/hosts/nuke/plugins/create/create_write_render.py @@ -34,7 +34,7 @@ class CreateWriteRender(napi.NukeWriteCreator): attr_defs = [ BoolDef( "use_selection", - default=True, + default=not self.create_context.headless, label="Use selection" ), self._get_render_target_enum() diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py index 6ffe0116e5..6a99314f48 100644 --- a/openpype/pipeline/workfile/workfile_template_builder.py +++ b/openpype/pipeline/workfile/workfile_template_builder.py @@ -178,7 +178,9 @@ class AbstractTemplateBuilder(object): def create_context(self): if self._create_context is None: self._create_context = CreateContext( - self.host, discover_publish_plugins=False + self.host, + discover_publish_plugins=False, + headless=True ) return self._create_context @@ -1660,7 +1662,7 @@ class PlaceholderCreateMixin(object): task_name=task_name ) - except Exception: + except: failed = True self.create_failed(placeholder, creator_data) From 6885357c75246e4851aade1ae3261ea89f3a9658 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 28 Feb 2023 18:14:46 +0000 Subject: [PATCH 705/912] Fix broken review publishing. --- .../maya/plugins/publish/extract_playblast.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/extract_playblast.py b/openpype/hosts/maya/plugins/publish/extract_playblast.py index 1966ad7b66..7b9e4214b9 100644 --- a/openpype/hosts/maya/plugins/publish/extract_playblast.py +++ b/openpype/hosts/maya/plugins/publish/extract_playblast.py @@ -118,7 +118,7 @@ class ExtractPlayblast(publish.Extractor): # Need to explicitly enable some viewport changes so the viewport is # refreshed ahead of playblasting. - panel = cmds.getPanel(withFocus=True) + panel = cmds.getPanel(withFocus=True) or "" keys = [ "useDefaultMaterial", "wireframeOnShaded", @@ -127,12 +127,13 @@ class ExtractPlayblast(publish.Extractor): "backfaceCulling" ] viewport_defaults = {} - for key in keys: - viewport_defaults[key] = cmds.modelEditor( - panel, query=True, **{key: True} - ) - if preset["viewport_options"][key]: - cmds.modelEditor(panel, edit=True, **{key: True}) + if panel and "modelPanel" in panel: + for key in keys: + viewport_defaults[key] = cmds.modelEditor( + panel, query=True, **{key: True} + ) + if preset["viewport_options"][key]: + cmds.modelEditor(panel, edit=True, **{key: True}) override_viewport_options = ( capture_presets['Viewport Options']['override_viewport_options'] @@ -163,7 +164,8 @@ class ExtractPlayblast(publish.Extractor): path = capture.capture(log=self.log, **preset) # Restoring viewport options. - cmds.modelEditor(panel, edit=True, **viewport_defaults) + if viewport_defaults: + cmds.modelEditor(panel, edit=True, **viewport_defaults) cmds.setAttr("{}.panZoomEnabled".format(preset["camera"]), pan_zoom) From b29b53af2024a4b849a4e96f3e77e24f5fba7be7 Mon Sep 17 00:00:00 2001 From: Ynbot Date: Wed, 1 Mar 2023 03:32:10 +0000 Subject: [PATCH 706/912] [Automated] Bump version --- openpype/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/version.py b/openpype/version.py index bd1ba5309d..4d6f3d43e4 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.15.2-nightly.2" +__version__ = "3.15.2-nightly.3" From f4d22e6ac671245dab4c4f6831ea6f057ca088c6 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Fri, 24 Feb 2023 11:44:41 +0000 Subject: [PATCH 707/912] Options for VrayProxy output. --- .../maya/plugins/create/create_vrayproxy.py | 6 ++++ .../maya/plugins/publish/collect_vrayproxy.py | 8 ++++- .../plugins/publish/extract_pointcache.py | 2 +- .../maya/plugins/publish/extract_vrayproxy.py | 2 +- .../plugins/publish/validate_vrayproxy.py | 32 ++++++++++------- .../defaults/project_settings/maya.json | 16 +++++---- .../schemas/schema_maya_create.json | 34 ++++++++++++++++--- 7 files changed, 73 insertions(+), 27 deletions(-) diff --git a/openpype/hosts/maya/plugins/create/create_vrayproxy.py b/openpype/hosts/maya/plugins/create/create_vrayproxy.py index 5c0365b495..d135073e82 100644 --- a/openpype/hosts/maya/plugins/create/create_vrayproxy.py +++ b/openpype/hosts/maya/plugins/create/create_vrayproxy.py @@ -9,6 +9,9 @@ class CreateVrayProxy(plugin.Creator): family = "vrayproxy" icon = "gears" + vrmesh = True + alembic = True + def __init__(self, *args, **kwargs): super(CreateVrayProxy, self).__init__(*args, **kwargs) @@ -18,3 +21,6 @@ class CreateVrayProxy(plugin.Creator): # Write vertex colors self.data["vertexColors"] = False + + self.data["vrmesh"] = self.vrmesh + self.data["alembic"] = self.alembic diff --git a/openpype/hosts/maya/plugins/publish/collect_vrayproxy.py b/openpype/hosts/maya/plugins/publish/collect_vrayproxy.py index 236797ca3c..24521a2f09 100644 --- a/openpype/hosts/maya/plugins/publish/collect_vrayproxy.py +++ b/openpype/hosts/maya/plugins/publish/collect_vrayproxy.py @@ -9,10 +9,16 @@ class CollectVrayProxy(pyblish.api.InstancePlugin): Add `pointcache` family for it. """ order = pyblish.api.CollectorOrder + 0.01 - label = 'Collect Vray Proxy' + label = "Collect Vray Proxy" families = ["vrayproxy"] def process(self, instance): """Collector entry point.""" if not instance.data.get('families'): instance.data["families"] = [] + + if instance.data.get("vrmesh"): + instance.data["families"].append("vrayproxy.vrmesh") + + if instance.data.get("alembic"): + instance.data["families"].append("vrayproxy.alembic") diff --git a/openpype/hosts/maya/plugins/publish/extract_pointcache.py b/openpype/hosts/maya/plugins/publish/extract_pointcache.py index a3b0560099..f44c13767c 100644 --- a/openpype/hosts/maya/plugins/publish/extract_pointcache.py +++ b/openpype/hosts/maya/plugins/publish/extract_pointcache.py @@ -23,7 +23,7 @@ class ExtractAlembic(publish.Extractor): label = "Extract Pointcache (Alembic)" hosts = ["maya"] - families = ["pointcache", "model", "vrayproxy"] + families = ["pointcache", "model", "vrayproxy.alembic"] targets = ["local", "remote"] def process(self, instance): diff --git a/openpype/hosts/maya/plugins/publish/extract_vrayproxy.py b/openpype/hosts/maya/plugins/publish/extract_vrayproxy.py index 38bf02245a..9b10d2737d 100644 --- a/openpype/hosts/maya/plugins/publish/extract_vrayproxy.py +++ b/openpype/hosts/maya/plugins/publish/extract_vrayproxy.py @@ -16,7 +16,7 @@ class ExtractVRayProxy(publish.Extractor): label = "VRay Proxy (.vrmesh)" hosts = ["maya"] - families = ["vrayproxy"] + families = ["vrayproxy.vrmesh"] def process(self, instance): diff --git a/openpype/hosts/maya/plugins/publish/validate_vrayproxy.py b/openpype/hosts/maya/plugins/publish/validate_vrayproxy.py index 3eceace76d..075eedc378 100644 --- a/openpype/hosts/maya/plugins/publish/validate_vrayproxy.py +++ b/openpype/hosts/maya/plugins/publish/validate_vrayproxy.py @@ -1,27 +1,33 @@ import pyblish.api +from openpype.pipeline import KnownPublishError + class ValidateVrayProxy(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder - label = 'VRay Proxy Settings' - hosts = ['maya'] - families = ['studio.vrayproxy'] + label = "VRay Proxy Settings" + hosts = ["maya"] + families = ["vrayproxy"] def process(self, instance): - - invalid = self.get_invalid(instance) - if invalid: - raise RuntimeError("'%s' has invalid settings for VRay Proxy " - "export!" % instance.name) - - @classmethod - def get_invalid(cls, instance): data = instance.data + self.log.info(data["family"]) + self.log.info(data["families"]) if not data["setMembers"]: - cls.log.error("'%s' is empty! This is a bug" % instance.name) + raise KnownPublishError( + "'%s' is empty! This is a bug" % instance.name + ) if data["animation"]: if data["frameEnd"] < data["frameStart"]: - cls.log.error("End frame is smaller than start frame") + raise KnownPublishError( + "End frame is smaller than start frame" + ) + + if not data["vrmesh"] and not data["alembic"]: + raise KnownPublishError( + "Both vrmesh and alembic are off. Needs at least one to" + " publish." + ) diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index 2559448900..90334a6644 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -199,6 +199,14 @@ "maskColor_manager": false, "maskOperator": false }, + "CreateVrayProxy": { + "enabled": true, + "vrmesh": true, + "alembic": true, + "defaults": [ + "Main" + ] + }, "CreateMultiverseUsd": { "enabled": true, "defaults": [ @@ -268,12 +276,6 @@ "Anim" ] }, - "CreateVrayProxy": { - "enabled": true, - "defaults": [ - "Main" - ] - }, "CreateVRayScene": { "enabled": true, "defaults": [ @@ -676,7 +678,7 @@ "families": [ "pointcache", "model", - "vrayproxy" + "vrayproxy.alembic" ] }, "ExtractObj": { diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json index 77a39f692f..49503cce83 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json @@ -332,6 +332,36 @@ } ] }, + { + "type": "dict", + "collapsible": true, + "key": "CreateVrayProxy", + "label": "Create VRay Proxy", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "vrmesh", + "label": "VrMesh" + }, + { + "type": "boolean", + "key": "alembic", + "label": "Alembic" + }, + { + "type": "list", + "key": "defaults", + "label": "Default Subsets", + "object_type": "text" + } + ] + }, { "type": "schema_template", "name": "template_create_plugin", @@ -380,10 +410,6 @@ "key": "CreateSetDress", "label": "Create Set Dress" }, - { - "key": "CreateVrayProxy", - "label": "Create VRay Proxy" - }, { "key": "CreateVRayScene", "label": "Create VRay Scene" From 65e0273f1c93dee1bd359d740d3206b4c4472548 Mon Sep 17 00:00:00 2001 From: Toke Jepsen Date: Tue, 28 Feb 2023 07:22:09 +0000 Subject: [PATCH 708/912] Update openpype/hosts/maya/plugins/publish/validate_vrayproxy.py --- openpype/hosts/maya/plugins/publish/validate_vrayproxy.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/validate_vrayproxy.py b/openpype/hosts/maya/plugins/publish/validate_vrayproxy.py index 075eedc378..a106b970b4 100644 --- a/openpype/hosts/maya/plugins/publish/validate_vrayproxy.py +++ b/openpype/hosts/maya/plugins/publish/validate_vrayproxy.py @@ -12,8 +12,6 @@ class ValidateVrayProxy(pyblish.api.InstancePlugin): def process(self, instance): data = instance.data - self.log.info(data["family"]) - self.log.info(data["families"]) if not data["setMembers"]: raise KnownPublishError( From ab22f503c9542d002d22f162b76489caa7fe90ca Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 1 Mar 2023 08:06:05 +0000 Subject: [PATCH 709/912] Fix panel issues. --- .../maya/plugins/publish/collect_review.py | 3 +++ .../maya/plugins/publish/extract_playblast.py | 24 +++++++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/collect_review.py b/openpype/hosts/maya/plugins/publish/collect_review.py index eb872c2935..65ff7cf0fe 100644 --- a/openpype/hosts/maya/plugins/publish/collect_review.py +++ b/openpype/hosts/maya/plugins/publish/collect_review.py @@ -23,6 +23,9 @@ class CollectReview(pyblish.api.InstancePlugin): task = legacy_io.Session["AVALON_TASK"] + # Get panel. + instance.data["panel"] = cmds.playblast(activeEditor=True) + # get cameras members = instance.data['setMembers'] cameras = cmds.ls(members, long=True, diff --git a/openpype/hosts/maya/plugins/publish/extract_playblast.py b/openpype/hosts/maya/plugins/publish/extract_playblast.py index 7b9e4214b9..94571ff731 100644 --- a/openpype/hosts/maya/plugins/publish/extract_playblast.py +++ b/openpype/hosts/maya/plugins/publish/extract_playblast.py @@ -118,7 +118,6 @@ class ExtractPlayblast(publish.Extractor): # Need to explicitly enable some viewport changes so the viewport is # refreshed ahead of playblasting. - panel = cmds.getPanel(withFocus=True) or "" keys = [ "useDefaultMaterial", "wireframeOnShaded", @@ -127,13 +126,14 @@ class ExtractPlayblast(publish.Extractor): "backfaceCulling" ] viewport_defaults = {} - if panel and "modelPanel" in panel: - for key in keys: - viewport_defaults[key] = cmds.modelEditor( - panel, query=True, **{key: True} + for key in keys: + viewport_defaults[key] = cmds.modelEditor( + instance.data["panel"], query=True, **{key: True} + ) + if preset["viewport_options"][key]: + cmds.modelEditor( + instance.data["panel"], edit=True, **{key: True} ) - if preset["viewport_options"][key]: - cmds.modelEditor(panel, edit=True, **{key: True}) override_viewport_options = ( capture_presets['Viewport Options']['override_viewport_options'] @@ -148,12 +148,10 @@ class ExtractPlayblast(publish.Extractor): # Update preset with current panel setting # if override_viewport_options is turned off - panel = cmds.getPanel(withFocus=True) or "" - if not override_viewport_options and "modelPanel" in panel: - panel_preset = capture.parse_active_view() + if not override_viewport_options: + panel_preset = capture.parse_view(instance.data["panel"]) panel_preset.pop("camera") preset.update(panel_preset) - cmds.setFocus(panel) self.log.info( "Using preset:\n{}".format( @@ -165,7 +163,9 @@ class ExtractPlayblast(publish.Extractor): # Restoring viewport options. if viewport_defaults: - cmds.modelEditor(panel, edit=True, **viewport_defaults) + cmds.modelEditor( + instance.data["panel"], edit=True, **viewport_defaults + ) cmds.setAttr("{}.panZoomEnabled".format(preset["camera"]), pan_zoom) From 4f94a4454ab254018c189c8aa53c21fb12b1392d Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 1 Mar 2023 16:02:12 +0000 Subject: [PATCH 710/912] Only run Maya specific code in Maya. --- .../plugins/publish/submit_publish_job.py | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 5325715e38..29f6f406df 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -933,15 +933,18 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): self.log.info(data.get("expectedFiles")) - additional_data = { - "renderProducts": instance.data["renderProducts"], - "colorspaceConfig": instance.data["colorspaceConfig"], - "display": instance.data["colorspaceDisplay"], - "view": instance.data["colorspaceView"], - "colorspaceTemplate": instance.data["colorspaceConfig"].replace( - str(context.data["anatomy"].roots["work"]), "{root[work]}" - ) - } + additional_data = {} + if pyblish.api.current_host() == "maya": + config = instance.data["colorspaceConfig"] + additional_data = { + "renderProducts": instance.data["renderProducts"], + "colorspaceConfig": instance.data["colorspaceConfig"], + "display": instance.data["colorspaceDisplay"], + "view": instance.data["colorspaceView"], + "colorspaceTemplate": config.replace( + str(context.data["anatomy"].roots["work"]), "{root[work]}" + ) + } if isinstance(data.get("expectedFiles")[0], dict): # we cannot attach AOVs to other subsets as we consider every From 491eb3e75010d2f5214385145d05120ce736f93f Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 1 Mar 2023 17:27:16 +0100 Subject: [PATCH 711/912] create first workfile version function to global abstraction --- openpype/hosts/nuke/api/lib.py | 2 +- .../nuke/api/workfile_template_builder.py | 22 +---------- .../workfile/workfile_template_builder.py | 39 ++++++++++++++++--- 3 files changed, 37 insertions(+), 26 deletions(-) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index 2b7aaa9d70..cd31e42690 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -2685,7 +2685,7 @@ def start_workfile_template_builder(): # to avoid looping of the callback, remove it! # nuke.removeOnCreate(start_workfile_template_builder, nodeClass="Root") log.info("Starting workfile template builder...") - build_workfile_template() + build_workfile_template(run_from_callback=True) @deprecated diff --git a/openpype/hosts/nuke/api/workfile_template_builder.py b/openpype/hosts/nuke/api/workfile_template_builder.py index 1c0a41456a..80db0d160c 100644 --- a/openpype/hosts/nuke/api/workfile_template_builder.py +++ b/openpype/hosts/nuke/api/workfile_template_builder.py @@ -56,24 +56,6 @@ class NukeTemplateBuilder(AbstractTemplateBuilder): return True - def create_first_workfile_version(self): - """ - Create first version of workfile. - - Should load the content of template into scene so - 'populate_scene_placeholders' can be started. - - Args: - template_path (str): Fullpath for current task and - host's template file. - """ - last_workfile_path = os.environ.get("AVALON_LAST_WORKFILE") - # Save current scene, continue to open file - if isinstance(self.host, IWorkfileHost): - self.host.save_workfile(last_workfile_path) - else: - self.host.save_file(last_workfile_path) - class NukePlaceholderPlugin(PlaceholderPlugin): node_color = 4278190335 @@ -966,9 +948,9 @@ class NukePlaceholderCreatePlugin( siblings_input.setInput(0, copy_output) -def build_workfile_template(*args): +def build_workfile_template(*args, **kwargs): builder = NukeTemplateBuilder(registered_host()) - builder.build_template() + builder.build_template(*args, **kwargs) def update_workfile_template(*args): diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py index 3dd02ea14d..d73168194e 100644 --- a/openpype/pipeline/workfile/workfile_template_builder.py +++ b/openpype/pipeline/workfile/workfile_template_builder.py @@ -442,7 +442,8 @@ class AbstractTemplateBuilder(object): template_path=None, level_limit=None, keep_placeholders=None, - create_first_version=None + create_first_version=None, + run_from_callback=False ): """Main callback for building workfile from template path. @@ -460,6 +461,9 @@ class AbstractTemplateBuilder(object): hosts to decide if they want to remove placeholder after it is used. create_first_version (bool): create first version of a workfile + run_from_callback (bool): If True, it might create first version + but ignore process if version is created + """ template_preset = self.get_template_preset() @@ -471,8 +475,14 @@ class AbstractTemplateBuilder(object): if create_first_version is None: create_first_version = template_preset["create_first_version"] - if create_first_version: - self.create_first_workfile_version() + # run creation of first version only if it is + # run from callback and no new version is created + first_creation = False + if create_first_version and run_from_callback: + first_creation = not self.create_first_workfile_version() + + if first_creation: + return self.import_template(template_path) self.populate_scene_placeholders( @@ -524,13 +534,32 @@ class AbstractTemplateBuilder(object): pass - @abstractmethod def create_first_workfile_version(self): """ Create first version of workfile. + Should load the content of template into scene so + 'populate_scene_placeholders' can be started. + + Args: + template_path (str): Fullpath for current task and + host's template file. """ - pass + last_workfile_path = os.environ.get("AVALON_LAST_WORKFILE") + if os.path.exists(last_workfile_path): + # ignore in case workfile existence + self.log.info("Workfile already exists, skipping creation.") + return False + + # Save current scene, continue to open file + if isinstance(self.host, IWorkfileHost): + self.host.save_workfile(last_workfile_path) + else: + self.host.save_file(last_workfile_path) + + # Confirm creation of first version + return True + def _prepare_placeholders(self, placeholders): """Run preparation part for placeholders on plugins. From e1fa9f7c3133c359475dd15145b405406aada8f5 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 1 Mar 2023 17:30:31 +0100 Subject: [PATCH 712/912] adding noqa for hound --- openpype/pipeline/workfile/workfile_template_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py index 6a99314f48..2d768d216f 100644 --- a/openpype/pipeline/workfile/workfile_template_builder.py +++ b/openpype/pipeline/workfile/workfile_template_builder.py @@ -1662,7 +1662,7 @@ class PlaceholderCreateMixin(object): task_name=task_name ) - except: + except: # noqa: E722 failed = True self.create_failed(placeholder, creator_data) From 2e83019efa4d2831e5299f33bb4052e263341949 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 1 Mar 2023 17:31:45 +0100 Subject: [PATCH 713/912] hound --- openpype/pipeline/workfile/workfile_template_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py index 2d768d216f..27214af79f 100644 --- a/openpype/pipeline/workfile/workfile_template_builder.py +++ b/openpype/pipeline/workfile/workfile_template_builder.py @@ -1662,7 +1662,7 @@ class PlaceholderCreateMixin(object): task_name=task_name ) - except: # noqa: E722 + except: # noqa: E722 failed = True self.create_failed(placeholder, creator_data) From a3508b14122d6ab884a4303d636bdf37b35ca973 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 2 Mar 2023 08:18:47 +0000 Subject: [PATCH 714/912] Fix _get_representations --- openpype/modules/deadline/plugins/publish/submit_publish_job.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 29f6f406df..adfbcbded8 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -588,7 +588,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): self.log.debug("instances:{}".format(instances)) return instances - def _get_representations(self, instance, exp_files, additional_data): + def _get_representations(self, instance, exp_files): """Create representations for file sequences. This will return representations of expected files if they are not From 5bb204cacbfd0f9769f2f4112e50f6e65b4a7f6e Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 2 Mar 2023 11:30:42 +0100 Subject: [PATCH 715/912] nuke flip order --- openpype/hosts/nuke/plugins/publish/collect_writes.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py index 2b741426e6..f6acd24f99 100644 --- a/openpype/hosts/nuke/plugins/publish/collect_writes.py +++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py @@ -67,6 +67,9 @@ class CollectNukeWrites(pyblish.api.InstancePlugin, write_file_path = nuke.filename(write_node) output_dir = os.path.dirname(write_file_path) + # get colorspace and add to version data + colorspace = napi.get_colorspace_from_node(write_node) + self.log.debug('output dir: {}'.format(output_dir)) if render_target == "frames": @@ -152,9 +155,6 @@ class CollectNukeWrites(pyblish.api.InstancePlugin, instance.data["farm"] = True self.log.info("Farm rendering ON ...") - # get colorspace and add to version data - colorspace = napi.get_colorspace_from_node(write_node) - # TODO: remove this when we have proper colorspace support version_data = { "colorspace": colorspace From f0997710818d3ca2f5ece87aed242ddf4c139a6c Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 2 Mar 2023 11:36:17 +0100 Subject: [PATCH 716/912] hound --- openpype/hosts/nuke/plugins/publish/collect_writes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py index f6acd24f99..858fa79a4b 100644 --- a/openpype/hosts/nuke/plugins/publish/collect_writes.py +++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py @@ -5,6 +5,7 @@ import pyblish.api from openpype.hosts.nuke import api as napi from openpype.pipeline import publish + class CollectNukeWrites(pyblish.api.InstancePlugin, publish.ColormanagedPyblishPluginMixin): """Collect all write nodes.""" From 91685e3d1fd3b43677fc33a537c3d93a5e8920cb Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 2 Mar 2023 11:06:47 +0000 Subject: [PATCH 717/912] Move AOV code to host agnostic. --- .../deadline/plugins/publish/submit_publish_job.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index adfbcbded8..31df4746ba 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -933,8 +933,10 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): self.log.info(data.get("expectedFiles")) - additional_data = {} - if pyblish.api.current_host() == "maya": + if isinstance(data.get("expectedFiles")[0], dict): + # we cannot attach AOVs to other subsets as we consider every + # AOV subset of its own. + config = instance.data["colorspaceConfig"] additional_data = { "renderProducts": instance.data["renderProducts"], @@ -946,10 +948,6 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): ) } - if isinstance(data.get("expectedFiles")[0], dict): - # we cannot attach AOVs to other subsets as we consider every - # AOV subset of its own. - if len(data.get("attachTo")) > 0: assert len(data.get("expectedFiles")[0].keys()) == 1, ( "attaching multiple AOVs or renderable cameras to " From 59cea8c7d070bfe1b757d5f12be96c8f4d1e9a47 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 2 Mar 2023 12:15:37 +0100 Subject: [PATCH 718/912] Catch for each instance whether the render succeeded or not --- .../fusion/plugins/publish/render_local.py | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index c22074d6c6..27bd312048 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -59,24 +59,27 @@ class Fusionlocal(pyblish.api.InstancePlugin): # to speed up the rendering. The check below makes sure that we only # execute the rendering once and not for each instance. key = f"__hasRun{self.__class__.__name__}" - if context.data.get(key, False): - return - context.data[key] = True + if key not in context.data: + # We initialize as false to indicate it wasn't successful yet + # so we can keep track of whether Fusion succeeded + context.data[key] = False - current_comp = context.data["currentComp"] - frame_start = context.data["frameStartHandle"] - frame_end = context.data["frameEndHandle"] + current_comp = context.data["currentComp"] + frame_start = context.data["frameStartHandle"] + frame_end = context.data["frameEndHandle"] + + self.log.info("Starting Fusion render") + self.log.info(f"Start frame: {frame_start}") + self.log.info(f"End frame: {frame_end}") + + with comp_lock_and_undo_chunk(current_comp): + result = current_comp.Render({ + "Start": frame_start, + "End": frame_end, + "Wait": True + }) + + context.data[key] = bool(result) - self.log.info("Starting render") - self.log.info(f"Start frame: {frame_start}") - self.log.info(f"End frame: {frame_end}") - - with comp_lock_and_undo_chunk(current_comp): - result = current_comp.Render({ - "Start": frame_start, - "End": frame_end, - "Wait": True - }) - - if not result: + if context.data[key] is False: raise RuntimeError("Comp render failed") From 185623ff702a3ddc58038a4368e69e5b3ce4cc94 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Fri, 24 Feb 2023 16:21:00 +0000 Subject: [PATCH 719/912] Set frame range with handles on review instance. --- openpype/hosts/maya/api/lib.py | 32 +++++++++++++------ .../maya/plugins/create/create_review.py | 6 ++-- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index 4324d321dc..0d9733fcf7 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -4,7 +4,6 @@ import os import sys import platform import uuid -import math import re import json @@ -2064,13 +2063,8 @@ def set_scene_resolution(width, height, pixelAspect): cmds.setAttr("%s.pixelAspect" % control_node, pixelAspect) -def reset_frame_range(): - """Set frame range to current asset""" - - fps = convert_to_maya_fps( - float(legacy_io.Session.get("AVALON_FPS", 25)) - ) - set_scene_fps(fps) +def get_frame_range(): + """Get the current assets frame range and handles.""" # Set frame start/end project_name = legacy_io.active_project() @@ -2097,8 +2091,26 @@ def reset_frame_range(): if handle_end is None: handle_end = handles - frame_start -= int(handle_start) - frame_end += int(handle_end) + return { + "frameStart": frame_start, + "frameEnd": frame_end, + "handleStart": handle_start, + "handleEnd": handle_end + } + + +def reset_frame_range(): + """Set frame range to current asset""" + + fps = convert_to_maya_fps( + float(legacy_io.Session.get("AVALON_FPS", 25)) + ) + set_scene_fps(fps) + + frame_range = get_frame_range() + + frame_start = frame_range["frameStart"] - int(frame_range["handleStart"]) + frame_end = frame_range["frameEnd"] + int(frame_range["handleEnd"]) cmds.playbackOptions(minTime=frame_start) cmds.playbackOptions(maxTime=frame_end) diff --git a/openpype/hosts/maya/plugins/create/create_review.py b/openpype/hosts/maya/plugins/create/create_review.py index ba51ffa009..6e0bd2e4c3 100644 --- a/openpype/hosts/maya/plugins/create/create_review.py +++ b/openpype/hosts/maya/plugins/create/create_review.py @@ -28,13 +28,13 @@ class CreateReview(plugin.Creator): def __init__(self, *args, **kwargs): super(CreateReview, self).__init__(*args, **kwargs) + data = OrderedDict(**self.data) # get basic animation data : start / end / handles / steps - data = OrderedDict(**self.data) - animation_data = lib.collect_animation_data(fps=True) - for key, value in animation_data.items(): + for key, value in lib.get_frame_range().items(): data[key] = value + data["fps"] = lib.collect_animation_data(fps=True)["fps"] data["review_width"] = self.Width data["review_height"] = self.Height data["isolate"] = self.isolate From db0a3554b62afcfc03a8a33563e20a9a935bef22 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Fri, 24 Feb 2023 16:42:01 +0000 Subject: [PATCH 720/912] Validate frame range on instance to asset. - frame start - frame end - handle start - handle end --- .../plugins/publish/validate_frame_range.py | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/validate_frame_range.py b/openpype/hosts/maya/plugins/publish/validate_frame_range.py index d86925184e..dbf856a30a 100644 --- a/openpype/hosts/maya/plugins/publish/validate_frame_range.py +++ b/openpype/hosts/maya/plugins/publish/validate_frame_range.py @@ -57,6 +57,10 @@ class ValidateFrameRange(pyblish.api.InstancePlugin): inst_start = int(instance.data.get("frameStartHandle")) inst_end = int(instance.data.get("frameEndHandle")) + inst_frame_start = int(instance.data.get("frameStart")) + inst_frame_end = int(instance.data.get("frameEnd")) + inst_handle_start = int(instance.data.get("handleStart")) + inst_handle_end = int(instance.data.get("handleEnd")) # basic sanity checks assert frame_start_handle <= frame_end_handle, ( @@ -69,7 +73,7 @@ class ValidateFrameRange(pyblish.api.InstancePlugin): if [ef for ef in self.exclude_families if instance.data["family"] in ef]: return - if(inst_start != frame_start_handle): + if (inst_start != frame_start_handle): errors.append("Instance start frame [ {} ] doesn't " "match the one set on instance [ {} ]: " "{}/{}/{}/{} (handle/start/end/handle)".format( @@ -78,7 +82,7 @@ class ValidateFrameRange(pyblish.api.InstancePlugin): handle_start, frame_start, frame_end, handle_end )) - if(inst_end != frame_end_handle): + if (inst_end != frame_end_handle): errors.append("Instance end frame [ {} ] doesn't " "match the one set on instance [ {} ]: " "{}/{}/{}/{} (handle/start/end/handle)".format( @@ -87,6 +91,19 @@ class ValidateFrameRange(pyblish.api.InstancePlugin): handle_start, frame_start, frame_end, handle_end )) + checks = { + "frame start": (frame_start, inst_frame_start), + "frame end": (frame_end, inst_frame_end), + "handle start": (handle_start, inst_handle_start), + "handle end": (handle_end, inst_handle_end) + } + for label, values in checks.items(): + if values[0] != values[1]: + errors.append( + "{} on instance ({}) does not match with the asset " + "({}).".format(label.title(), values[1], values[0]) + ) + for e in errors: self.log.error(e) From d33aa1cc7df5eb7ae73320693b3a9b00183b3d70 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 28 Feb 2023 07:26:50 +0000 Subject: [PATCH 721/912] Better error reports. --- openpype/hosts/maya/plugins/publish/validate_frame_range.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/validate_frame_range.py b/openpype/hosts/maya/plugins/publish/validate_frame_range.py index dbf856a30a..59b06874b3 100644 --- a/openpype/hosts/maya/plugins/publish/validate_frame_range.py +++ b/openpype/hosts/maya/plugins/publish/validate_frame_range.py @@ -75,7 +75,7 @@ class ValidateFrameRange(pyblish.api.InstancePlugin): return if (inst_start != frame_start_handle): errors.append("Instance start frame [ {} ] doesn't " - "match the one set on instance [ {} ]: " + "match the one set on asset [ {} ]: " "{}/{}/{}/{} (handle/start/end/handle)".format( inst_start, frame_start_handle, @@ -84,7 +84,7 @@ class ValidateFrameRange(pyblish.api.InstancePlugin): if (inst_end != frame_end_handle): errors.append("Instance end frame [ {} ] doesn't " - "match the one set on instance [ {} ]: " + "match the one set on asset [ {} ]: " "{}/{}/{}/{} (handle/start/end/handle)".format( inst_end, frame_end_handle, From 7bbf5608711c865f3f50c82f1fbd34ddc679982a Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 28 Feb 2023 07:42:58 +0000 Subject: [PATCH 722/912] Backwards compatibility --- .../maya/plugins/create/create_review.py | 8 +++-- .../defaults/project_settings/maya.json | 13 +++++---- .../schemas/schema_maya_create.json | 29 ++++++++++++++++--- 3 files changed, 38 insertions(+), 12 deletions(-) diff --git a/openpype/hosts/maya/plugins/create/create_review.py b/openpype/hosts/maya/plugins/create/create_review.py index 6e0bd2e4c3..f1b626c06b 100644 --- a/openpype/hosts/maya/plugins/create/create_review.py +++ b/openpype/hosts/maya/plugins/create/create_review.py @@ -25,13 +25,17 @@ class CreateReview(plugin.Creator): "depth peeling", "alpha cut" ] + useMayaTimeline = True def __init__(self, *args, **kwargs): super(CreateReview, self).__init__(*args, **kwargs) data = OrderedDict(**self.data) - # get basic animation data : start / end / handles / steps - for key, value in lib.get_frame_range().items(): + # Option for using Maya or asset frame range in settings. + frame_range = lib.get_frame_range() + if self.useMayaTimeline: + frame_range = lib.collect_animation_data(fps=True) + for key, value in frame_range.items(): data[key] = value data["fps"] = lib.collect_animation_data(fps=True)["fps"] diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index 90334a6644..dca0b95293 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -179,6 +179,13 @@ "Main" ] }, + "CreateReview": { + "enabled": true, + "defaults": [ + "Main" + ], + "useMayaTimeline": true + }, "CreateAss": { "enabled": true, "defaults": [ @@ -255,12 +262,6 @@ "Main" ] }, - "CreateReview": { - "enabled": true, - "defaults": [ - "Main" - ] - }, "CreateRig": { "enabled": true, "defaults": [ diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json index 49503cce83..1598f90643 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json @@ -240,6 +240,31 @@ } ] }, + { + "type": "dict", + "collapsible": true, + "key": "CreateReview", + "label": "Create Review", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "list", + "key": "defaults", + "label": "Default Subsets", + "object_type": "text" + }, + { + "type": "boolean", + "key": "useMayaTimeline", + "label": "Use Maya Timeline for Frame Range." + } + ] + }, { "type": "dict", "collapsible": true, @@ -398,10 +423,6 @@ "key": "CreateRenderSetup", "label": "Create Render Setup" }, - { - "key": "CreateReview", - "label": "Create Review" - }, { "key": "CreateRig", "label": "Create Rig" From db98f65b43517c1930ab3be11f56f0fa672e5c8d Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 23 Feb 2023 16:23:21 +0000 Subject: [PATCH 723/912] Fix publish pool and secondary. --- .../modules/deadline/plugins/publish/submit_publish_job.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index 31df4746ba..53c09ad22f 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -284,6 +284,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): args.append("--automatic-tests") # Generate the payload for Deadline submission + secondary_pool = ( + self.deadline_pool_secondary or instance.data.get("secondaryPool") + ) payload = { "JobInfo": { "Plugin": self.deadline_plugin, @@ -297,8 +300,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): "Priority": priority, "Group": self.deadline_group, - "Pool": instance.data.get("primaryPool"), - "SecondaryPool": instance.data.get("secondaryPool"), + "Pool": self.deadline_pool or instance.data.get("primaryPool"), + "SecondaryPool": secondary_pool, # ensure the outputdirectory with correct slashes "OutputDirectory0": output_dir.replace("\\", "/") }, From d827ffa8fbabd6fb02dc03e123e22d69c5b87c24 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 23 Feb 2023 16:23:38 +0000 Subject: [PATCH 724/912] Use publish pool for tile jobs. --- .../deadline/plugins/publish/submit_maya_deadline.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py index 22b5c02296..15025e47f2 100644 --- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py @@ -419,8 +419,13 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline): assembly_job_info.Name += " - Tile Assembly Job" assembly_job_info.Frames = 1 assembly_job_info.MachineLimit = 1 - assembly_job_info.Priority = instance.data.get("tile_priority", - self.tile_priority) + assembly_job_info.Priority = instance.data.get( + "tile_priority", self.tile_priority + ) + + pool = instance.context.data["project_settings"]["deadline"] + pool = pool["publish"]["ProcessSubmittedJobOnFarm"]["deadline_pool"] + assembly_job_info.Pool = pool or instance.data.get("primaryPool", "") assembly_plugin_info = { "CleanupTiles": 1, From 9117a0d6329c5cf47aee68bf4fd2e57dac5fff6a Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 23 Feb 2023 16:39:10 +0000 Subject: [PATCH 725/912] Documentation --- website/docs/module_deadline.md | 34 +++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/website/docs/module_deadline.md b/website/docs/module_deadline.md index c96da91909..c4b179b98d 100644 --- a/website/docs/module_deadline.md +++ b/website/docs/module_deadline.md @@ -28,16 +28,16 @@ For [AWS Thinkbox Deadline](https://www.awsthinkbox.com/deadline) support you ne OpenPype integration for Deadline consists of two parts: - The `OpenPype` Deadline Plug-in -- A `GlobalJobPreLoad` Deadline Script (this gets triggered for each deadline job) +- A `GlobalJobPreLoad` Deadline Script (this gets triggered for each deadline job) The `GlobalJobPreLoad` handles populating render and publish jobs with proper environment variables using settings from the `OpenPype` Deadline Plug-in. -The `OpenPype` Deadline Plug-in must be configured to point to a valid OpenPype executable location. The executable need to be installed to +The `OpenPype` Deadline Plug-in must be configured to point to a valid OpenPype executable location. The executable need to be installed to destinations accessible by DL process. Check permissions (must be executable and accessible by Deadline process) - Enable `Tools > Super User Mode` in Deadline Monitor -- Go to `Tools > Configure Plugins...`, find `OpenPype` in the list on the left side, find location of OpenPype +- Go to `Tools > Configure Plugins...`, find `OpenPype` in the list on the left side, find location of OpenPype executable. It is recommended to use the `openpype_console` executable as it provides a bit more logging. - In case of multi OS farms, provide multiple locations, each Deadline Worker goes through the list and tries to find the first accessible @@ -45,12 +45,22 @@ executable. It is recommended to use the `openpype_console` executable as it pro ![Configure plugin](assets/deadline_configure_plugin.png) +### Pools + +The main pools can be configured at `project_settings/deadline/publish/CollectDeadlinePools/primary_pool`, which is applied to the rendering jobs. + +The dependent publishing job's pool uses `project_settings/deadline/publish/ProcessSubmittedJobOnFarm/deadline_pool`. If nothing is specified the pool will fallback to the main pool above. + +:::note maya tile rendering +The logic for publishing job pool assignment applies to tiling jobs. +::: + ## Troubleshooting #### Publishing jobs fail directly in DCCs - Double check that all previously described steps were finished -- Check that `deadlinewebservice` is running on DL server +- Check that `deadlinewebservice` is running on DL server - Check that user's machine has access to deadline server on configured port #### Jobs are failing on DL side @@ -61,40 +71,40 @@ Each publishing from OpenPype consists of 2 jobs, first one is rendering, second - Jobs are failing with `OpenPype executable was not found` error - Check if OpenPype is installed on the Worker handling this job and ensure `OpenPype` Deadline Plug-in is properly [configured](#configuration) + Check if OpenPype is installed on the Worker handling this job and ensure `OpenPype` Deadline Plug-in is properly [configured](#configuration) - Publishing job is failing with `ffmpeg not installed` error - + OpenPype executable has to have access to `ffmpeg` executable, check OpenPype `Setting > General` ![FFmpeg setting](assets/ffmpeg_path.png) - Both jobs finished successfully, but there is no review on Ftrack - Make sure that you correctly set published family to be send to Ftrack. + Make sure that you correctly set published family to be send to Ftrack. ![Ftrack Family](assets/ftrack/ftrack-collect-main.png) Example: I want send to Ftrack review of rendered images from Harmony : - `Host names`: "harmony" - - `Families`: "render" + - `Families`: "render" - `Add Ftrack Family` to "Enabled" - + Make sure that you actually configured to create review for published subset in `project_settings/ftrack/publish/CollectFtrackFamily` ![Ftrack Family](assets/deadline_review.png) - Example: I want to create review for all reviewable subsets in Harmony : + Example: I want to create review for all reviewable subsets in Harmony : - Add "harmony" as a new key an ".*" as a value. - Rendering jobs are stuck in 'Queued' state or failing Make sure that your Deadline is not limiting specific jobs to be run only on specific machines. (Eg. only some machines have installed particular application.) - + Check `project_settings/deadline` - + ![Deadline group](assets/deadline_group.png) Example: I have separated machines with "Harmony" installed into "harmony" group on Deadline. I want rendering jobs published from Harmony to run only on those machines. From 6f5ba9ce2a98aed1777df57731ae02409cc474a2 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Thu, 23 Feb 2023 16:42:02 +0000 Subject: [PATCH 726/912] Docs --- website/docs/module_deadline.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/module_deadline.md b/website/docs/module_deadline.md index c4b179b98d..ab1016788d 100644 --- a/website/docs/module_deadline.md +++ b/website/docs/module_deadline.md @@ -49,7 +49,7 @@ executable. It is recommended to use the `openpype_console` executable as it pro The main pools can be configured at `project_settings/deadline/publish/CollectDeadlinePools/primary_pool`, which is applied to the rendering jobs. -The dependent publishing job's pool uses `project_settings/deadline/publish/ProcessSubmittedJobOnFarm/deadline_pool`. If nothing is specified the pool will fallback to the main pool above. +The dependent publishing job's pool uses `project_settings/deadline/publish/ProcessSubmittedJobOnFarm/deadline_pool`. If nothing is specified the pool will fallback to the primary pool above. :::note maya tile rendering The logic for publishing job pool assignment applies to tiling jobs. From b61f1ed1df5a5a6dcab162ffe320a4093b5efd12 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 28 Feb 2023 08:17:29 +0000 Subject: [PATCH 727/912] Validate against zero polygon mesh. --- .../plugins/publish/validate_mesh_empty.py | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 openpype/hosts/maya/plugins/publish/validate_mesh_empty.py diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_empty.py b/openpype/hosts/maya/plugins/publish/validate_mesh_empty.py new file mode 100644 index 0000000000..848d66c4ae --- /dev/null +++ b/openpype/hosts/maya/plugins/publish/validate_mesh_empty.py @@ -0,0 +1,54 @@ +from maya import cmds + +import pyblish.api +import openpype.hosts.maya.api.action +from openpype.pipeline.publish import ( + RepairAction, + ValidateMeshOrder +) + + +class ValidateMeshEmpty(pyblish.api.InstancePlugin): + """Validate meshes have some vertices. + + Its possible to have meshes without any vertices. To replicate + this issue, delete all faces/polygons then all edges. + """ + + order = ValidateMeshOrder + hosts = ["maya"] + families = ["model"] + label = "Mesh Empty" + actions = [ + openpype.hosts.maya.api.action.SelectInvalidAction, RepairAction + ] + + @classmethod + def repair(cls, instance): + invalid = cls.get_invalid(instance) + for node in invalid: + cmds.delete(node) + + @classmethod + def get_invalid(cls, instance): + invalid = [] + + meshes = cmds.ls(instance, type="mesh", long=True) + for mesh in meshes: + num_vertices = cmds.polyEvaluate(mesh, vertex=True) + + if num_vertices == 0: + cls.log.warning( + "\"{}\" does not have any vertices.".format(mesh) + ) + invalid.append(mesh) + + return invalid + + def process(self, instance): + + invalid = self.get_invalid(instance) + if invalid: + raise RuntimeError( + "Meshes found in instance without any vertices: %s" % invalid + ) From 206bf55a4909e603e845d0ca5b3fc46896f1ca90 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 28 Feb 2023 08:18:16 +0000 Subject: [PATCH 728/912] Refactor `len_flattened` --- openpype/hosts/maya/api/lib.py | 31 +++++++++++++++++ .../plugins/publish/validate_mesh_has_uv.py | 32 +---------------- .../validate_mesh_vertices_have_edges.py | 34 +------------------ 3 files changed, 33 insertions(+), 64 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index 0d9733fcf7..954576f02e 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -3574,3 +3574,34 @@ def get_color_management_output_transform(): if preferences["output_transform_enabled"]: colorspace = preferences["output_transform"] return colorspace + + +def len_flattened(components): + """Return the length of the list as if it was flattened. + + Maya will return consecutive components as a single entry + when requesting with `maya.cmds.ls` without the `flatten` + flag. Though enabling `flatten` on a large list (e.g. millions) + will result in a slow result. This command will return the amount + of entries in a non-flattened list by parsing the result with + regex. + + Args: + components (list): The non-flattened components. + + Returns: + int: The amount of entries. + + """ + assert isinstance(components, (list, tuple)) + n = 0 + + pattern = re.compile(r"\[(\d+):(\d+)\]") + for c in components: + match = pattern.search(c) + if match: + start, end = match.groups() + n += int(end) - int(start) + 1 + else: + n += 1 + return n diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_has_uv.py b/openpype/hosts/maya/plugins/publish/validate_mesh_has_uv.py index 0eece1014e..1775bd84c6 100644 --- a/openpype/hosts/maya/plugins/publish/validate_mesh_has_uv.py +++ b/openpype/hosts/maya/plugins/publish/validate_mesh_has_uv.py @@ -1,39 +1,9 @@ -import re - from maya import cmds import pyblish.api import openpype.hosts.maya.api.action from openpype.pipeline.publish import ValidateMeshOrder - - -def len_flattened(components): - """Return the length of the list as if it was flattened. - - Maya will return consecutive components as a single entry - when requesting with `maya.cmds.ls` without the `flatten` - flag. Though enabling `flatten` on a large list (e.g. millions) - will result in a slow result. This command will return the amount - of entries in a non-flattened list by parsing the result with - regex. - - Args: - components (list): The non-flattened components. - - Returns: - int: The amount of entries. - - """ - assert isinstance(components, (list, tuple)) - n = 0 - for c in components: - match = re.search("\[([0-9]+):([0-9]+)\]", c) - if match: - start, end = match.groups() - n += int(end) - int(start) + 1 - else: - n += 1 - return n +from openpype.hosts.maya.api.lib import len_flattened class ValidateMeshHasUVs(pyblish.api.InstancePlugin): diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py b/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py index 9ac7735501..51e1ddfc7f 100644 --- a/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py +++ b/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py @@ -1,5 +1,3 @@ -import re - from maya import cmds import pyblish.api @@ -8,37 +6,7 @@ from openpype.pipeline.publish import ( RepairAction, ValidateMeshOrder, ) - - -def len_flattened(components): - """Return the length of the list as if it was flattened. - - Maya will return consecutive components as a single entry - when requesting with `maya.cmds.ls` without the `flatten` - flag. Though enabling `flatten` on a large list (e.g. millions) - will result in a slow result. This command will return the amount - of entries in a non-flattened list by parsing the result with - regex. - - Args: - components (list): The non-flattened components. - - Returns: - int: The amount of entries. - - """ - assert isinstance(components, (list, tuple)) - n = 0 - - pattern = re.compile(r"\[(\d+):(\d+)\]") - for c in components: - match = pattern.search(c) - if match: - start, end = match.groups() - n += int(end) - int(start) + 1 - else: - n += 1 - return n +from openpype.hosts.maya.api.lib import len_flattened class ValidateMeshVerticesHaveEdges(pyblish.api.InstancePlugin): From 63177ca7e935cd87e716229831eaf1f456825e66 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 28 Feb 2023 08:18:50 +0000 Subject: [PATCH 729/912] Only mesh empty validator should fail. --- .../plugins/publish/validate_mesh_has_uv.py | 9 +++++++++ .../publish/validate_mesh_non_zero_edge.py | 20 +++++++++++++++++-- .../validate_mesh_vertices_have_edges.py | 7 +++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_has_uv.py b/openpype/hosts/maya/plugins/publish/validate_mesh_has_uv.py index 1775bd84c6..b7836b3e92 100644 --- a/openpype/hosts/maya/plugins/publish/validate_mesh_has_uv.py +++ b/openpype/hosts/maya/plugins/publish/validate_mesh_has_uv.py @@ -27,6 +27,15 @@ class ValidateMeshHasUVs(pyblish.api.InstancePlugin): invalid = [] for node in cmds.ls(instance, type='mesh'): + num_vertices = cmds.polyEvaluate(node, vertex=True) + + if num_vertices == 0: + cls.log.warning( + "Skipping \"{}\", cause it does not have any " + "vertices.".format(node) + ) + continue + uv = cmds.polyEvaluate(node, uv=True) if uv == 0: diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py b/openpype/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py index 78e844d201..b49ba85648 100644 --- a/openpype/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py +++ b/openpype/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py @@ -28,7 +28,10 @@ class ValidateMeshNonZeroEdgeLength(pyblish.api.InstancePlugin): @classmethod def get_invalid(cls, instance): """Return the invalid edges. - Also see: http://help.autodesk.com/view/MAYAUL/2015/ENU/?guid=Mesh__Cleanup + + Also see: + + http://help.autodesk.com/view/MAYAUL/2015/ENU/?guid=Mesh__Cleanup """ @@ -36,8 +39,21 @@ class ValidateMeshNonZeroEdgeLength(pyblish.api.InstancePlugin): if not meshes: return list() + valid_meshes = [] + for mesh in meshes: + num_vertices = cmds.polyEvaluate(mesh, vertex=True) + + if num_vertices == 0: + cls.log.warning( + "Skipping \"{}\", cause it does not have any " + "vertices.".format(mesh) + ) + continue + + valid_meshes.append(mesh) + # Get all edges - edges = ['{0}.e[*]'.format(node) for node in meshes] + edges = ['{0}.e[*]'.format(node) for node in valid_meshes] # Filter by constraint on edge length invalid = lib.polyConstraint(edges, diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py b/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py index 51e1ddfc7f..d885158004 100644 --- a/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py +++ b/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py @@ -55,6 +55,13 @@ class ValidateMeshVerticesHaveEdges(pyblish.api.InstancePlugin): for mesh in meshes: num_vertices = cmds.polyEvaluate(mesh, vertex=True) + if num_vertices == 0: + cls.log.warning( + "Skipping \"{}\", cause it does not have any " + "vertices.".format(mesh) + ) + continue + # Vertices from all edges edges = "%s.e[*]" % mesh vertices = cmds.polyListComponentConversion(edges, toVertex=True) From 04c40b6c727fa7320360eb97dfddf5bf065095f0 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 2 Mar 2023 19:10:18 +0300 Subject: [PATCH 730/912] check if local profile folder exists, cleanup a bit --- .../hosts/fusion/hooks/pre_fusion_setup.py | 52 ++++++++++--------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index f7b5e684cb..19d59d3806 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -17,26 +17,26 @@ class FusionPrelaunch(PreLaunchHook): as set in openpype/hosts/fusion/deploy/fusion_shared.prefs to enable the OpenPype menu and force Python 3 over Python 2. - PROFILE_NUMBER is used because from the Fusion v16 the profile folder + VERSION variable is used because from the Fusion v16 the profile folder is project-specific, but then it was abandoned by devs, - and despite it is already Fusion version 18, still FUSION16_PROFILE_DIR is used. - The variable is added in case the version number will be updated or deleted - so we could easily change the version or disable it. + and despite it is already Fusion version 18, still FUSION16_PROFILE_DIR + is used. The variable is added in case the version number will be + updated or deleted so we could easily change the version or disable it. """ app_groups = ["fusion"] - PROFILE_NUMBER = 16 + VERSION = 16 def get_fusion_profile_name(self) -> str: """usually set to 'Default', unless FUSION16_PROFILE is set""" - return os.getenv(f"FUSION{self.PROFILE_NUMBER}_PROFILE", "Default") + return os.getenv(f"FUSION{self.VERSION}_PROFILE", "Default") def get_profile_source(self) -> Path: """Get the Fusion preferences (profile) location. Check Per-User_Preferences_and_Paths on VFXpedia for reference. """ fusion_profile = self.get_fusion_profile_name() - fusion_var_prefs_dir = os.getenv(f"FUSION{self.PROFILE_NUMBER}_PROFILE_DIR") + fusion_var_prefs_dir = os.getenv(f"FUSION{self.VERSION}_PROFILE_DIR") # if FUSION16_PROFILE_DIR variable exists if fusion_var_prefs_dir and Path(fusion_var_prefs_dir).is_dir(): @@ -46,7 +46,7 @@ class FusionPrelaunch(PreLaunchHook): ) return fusion_prefs_dir # otherwise get the profile folder from default location - fusion_prefs_dir = f"Blackmagic Design/Fusion/Profiles/{fusion_profile}" + fusion_prefs_dir = f"Blackmagic Design/Fusion/Profiles/{fusion_profile}" #noqa if platform.system() == "Windows": prefs_source = Path(os.getenv("AppData"), fusion_prefs_dir) elif platform.system() == "Darwin": @@ -59,7 +59,7 @@ class FusionPrelaunch(PreLaunchHook): return prefs_source def get_copy_fusion_prefs_settings(self): - """Get copy prefserences options from the global application settings""" + """Get copy preferences options from the global application settings""" copy_fusion_settings = self.data["project_settings"]["fusion"].get( "copy_fusion_settings", {} ) @@ -75,9 +75,9 @@ class FusionPrelaunch(PreLaunchHook): def copy_existing_prefs( self, copy_from: Path, copy_to: Path, force_sync: bool ) -> None: - """On the first Fusion launch copy the contents of Fusion profile directory - to the working predefined location. If the Openpype profile folder exists, - skip copying, unless re-sync is checked. + """On the first Fusion launch copy the contents of Fusion profile + directory to the working predefined location. If the Openpype profile + folder exists, skip copying, unless re-sync is checked. If the prefs were not copied on the first launch, clean Fusion profile will be created in fusion_profile_dir. """ @@ -89,13 +89,17 @@ class FusionPrelaunch(PreLaunchHook): self.log.info(f"Starting copying Fusion preferences") self.log.info(f"force_sync option is set to {force_sync}") dest_folder = copy_to / self.get_fusion_profile_name() - dest_folder.mkdir(exist_ok=True, parents=True) + try: + dest_folder.mkdir(exist_ok=True, parents=True) + except Exception: + self.log.warn(f"Could not create folder at {dest_folder}") + return if not copy_from.exists(): - self.log.warning(f"Fusion preferences file not found in {copy_from}") + self.log.warning(f"Fusion preferences not found in {copy_from}") return for file in copy_from.iterdir(): - if file.suffix in (".prefs", ".def", ".blocklist", "fu"): - # convert Path to str to be compatible with Python 3.6 and above + if file.suffix in (".prefs", ".def", ".blocklist", ".fu"): + # convert Path to str to be compatible with Python 3.6+ shutil.copy(str(file), str(dest_folder)) self.log.info( f"successfully copied preferences:\n {copy_from} to {dest_folder}" @@ -134,26 +138,26 @@ class FusionPrelaunch(PreLaunchHook): # Fusion 16 and 17 use FUSION16_PYTHON36_HOME instead of # FUSION_PYTHON3_HOME and will only work with a Python 3.6 version # TODO: Detect Fusion version to only set for specific Fusion build - self.launch_context.env[f"FUSION{self.PROFILE_NUMBER}_PYTHON36_HOME"] = py3_dir + self.launch_context.env[f"FUSION{self.VERSION}_PYTHON36_HOME"] = py3_dir #noqa # Add custom Fusion Master Prefs and the temporary # profile directory variables to customize Fusion # to define where it can read custom scripts and tools from self.log.info(f"Setting OPENPYPE_FUSION: {FUSION_HOST_DIR}") self.launch_context.env["OPENPYPE_FUSION"] = FUSION_HOST_DIR - ( copy_status, fusion_profile_dir, force_sync, ) = self.get_copy_fusion_prefs_settings() - if copy_status: + if copy_status and fusion_profile_dir is not None: prefs_source = self.get_profile_source() - self.copy_existing_prefs(prefs_source, fusion_profile_dir, force_sync) - fusion_profile_dir_variable = f"FUSION{self.PROFILE_NUMBER}_PROFILE_DIR" - master_prefs_variable = f"FUSION{self.PROFILE_NUMBER}_MasterPrefs" + self.copy_existing_prefs(prefs_source, fusion_profile_dir, force_sync) #noqa + else: + fusion_profile_dir_variable = f"FUSION{self.VERSION}_PROFILE_DIR" + self.log.info(f"Setting {fusion_profile_dir_variable}: {fusion_profile_dir}") #noqa + self.launch_context.env[fusion_profile_dir_variable] = str(fusion_profile_dir) #noqa + master_prefs_variable = f"FUSION{self.VERSION}_MasterPrefs" master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") - self.log.info(f"Setting {fusion_profile_dir_variable}: {fusion_profile_dir}") - self.launch_context.env[fusion_profile_dir_variable] = str(fusion_profile_dir) self.log.info(f"Setting {master_prefs_variable}: {master_prefs}") self.launch_context.env[master_prefs_variable] = str(master_prefs) From 997351bfe2ded1e44d76f5d7bf6fecf5771c7105 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 2 Mar 2023 19:16:44 +0300 Subject: [PATCH 731/912] tame the hound --- openpype/hosts/fusion/hooks/pre_fusion_setup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index 19d59d3806..129aadf1a5 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -46,7 +46,7 @@ class FusionPrelaunch(PreLaunchHook): ) return fusion_prefs_dir # otherwise get the profile folder from default location - fusion_prefs_dir = f"Blackmagic Design/Fusion/Profiles/{fusion_profile}" #noqa + fusion_prefs_dir = f"Blackmagic Design/Fusion/Profiles/{fusion_profile}" # noqa if platform.system() == "Windows": prefs_source = Path(os.getenv("AppData"), fusion_prefs_dir) elif platform.system() == "Darwin": @@ -138,7 +138,7 @@ class FusionPrelaunch(PreLaunchHook): # Fusion 16 and 17 use FUSION16_PYTHON36_HOME instead of # FUSION_PYTHON3_HOME and will only work with a Python 3.6 version # TODO: Detect Fusion version to only set for specific Fusion build - self.launch_context.env[f"FUSION{self.VERSION}_PYTHON36_HOME"] = py3_dir #noqa + self.launch_context.env[f"FUSION{self.VERSION}_PYTHON36_HOME"] = py3_dir # noqa # Add custom Fusion Master Prefs and the temporary # profile directory variables to customize Fusion @@ -152,11 +152,11 @@ class FusionPrelaunch(PreLaunchHook): ) = self.get_copy_fusion_prefs_settings() if copy_status and fusion_profile_dir is not None: prefs_source = self.get_profile_source() - self.copy_existing_prefs(prefs_source, fusion_profile_dir, force_sync) #noqa + self.copy_existing_prefs(prefs_source, fusion_profile_dir, force_sync) # noqa else: fusion_profile_dir_variable = f"FUSION{self.VERSION}_PROFILE_DIR" - self.log.info(f"Setting {fusion_profile_dir_variable}: {fusion_profile_dir}") #noqa - self.launch_context.env[fusion_profile_dir_variable] = str(fusion_profile_dir) #noqa + self.log.info(f"Setting {fusion_profile_dir_variable}: {fusion_profile_dir}") # noqa + self.launch_context.env[fusion_profile_dir_variable] = str(fusion_profile_dir) # noqa master_prefs_variable = f"FUSION{self.VERSION}_MasterPrefs" master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") self.log.info(f"Setting {master_prefs_variable}: {master_prefs}") From ec7392433cc0386feaccca6c0c3adea47281f67c Mon Sep 17 00:00:00 2001 From: Toke Jepsen Date: Thu, 2 Mar 2023 17:24:41 +0000 Subject: [PATCH 732/912] Maya: Validate missing instance attributes (#4559) * Validate missing instance attributes. * Plugins docs. --- .../maya/plugins/publish/collect_instances.py | 1 + .../publish/validate_instance_attributes.py | 60 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 openpype/hosts/maya/plugins/publish/validate_instance_attributes.py diff --git a/openpype/hosts/maya/plugins/publish/collect_instances.py b/openpype/hosts/maya/plugins/publish/collect_instances.py index 6c6819f0a2..c594626569 100644 --- a/openpype/hosts/maya/plugins/publish/collect_instances.py +++ b/openpype/hosts/maya/plugins/publish/collect_instances.py @@ -137,6 +137,7 @@ class CollectInstances(pyblish.api.ContextPlugin): # Create the instance instance = context.create_instance(objset) instance[:] = members_hierarchy + instance.data["objset"] = objset # Store the exact members of the object set instance.data["setMembers"] = members diff --git a/openpype/hosts/maya/plugins/publish/validate_instance_attributes.py b/openpype/hosts/maya/plugins/publish/validate_instance_attributes.py new file mode 100644 index 0000000000..f870c9f8c4 --- /dev/null +++ b/openpype/hosts/maya/plugins/publish/validate_instance_attributes.py @@ -0,0 +1,60 @@ +from maya import cmds + +import pyblish.api +from openpype.pipeline.publish import ( + ValidateContentsOrder, PublishValidationError, RepairAction +) +from openpype.pipeline import discover_legacy_creator_plugins +from openpype.hosts.maya.api.lib import imprint + + +class ValidateInstanceAttributes(pyblish.api.InstancePlugin): + """Validate Instance Attributes. + + New attributes can be introduced as new features come in. Old instances + will need to be updated with these attributes for the documentation to make + sense, and users do not have to recreate the instances. + """ + + order = ValidateContentsOrder + hosts = ["maya"] + families = ["*"] + label = "Instance Attributes" + plugins_by_family = { + p.family: p for p in discover_legacy_creator_plugins() + } + actions = [RepairAction] + + @classmethod + def get_missing_attributes(self, instance): + plugin = self.plugins_by_family[instance.data["family"]] + subset = instance.data["subset"] + asset = instance.data["asset"] + objset = instance.data["objset"] + + missing_attributes = {} + for key, value in plugin(subset, asset).data.items(): + if not cmds.objExists("{}.{}".format(objset, key)): + missing_attributes[key] = value + + return missing_attributes + + def process(self, instance): + objset = instance.data.get("objset") + if objset is None: + self.log.debug( + "Skipping {} because no objectset found.".format(instance) + ) + return + + missing_attributes = self.get_missing_attributes(instance) + if missing_attributes: + raise PublishValidationError( + "Missing attributes on {}:\n{}".format( + objset, missing_attributes + ) + ) + + @classmethod + def repair(cls, instance): + imprint(instance.data["objset"], cls.get_missing_attributes(instance)) From 173ec225eba1262de024e30917673d4650feb1ee Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 3 Mar 2023 10:32:05 +0100 Subject: [PATCH 733/912] Set image format --- openpype/hosts/maya/api/lib_rendersettings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/maya/api/lib_rendersettings.py b/openpype/hosts/maya/api/lib_rendersettings.py index f19deb0351..7d44d4eaa6 100644 --- a/openpype/hosts/maya/api/lib_rendersettings.py +++ b/openpype/hosts/maya/api/lib_rendersettings.py @@ -336,7 +336,8 @@ class RenderSettings(object): ) # Set render file format to exr - cmds.setAttr("{}.imageFormatStr".format(node), "exr", type="string") + ext = vray_render_presets["image_format"] + cmds.setAttr("{}.imageFormatStr".format(node), ext, type="string") # animType cmds.setAttr("{}.animType".format(node), 1) From 8fcf6de8c802d78effd5e5e696aa36707f84b473 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 3 Mar 2023 12:58:00 +0100 Subject: [PATCH 734/912] Fixed hound's comments --- .../fusion/plugins/publish/render_local.py | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index 27bd312048..3eb4cbd868 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -17,7 +17,6 @@ class Fusionlocal(pyblish.api.InstancePlugin): families = ["render.local"] def process(self, instance): - context = instance.context # Start render @@ -35,10 +34,10 @@ class Fusionlocal(pyblish.api.InstancePlugin): for frame in range(frame_start, frame_end + 1) ] repre = { - 'name': ext[1:], - 'ext': ext[1:], - 'frameStart': f"%0{len(str(frame_end))}d" % frame_start, - 'files': files, + "name": ext[1:], + "ext": ext[1:], + "frameStart": f"%0{len(str(frame_end))}d" % frame_start, + "files": files, "stagingDir": output_dir, } @@ -67,18 +66,20 @@ class Fusionlocal(pyblish.api.InstancePlugin): current_comp = context.data["currentComp"] frame_start = context.data["frameStartHandle"] frame_end = context.data["frameEndHandle"] - + self.log.info("Starting Fusion render") self.log.info(f"Start frame: {frame_start}") self.log.info(f"End frame: {frame_end}") - + with comp_lock_and_undo_chunk(current_comp): - result = current_comp.Render({ - "Start": frame_start, - "End": frame_end, - "Wait": True - }) - + result = current_comp.Render( + { + "Start": frame_start, + "End": frame_end, + "Wait": True, + } + ) + context.data[key] = bool(result) if context.data[key] is False: From f3baace6682bebfbbbae273b54c4aaf38477f4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Je=C5=BEek?= Date: Fri, 3 Mar 2023 13:17:46 +0100 Subject: [PATCH 735/912] Update openpype/pipeline/publish/publish_plugins.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Fabià Serra Arrizabalaga --- openpype/pipeline/publish/publish_plugins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/pipeline/publish/publish_plugins.py b/openpype/pipeline/publish/publish_plugins.py index 0142919e76..7da61fec5e 100644 --- a/openpype/pipeline/publish/publish_plugins.py +++ b/openpype/pipeline/publish/publish_plugins.py @@ -298,7 +298,7 @@ class ColormanagedPyblishPluginMixin(object): It also contains a method, set_representation_colorspace, which sets colorspace data to the representation. The allowed file extensions are listed in the allowed_ext variable. - he method first checks if the file extension is in + The method first checks if the file extension is in the list of allowed extensions. If it is, it then gets the colorspace settings from the host context and gets a matching colorspace from rules. Finally, it infuses this From 0c517a12a618076fdd3fc043fb1ce80d7e1f3327 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 3 Mar 2023 14:07:20 +0100 Subject: [PATCH 736/912] Nuke: fix the order of plugin to be after anatomy data collector also convert anatomy data with deepcopy --- openpype/hosts/nuke/plugins/publish/collect_writes.py | 2 +- openpype/pipeline/publish/publish_plugins.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py index 858fa79a4b..304b3d8f32 100644 --- a/openpype/hosts/nuke/plugins/publish/collect_writes.py +++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py @@ -10,7 +10,7 @@ class CollectNukeWrites(pyblish.api.InstancePlugin, publish.ColormanagedPyblishPluginMixin): """Collect all write nodes.""" - order = pyblish.api.CollectorOrder - 0.48 + order = pyblish.api.CollectorOrder + 0.0021 label = "Collect Writes" hosts = ["nuke", "nukeassist"] families = ["render", "prerender", "image"] diff --git a/openpype/pipeline/publish/publish_plugins.py b/openpype/pipeline/publish/publish_plugins.py index 7da61fec5e..2df98221ba 100644 --- a/openpype/pipeline/publish/publish_plugins.py +++ b/openpype/pipeline/publish/publish_plugins.py @@ -1,3 +1,4 @@ +from copy import deepcopy import inspect from abc import ABCMeta from pprint import pformat @@ -323,7 +324,7 @@ class ColormanagedPyblishPluginMixin(object): project_name = context.data["projectName"] host_name = context.data["hostName"] - anatomy_data = context.data["anatomyData"] + anatomy_data = deepcopy(context.data["anatomyData"]) project_settings_ = context.data["project_settings"] config_data = get_imageio_config( From efac55ba8961d75e3fa1fb9d2f2860790f1e58e8 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 3 Mar 2023 14:08:00 +0100 Subject: [PATCH 737/912] Added render log per instance --- openpype/hosts/fusion/plugins/publish/render_local.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index 3eb4cbd868..86c283952c 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -22,6 +22,15 @@ class Fusionlocal(pyblish.api.InstancePlugin): # Start render self.render_once(context) + # Log render status + self.log.info( + "Rendered '{nm}' for asset '{ast}' under the task '{tsk}'".format( + nm=instance.data.name, + ast=instance.data.asset, + tsk=instance.data.task, + ) + ) + frame_start = context.data["frameStartHandle"] frame_end = context.data["frameEndHandle"] path = instance.data["path"] From a63872b54b4e4aaf42e4875a2b437642b345eb27 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 3 Mar 2023 16:07:29 +0100 Subject: [PATCH 738/912] Fixed dict data access --- openpype/hosts/fusion/plugins/publish/render_local.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index 86c283952c..0eca7f6cdd 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -25,9 +25,9 @@ class Fusionlocal(pyblish.api.InstancePlugin): # Log render status self.log.info( "Rendered '{nm}' for asset '{ast}' under the task '{tsk}'".format( - nm=instance.data.name, - ast=instance.data.asset, - tsk=instance.data.task, + nm=instance.data["name"], + ast=instance.data["asset"], + tsk=instance.data["task"], ) ) From f2311c686638dd1e9d646333b5dd482129024869 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 28 Feb 2023 09:12:51 +0000 Subject: [PATCH 739/912] Fixes - missing platform extraction from settings - map function should be list comprehension - code cosmetics --- .../maya/plugins/publish/validate_model_name.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/validate_model_name.py b/openpype/hosts/maya/plugins/publish/validate_model_name.py index 2dec9ba267..0e7adc640f 100644 --- a/openpype/hosts/maya/plugins/publish/validate_model_name.py +++ b/openpype/hosts/maya/plugins/publish/validate_model_name.py @@ -2,9 +2,11 @@ """Validate model nodes names.""" import os import re -from maya import cmds -import pyblish.api +import platform +from maya import cmds + +import pyblish.api from openpype.pipeline import legacy_io from openpype.pipeline.publish import ValidateContentsOrder import openpype.hosts.maya.api.action @@ -44,7 +46,7 @@ class ValidateModelName(pyblish.api.InstancePlugin): if not cmds.ls(child, transforms=True): return False return True - except: + except Exception: return False invalid = [] @@ -94,9 +96,10 @@ class ValidateModelName(pyblish.api.InstancePlugin): # load shader list file as utf-8 shaders = [] if not use_db: - if cls.material_file: - if os.path.isfile(cls.material_file): - shader_file = open(cls.material_file, "r") + material_file = cls.material_file[platform.system().lower()] + if material_file: + if os.path.isfile(material_file): + shader_file = open(material_file, "r") shaders = shader_file.readlines() shader_file.close() else: @@ -113,7 +116,7 @@ class ValidateModelName(pyblish.api.InstancePlugin): shader_file.close() # strip line endings from list - shaders = map(lambda s: s.rstrip(), shaders) + shaders = [s.rstrip() for s in shaders if s.rstrip()] # compile regex for testing names regex = cls.regex From 6f0cd7fc2f04f8ff13e7a756f932ab7068c29629 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Tue, 31 Jan 2023 17:30:27 +0100 Subject: [PATCH 740/912] add visualParent None to Shots and Assets Without this, tray-publisher throws an error and stops working. --- openpype/modules/kitsu/utils/update_op_with_zou.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index 2d14b38bc4..5af3a61e81 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -389,6 +389,7 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict): "data": { "root_of": r, "tasks": {}, + "visualParent": None, }, } for r in ["Assets", "Shots"] From 76273b7376c5b65423beb3a195c4a6376f0453be Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Wed, 1 Feb 2023 13:38:22 +0100 Subject: [PATCH 741/912] lowercase URL path to match in Kitsu Without this fix the menu-dropdown wouldn't show the correct current page in Kitsu --- openpype/modules/kitsu/actions/launcher_show_in_kitsu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py b/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py index c95079e042..4793d60fc3 100644 --- a/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py +++ b/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py @@ -100,7 +100,7 @@ class ShowInKitsu(LauncherAction): kitsu_url = kitsu_url[:-len("/api")] sub_url = f"/productions/{project_id}" - asset_type_url = "Shots" if asset_type in shots_url else "Assets" + asset_type_url = "shots" if asset_type in shots_url else "assets" if task_id: # Go to task page From 9795e7c9105777f0ae0c4d20376d5204b23b1b00 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Wed, 1 Feb 2023 15:52:56 +0100 Subject: [PATCH 742/912] Populate items with correct data from Kitsu or project defaults If data doesn't exist in Kitsu, use Projects default data. --- .../modules/kitsu/utils/update_op_with_zou.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index 5af3a61e81..554d90f7a9 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -69,6 +69,7 @@ def set_op_project(dbcon: AvalonMongoDB, project_id: str): def update_op_assets( dbcon: AvalonMongoDB, + gazu_project: dict, project_doc: dict, entities_list: List[dict], asset_doc_ids: Dict[str, dict], @@ -119,21 +120,20 @@ def update_op_assets( # because of zou's legacy design frames_duration = int(item.get("nb_frames", 0)) except (TypeError, ValueError): - frames_duration = 0 + frames_duration = None # Frame out, fallback on frame_in + duration or project's value or 1001 frame_out = item_data.pop("frame_out", None) if not frame_out: - frame_out = frame_in + frames_duration - try: - frame_out = int(frame_out) - except (TypeError, ValueError): - frame_out = 1001 + if frames_duration: + frame_out = frame_in + frames_duration + else: + frame_out = project_doc["data"].get("frameEnd", 1001) item_data["frameEnd"] = frame_out # Fps, fallback to project's value or default value (25.0) try: - fps = float(item_data.get("fps", project_doc["data"].get("fps"))) + fps = float(item_data.get("fps")) except (TypeError, ValueError): - fps = 25.0 + fps = float(gazu_project.get("fps", project_doc["data"].get("fps", 25))) item_data["fps"] = fps # Tasks @@ -424,7 +424,7 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict): [ UpdateOne({"_id": id}, update) for id, update in update_op_assets( - dbcon, project_doc, all_entities, zou_ids_and_asset_docs + dbcon, project, project_doc, all_entities, zou_ids_and_asset_docs ) ] ) From a005d108292821e9a062da8f3cef32f113ad8eca Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Wed, 1 Feb 2023 16:07:45 +0100 Subject: [PATCH 743/912] Add Resolution and Pixel Aspect to each item Without this info eg. Fusion would throw an error and stop working. --- openpype/modules/kitsu/utils/update_op_with_zou.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index 554d90f7a9..cbf7afb413 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -135,6 +135,17 @@ def update_op_assets( except (TypeError, ValueError): fps = float(gazu_project.get("fps", project_doc["data"].get("fps", 25))) item_data["fps"] = fps + # Resolution, fall back to project default + match_res = re.match(r"(\d+)x(\d+)", item_data.get("resolution", gazu_project.get("resolution"))) + if match_res: + item_data["resolutionWidth"] = int(match_res.group(1)) + item_data["resolutionHeight"] = int(match_res.group(2)) + else: + item_data["resolutionWidth"] = project_doc["data"].get("resolutionWidth") + item_data["resolutionHeight"] = project_doc["data"].get("resolutionHeight") + # Properties that doesn't fully exist in Kitsu. Guessing the property name + # Pixel Aspect Ratio + item_data["pixelAspect"] = item_data.get("pixel_aspect", project_doc["data"].get("pixelAspect")) # Tasks tasks_list = [] From 3b4cdb13db5c3ae89b5c3e3bd6a1b0e73731fe3d Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Wed, 1 Feb 2023 20:13:00 +0100 Subject: [PATCH 744/912] Add parents key to assets and shots Without this you can't open the project in Tray Publisher --- openpype/modules/kitsu/utils/update_op_with_zou.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index cbf7afb413..1b191ccb1e 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -401,6 +401,7 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict): "root_of": r, "tasks": {}, "visualParent": None, + "parents": [], }, } for r in ["Assets", "Shots"] From 5dee2b8ff6b8eedbaaf68af164b316874f413059 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 2 Feb 2023 17:15:55 +0100 Subject: [PATCH 745/912] Add missing attributes to each asset Without them, Tray Publisher errors out. --- openpype/modules/kitsu/utils/update_op_with_zou.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index 1b191ccb1e..d88198eace 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -146,6 +146,14 @@ def update_op_assets( # Properties that doesn't fully exist in Kitsu. Guessing the property name # Pixel Aspect Ratio item_data["pixelAspect"] = item_data.get("pixel_aspect", project_doc["data"].get("pixelAspect")) + # Handle Start + item_data["handleStart"] = item_data.get("handle_start", project_doc["data"].get("handleStart")) + # Handle End + item_data["handleEnd"] = item_data.get("handle_end", project_doc["data"].get("handleEnd")) + # Clip In + item_data["clipIn"] = item_data.get("clip_in", project_doc["data"].get("clipIn")) + # Clip Out + item_data["clipOut"] = item_data.get("clip_out", project_doc["data"].get("clipOut")) # Tasks tasks_list = [] From 785825751a0e5dacdc6e7bf2825e8360456d906c Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 2 Feb 2023 17:18:16 +0100 Subject: [PATCH 746/912] Add render to families to make sure a task exists to process --- openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py | 2 +- .../modules/kitsu/plugins/publish/integrate_kitsu_review.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py index ea98e0b7cc..b801e0e4d4 100644 --- a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py +++ b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py @@ -8,7 +8,7 @@ class IntegrateKitsuNote(pyblish.api.ContextPlugin): order = pyblish.api.IntegratorOrder label = "Kitsu Note and Status" - # families = ["kitsu"] + families = ["render", "kitsu"] set_status_note = False note_status_shortname = "wfa" diff --git a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py index e5e6439439..9e9eaadc27 100644 --- a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py +++ b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py @@ -8,7 +8,7 @@ class IntegrateKitsuReview(pyblish.api.InstancePlugin): order = pyblish.api.IntegratorOrder + 0.01 label = "Kitsu Review" - # families = ["kitsu"] + families = ["render", "kitsu"] optional = True def process(self, instance): From 27c8a1f36099347f777c538d72c67eb5dcb9dc80 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 2 Feb 2023 19:31:06 +0100 Subject: [PATCH 747/912] Fixed so correct review file gets uploaded to Kitsu --- .../modules/kitsu/plugins/publish/integrate_kitsu_review.py | 2 +- .../projects_schema/schemas/schema_representation_tags.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py index 9e9eaadc27..94897b2553 100644 --- a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py +++ b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py @@ -27,7 +27,7 @@ class IntegrateKitsuReview(pyblish.api.InstancePlugin): # Add review representations as preview of comment for representation in instance.data.get("representations", []): # Skip if not tagged as review - if "review" not in representation.get("tags", []): + if "kitsureview" not in representation.get("tags", []): continue review_path = representation.get("published_path") diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_representation_tags.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_representation_tags.json index a4b28f47bc..7046952eef 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_representation_tags.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_representation_tags.json @@ -16,6 +16,9 @@ { "shotgridreview": "Add review to Shotgrid" }, + { + "kitsureview": "Add review to Kitsu" + }, { "delete": "Delete output" }, From 72270005edc887e8e708a8d078f8a3d7ac1ec287 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 2 Feb 2023 23:33:57 +0100 Subject: [PATCH 748/912] Update Kitsu plugin to work without assetEntry --- .../plugins/publish/collect_kitsu_entities.py | 83 +++++++++++-------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py index c9e78b59eb..38c67898ef 100644 --- a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py +++ b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py @@ -4,6 +4,11 @@ import os import gazu import pyblish.api +from openpype.client import ( + get_projects, + get_project, + get_assets, +) class CollectKitsuEntities(pyblish.api.ContextPlugin): """Collect Kitsu entities according to the current context""" @@ -12,20 +17,34 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): label = "Kitsu entities" def process(self, context): + + # Get all needed names + project_name = context.data.get("projectName") + asset_name = context.data.get("asset") + task_name = context.data.get("task") + # If asset and task name doesn't exist in context, look in instance + for instance in context: + if not asset_name: + asset_name = instance.data.get("asset") + if not task_name: + task_name = instance.data.get("task") - asset_data = context.data["assetEntity"]["data"] - zou_asset_data = asset_data.get("zou") + # Get all assets of the local project + asset_docs = { + asset_doc["name"]: asset_doc + for asset_doc in get_assets(project_name) + } + + # Get asset object + asset = asset_docs.get(asset_name) + if not asset: + raise AssertionError("{} not found in DB".format(asset_name)) + + zou_asset_data = asset["data"].get("zou") if not zou_asset_data: raise AssertionError("Zou asset data not found in OpenPype!") self.log.debug("Collected zou asset data: {}".format(zou_asset_data)) - zou_task_data = asset_data["tasks"][os.environ["AVALON_TASK"]].get( - "zou" - ) - if not zou_task_data: - self.log.warning("Zou task data not found in OpenPype!") - self.log.debug("Collected zou task data: {}".format(zou_task_data)) - kitsu_project = gazu.project.get_project(zou_asset_data["project_id"]) if not kitsu_project: raise AssertionError("Project not found in kitsu!") @@ -37,37 +56,33 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): kitsu_entity = gazu.shot.get_shot(zou_asset_data["id"]) else: kitsu_entity = gazu.asset.get_asset(zou_asset_data["id"]) - if not kitsu_entity: raise AssertionError("{} not found in kitsu!".format(entity_type)) - context.data["kitsu_entity"] = kitsu_entity self.log.debug( "Collect kitsu {}: {}".format(entity_type, kitsu_entity) ) - if zou_task_data: - kitsu_task = gazu.task.get_task(zou_task_data["id"]) - if not kitsu_task: - raise AssertionError("Task not found in kitsu!") - context.data["kitsu_task"] = kitsu_task - self.log.debug("Collect kitsu task: {}".format(kitsu_task)) - - else: - kitsu_task_type = gazu.task.get_task_type_by_name( - os.environ["AVALON_TASK"] - ) - if not kitsu_task_type: - raise AssertionError( - "Task type {} not found in Kitsu!".format( - os.environ["AVALON_TASK"] + if task_name: + zou_task_data = asset["data"]["tasks"][task_name].get("zou") + self.log.debug("Collected zou task data: {}".format(zou_task_data)) + if zou_task_data: + kitsu_task = gazu.task.get_task(zou_task_data["id"]) + if not kitsu_task: + raise AssertionError("Task not found in kitsu!") + context.data["kitsu_task"] = kitsu_task + self.log.debug("Collect kitsu task: {}".format(kitsu_task)) + else: + kitsu_task_type = gazu.task.get_task_type_by_name(task_name) + if not kitsu_task_type: + raise AssertionError( + "Task type {} not found in Kitsu!".format(task_name) ) - ) - kitsu_task = gazu.task.get_task_by_name( - kitsu_entity, kitsu_task_type - ) - if not kitsu_task: - raise AssertionError("Task not found in kitsu!") - context.data["kitsu_task"] = kitsu_task - self.log.debug("Collect kitsu task: {}".format(kitsu_task)) + kitsu_task = gazu.task.get_task_by_name( + kitsu_entity, kitsu_task_type + ) + if not kitsu_task: + raise AssertionError("Task not found in kitsu!") + context.data["kitsu_task"] = kitsu_task + self.log.debug("Collect kitsu task: {}".format(kitsu_task)) \ No newline at end of file From 62c111e9486e532255d213d0508f00281f40e86c Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 3 Feb 2023 00:55:01 +0100 Subject: [PATCH 749/912] Add kitsureview to default burnin tags --- openpype/settings/defaults/project_settings/global.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index a5e2d25a88..aad17d54da 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -139,7 +139,8 @@ "ext": "mp4", "tags": [ "burnin", - "ftrackreview" + "ftrackreview", + "kitsureview" ], "burnins": [], "ffmpeg_args": { From dc2b519fd5689389a482c4772289af8ba9154176 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 3 Feb 2023 01:07:48 +0100 Subject: [PATCH 750/912] Fixed hound-bots comments --- .../plugins/publish/collect_kitsu_entities.py | 25 ++++++++--------- .../modules/kitsu/utils/update_op_with_zou.py | 27 ++++++++++++------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py index 38c67898ef..92c8c1823d 100644 --- a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py +++ b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py @@ -5,11 +5,10 @@ import gazu import pyblish.api from openpype.client import ( - get_projects, - get_project, get_assets, ) + class CollectKitsuEntities(pyblish.api.ContextPlugin): """Collect Kitsu entities according to the current context""" @@ -17,7 +16,7 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): label = "Kitsu entities" def process(self, context): - + # Get all needed names project_name = context.data.get("projectName") asset_name = context.data.get("asset") @@ -38,18 +37,18 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): # Get asset object asset = asset_docs.get(asset_name) if not asset: - raise AssertionError("{} not found in DB".format(asset_name)) + raise AssertionError(f"{asset_name} not found in DB") zou_asset_data = asset["data"].get("zou") if not zou_asset_data: raise AssertionError("Zou asset data not found in OpenPype!") - self.log.debug("Collected zou asset data: {}".format(zou_asset_data)) + self.log.debug(f"Collected zou asset data: {zou_asset_data}") kitsu_project = gazu.project.get_project(zou_asset_data["project_id"]) if not kitsu_project: raise AssertionError("Project not found in kitsu!") context.data["kitsu_project"] = kitsu_project - self.log.debug("Collect kitsu project: {}".format(kitsu_project)) + self.log.debug(f"Collect kitsu project: {kitsu_project}") entity_type = zou_asset_data["type"] if entity_type == "Shot": @@ -57,26 +56,24 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): else: kitsu_entity = gazu.asset.get_asset(zou_asset_data["id"]) if not kitsu_entity: - raise AssertionError("{} not found in kitsu!".format(entity_type)) + raise AssertionError(f"{entity_type} not found in kitsu!") context.data["kitsu_entity"] = kitsu_entity - self.log.debug( - "Collect kitsu {}: {}".format(entity_type, kitsu_entity) - ) + self.log.debug(f"Collect kitsu {entity_type}: {kitsu_entity}") if task_name: zou_task_data = asset["data"]["tasks"][task_name].get("zou") - self.log.debug("Collected zou task data: {}".format(zou_task_data)) + self.log.debug(f"Collected zou task data: {zou_task_data}") if zou_task_data: kitsu_task = gazu.task.get_task(zou_task_data["id"]) if not kitsu_task: raise AssertionError("Task not found in kitsu!") context.data["kitsu_task"] = kitsu_task - self.log.debug("Collect kitsu task: {}".format(kitsu_task)) + self.log.debug(f"Collect kitsu task: {kitsu_task}") else: kitsu_task_type = gazu.task.get_task_type_by_name(task_name) if not kitsu_task_type: raise AssertionError( - "Task type {} not found in Kitsu!".format(task_name) + f"Task type {task_name} not found in Kitsu!" ) kitsu_task = gazu.task.get_task_by_name( @@ -85,4 +82,4 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): if not kitsu_task: raise AssertionError("Task not found in kitsu!") context.data["kitsu_task"] = kitsu_task - self.log.debug("Collect kitsu task: {}".format(kitsu_task)) \ No newline at end of file + self.log.debug(f"Collect kitsu task: {kitsu_task}") diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index d88198eace..a079fd5529 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -133,27 +133,36 @@ def update_op_assets( try: fps = float(item_data.get("fps")) except (TypeError, ValueError): - fps = float(gazu_project.get("fps", project_doc["data"].get("fps", 25))) + fps = float(gazu_project.get( + "fps", project_doc["data"].get("fps", 25))) item_data["fps"] = fps # Resolution, fall back to project default - match_res = re.match(r"(\d+)x(\d+)", item_data.get("resolution", gazu_project.get("resolution"))) + match_res = re.match( + r"(\d+)x(\d+)", item_data.get("resolution", gazu_project.get("resolution"))) if match_res: item_data["resolutionWidth"] = int(match_res.group(1)) item_data["resolutionHeight"] = int(match_res.group(2)) else: - item_data["resolutionWidth"] = project_doc["data"].get("resolutionWidth") - item_data["resolutionHeight"] = project_doc["data"].get("resolutionHeight") + item_data["resolutionWidth"] = project_doc["data"].get( + "resolutionWidth") + item_data["resolutionHeight"] = project_doc["data"].get( + "resolutionHeight") # Properties that doesn't fully exist in Kitsu. Guessing the property name # Pixel Aspect Ratio - item_data["pixelAspect"] = item_data.get("pixel_aspect", project_doc["data"].get("pixelAspect")) + item_data["pixelAspect"] = item_data.get( + "pixel_aspect", project_doc["data"].get("pixelAspect")) # Handle Start - item_data["handleStart"] = item_data.get("handle_start", project_doc["data"].get("handleStart")) + item_data["handleStart"] = item_data.get( + "handle_start", project_doc["data"].get("handleStart")) # Handle End - item_data["handleEnd"] = item_data.get("handle_end", project_doc["data"].get("handleEnd")) + item_data["handleEnd"] = item_data.get( + "handle_end", project_doc["data"].get("handleEnd")) # Clip In - item_data["clipIn"] = item_data.get("clip_in", project_doc["data"].get("clipIn")) + item_data["clipIn"] = item_data.get( + "clip_in", project_doc["data"].get("clipIn")) # Clip Out - item_data["clipOut"] = item_data.get("clip_out", project_doc["data"].get("clipOut")) + item_data["clipOut"] = item_data.get( + "clip_out", project_doc["data"].get("clipOut")) # Tasks tasks_list = [] From bb61d43c27286bda8b319d5e49da8166c1472ae8 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 3 Feb 2023 11:52:37 +0100 Subject: [PATCH 751/912] Shortened length of line 141 --- openpype/modules/kitsu/utils/update_op_with_zou.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index a079fd5529..15e88947a1 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -138,7 +138,9 @@ def update_op_assets( item_data["fps"] = fps # Resolution, fall back to project default match_res = re.match( - r"(\d+)x(\d+)", item_data.get("resolution", gazu_project.get("resolution"))) + r"(\d+)x(\d+)", + item_data.get("resolution", gazu_project.get("resolution")) + ) if match_res: item_data["resolutionWidth"] = int(match_res.group(1)) item_data["resolutionHeight"] = int(match_res.group(2)) From 47caa760305dcb46639d94ae7c345d8682e724fc Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 10 Feb 2023 13:32:03 +0100 Subject: [PATCH 752/912] Updated Kitsu Sync module to fully work with all events Manually tried all events, added logging for events and cleaned up the code some. --- openpype/modules/kitsu/utils/sync_service.py | 318 +++++++++++++----- .../modules/kitsu/utils/update_op_with_zou.py | 17 +- 2 files changed, 248 insertions(+), 87 deletions(-) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index 237746bea0..e371c1a9bb 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -1,3 +1,15 @@ +""" +Bugs: + * Error when adding task type to anything that isn't Shot or Assets + * Assets don't get added under an episode if TV show + * Assets added under Main Pack throws error. Can't get the name of Main Pack? + +Features ToDo: + * Select in settings what types you wish to sync + * Print what's updated on entity-update + * Add listener for Edits +""" + import os import threading @@ -5,6 +17,7 @@ import gazu from openpype.client import get_project, get_assets, get_asset_by_name from openpype.pipeline import AvalonMongoDB +from openpype.lib import Logger from .credentials import validate_credentials from .update_op_with_zou import ( create_op_asset, @@ -14,6 +27,8 @@ from .update_op_with_zou import ( update_op_assets, ) +log = Logger.get_logger(__name__) + class Listener: """Host Kitsu listener.""" @@ -33,7 +48,7 @@ class Listener: self.dbcon = AvalonMongoDB() self.dbcon.install() - gazu.client.set_host(os.environ["KITSU_SERVER"]) + gazu.client.set_host(os.environ['KITSU_SERVER']) # Authenticate if not validate_credentials(login, password): @@ -42,7 +57,7 @@ class Listener: ) gazu.set_event_host( - os.environ["KITSU_SERVER"].replace("api", "socket.io") + os.environ['KITSU_SERVER'].replace("api", "socket.io") ) self.event_client = gazu.events.init() @@ -103,6 +118,8 @@ class Listener: ) def start(self): + """Start listening for events.""" + log.info("Listening to Kitsu events...") gazu.events.run_client(self.event_client) # == Project == @@ -112,36 +129,49 @@ class Listener: # Use update process to avoid duplicating code self._update_project(data) + # Print message + ## Happens in write_project_to_op() + def _update_project(self, data): """Update project into OP DB.""" # Get project entity - project = gazu.project.get_project(data["project_id"]) - project_name = project["name"] + project = gazu.project.get_project(data['project_id']) update_project = write_project_to_op(project, self.dbcon) # Write into DB if update_project: - self.dbcon.Session["AVALON_PROJECT"] = project_name + self.dbcon.Session['AVALON_PROJECT'] = get_kitsu_project_name( + data['project_id']) self.dbcon.bulk_write([update_project]) def _delete_project(self, data): """Delete project.""" - project_name = get_kitsu_project_name(data["project_id"]) + collections = self.dbcon.database.list_collection_names() + project_name = None + for collection in collections: + post = self.dbcon.database[collection].find_one( + {"data.zou_id": data['project_id']}) + if post: + project_name = post['name'] + break - # Delete project collection - self.dbcon.database[project_name].drop() + if project_name: + # Delete project collection + self.dbcon.database[project_name].drop() + + # Print message + log.info(f"Project deleted: {project_name}") # == Asset == - def _new_asset(self, data): """Create new asset into OP DB.""" # Get project entity - set_op_project(self.dbcon, data["project_id"]) + set_op_project(self.dbcon, data['project_id']) - # Get gazu entity - asset = gazu.asset.get_asset(data["asset_id"]) + # Get asset entity + asset = gazu.asset.get_asset(data['asset_id']) # Insert doc in DB self.dbcon.insert_one(create_op_asset(asset)) @@ -149,27 +179,43 @@ class Listener: # Update self._update_asset(data) + # Print message + episode = None + ep_id = asset['episode_id'] + if ep_id and ep_id != "": + episode = gazu.asset.get_episode(ep_id) + + msg = "Asset created: " + msg = msg + f"{asset['project_name']} - " + if episode is not None: + msg = msg + f"{episode['name']}_" + msg = msg + f"{asset['asset_type_name']}_" + msg = msg + f"{asset['name']}" + log.info(msg) + def _update_asset(self, data): """Update asset into OP DB.""" - set_op_project(self.dbcon, data["project_id"]) + set_op_project(self.dbcon, data['project_id']) project_name = self.dbcon.active_project() project_doc = get_project(project_name) # Get gazu entity - asset = gazu.asset.get_asset(data["asset_id"]) + asset = gazu.asset.get_asset(data['asset_id']) # Find asset doc # Query all assets of the local project zou_ids_and_asset_docs = { - asset_doc["data"]["zou"]["id"]: asset_doc + asset_doc['data']['zou']['id']: asset_doc for asset_doc in get_assets(project_name) - if asset_doc["data"].get("zou", {}).get("id") + if asset_doc['data'].get("zou", {}).get("id") } - zou_ids_and_asset_docs[asset["project_id"]] = project_doc + zou_ids_and_asset_docs[asset['project_id']] = project_doc + gazu_project = gazu.project.get_project(asset['project_id']) # Update update_op_result = update_op_assets( - self.dbcon, project_doc, [asset], zou_ids_and_asset_docs + self.dbcon, gazu_project, project_doc, + [asset], zou_ids_and_asset_docs ) if update_op_result: asset_doc_id, asset_update = update_op_result[0] @@ -177,21 +223,37 @@ class Listener: def _delete_asset(self, data): """Delete asset of OP DB.""" - set_op_project(self.dbcon, data["project_id"]) + set_op_project(self.dbcon, data['project_id']) - # Delete - self.dbcon.delete_one( - {"type": "asset", "data.zou.id": data["asset_id"]} - ) + asset = self.dbcon.find_one({"data.zou.id": data['asset_id']}) + if asset: + # Delete + self.dbcon.delete_one( + {"type": "asset", "data.zou.id": data['asset_id']} + ) + + # Print message + episode = None + ep_id = asset['data']['zou']['episode_id'] + if ep_id and ep_id != "": + episode = gazu.asset.get_episode(ep_id) + + msg = "Asset deleted: " + msg = msg + f"{asset['data']['zou']['project_name']} - " + if episode is not None: + msg = msg + f"{episode['name']}_" + msg = msg + f"{asset['data']['zou']['asset_type_name']}_" + msg = msg + f"'{asset['name']}" + log.info(msg) # == Episode == def _new_episode(self, data): """Create new episode into OP DB.""" # Get project entity - set_op_project(self.dbcon, data["project_id"]) + set_op_project(self.dbcon, data['project_id']) # Get gazu entity - episode = gazu.shot.get_episode(data["episode_id"]) + episode = gazu.shot.get_episode(data['episode_id']) # Insert doc in DB self.dbcon.insert_one(create_op_asset(episode)) @@ -199,27 +261,34 @@ class Listener: # Update self._update_episode(data) + # Print message + msg = "Episode created: " + msg = msg + f"{episode['project_name']} - " + msg = msg + f"{episode['name']}" + def _update_episode(self, data): """Update episode into OP DB.""" - set_op_project(self.dbcon, data["project_id"]) + set_op_project(self.dbcon, data['project_id']) project_name = self.dbcon.active_project() project_doc = get_project(project_name) # Get gazu entity - episode = gazu.shot.get_episode(data["episode_id"]) + episode = gazu.shot.get_episode(data['episode_id']) # Find asset doc # Query all assets of the local project zou_ids_and_asset_docs = { - asset_doc["data"]["zou"]["id"]: asset_doc + asset_doc['data']['zou']['id']: asset_doc for asset_doc in get_assets(project_name) - if asset_doc["data"].get("zou", {}).get("id") + if asset_doc['data'].get("zou", {}).get("id") } - zou_ids_and_asset_docs[episode["project_id"]] = project_doc + zou_ids_and_asset_docs[episode['project_id']] = project_doc + gazu_project = gazu.project.get_project(episode['project_id']) # Update update_op_result = update_op_assets( - self.dbcon, project_doc, [episode], zou_ids_and_asset_docs + self.dbcon, gazu_project, project_doc, [ + episode], zou_ids_and_asset_docs ) if update_op_result: asset_doc_id, asset_update = update_op_result[0] @@ -227,22 +296,31 @@ class Listener: def _delete_episode(self, data): """Delete shot of OP DB.""" - set_op_project(self.dbcon, data["project_id"]) - print("delete episode") # TODO check bugfix + set_op_project(self.dbcon, data['project_id']) - # Delete - self.dbcon.delete_one( - {"type": "asset", "data.zou.id": data["episode_id"]} - ) + episode = self.dbcon.find_one({"data.zou.id": data['episode_id']}) + if episode: + # Delete + self.dbcon.delete_one( + {"type": "asset", "data.zou.id": data['episode_id']} + ) + + # Print message + project = gazu.project.get_project( + episode['data']['zou']['project_id']) + + msg = "Episode deleted: " + msg = msg + f"{project['name']} - " + msg = msg + f"{episode['name']}" # == Sequence == def _new_sequence(self, data): """Create new sequnce into OP DB.""" # Get project entity - set_op_project(self.dbcon, data["project_id"]) + set_op_project(self.dbcon, data['project_id']) # Get gazu entity - sequence = gazu.shot.get_sequence(data["sequence_id"]) + sequence = gazu.shot.get_sequence(data['sequence_id']) # Insert doc in DB self.dbcon.insert_one(create_op_asset(sequence)) @@ -250,27 +328,43 @@ class Listener: # Update self._update_sequence(data) + # Print message + + episode = None + ep_id = sequence['episode_id'] + if ep_id and ep_id != "": + episode = gazu.asset.get_episode(ep_id) + + msg = "Sequence created: " + msg = msg + f"{sequence['project_name']} - " + if episode is not None: + msg = msg + f"{episode['name']}_" + msg = msg + f"{sequence['name']}" + log.info(msg) + def _update_sequence(self, data): """Update sequence into OP DB.""" - set_op_project(self.dbcon, data["project_id"]) + set_op_project(self.dbcon, data['project_id']) project_name = self.dbcon.active_project() project_doc = get_project(project_name) # Get gazu entity - sequence = gazu.shot.get_sequence(data["sequence_id"]) + sequence = gazu.shot.get_sequence(data['sequence_id']) # Find asset doc # Query all assets of the local project zou_ids_and_asset_docs = { - asset_doc["data"]["zou"]["id"]: asset_doc + asset_doc['data']['zou']['id']: asset_doc for asset_doc in get_assets(project_name) - if asset_doc["data"].get("zou", {}).get("id") + if asset_doc['data'].get("zou", {}).get("id") } - zou_ids_and_asset_docs[sequence["project_id"]] = project_doc + zou_ids_and_asset_docs[sequence['project_id']] = project_doc + gazu_project = gazu.project.get_project(sequence['project_id']) # Update update_op_result = update_op_assets( - self.dbcon, project_doc, [sequence], zou_ids_and_asset_docs + self.dbcon, gazu_project, project_doc, + [sequence], zou_ids_and_asset_docs ) if update_op_result: asset_doc_id, asset_update = update_op_result[0] @@ -278,22 +372,30 @@ class Listener: def _delete_sequence(self, data): """Delete sequence of OP DB.""" - set_op_project(self.dbcon, data["project_id"]) - print("delete sequence") # TODO check bugfix + set_op_project(self.dbcon, data['project_id']) + sequence = self.dbcon.find_one({"data.zou.id": data['sequence_id']}) + if sequence: + # Delete + self.dbcon.delete_one( + {"type": "asset", "data.zou.id": data['sequence_id']} + ) - # Delete - self.dbcon.delete_one( - {"type": "asset", "data.zou.id": data["sequence_id"]} - ) + # Print message + gazu_project = gazu.project.get_project( + sequence['data']['zou']['project_id']) + msg = f"Sequence deleted: " + msg = msg + f"{gazu_project['name']} - " + msg = msg + f"{sequence['name']}" + log.info(msg) # == Shot == def _new_shot(self, data): """Create new shot into OP DB.""" # Get project entity - set_op_project(self.dbcon, data["project_id"]) + set_op_project(self.dbcon, data['project_id']) # Get gazu entity - shot = gazu.shot.get_shot(data["shot_id"]) + shot = gazu.shot.get_shot(data['shot_id']) # Insert doc in DB self.dbcon.insert_one(create_op_asset(shot)) @@ -301,89 +403,151 @@ class Listener: # Update self._update_shot(data) + # Print message + episode = None + if shot['episode_id'] and shot['episode_id'] != "": + episode = gazu.asset.get_episode(shot['episode_id']) + + msg = "Shot created: " + msg = msg + f"{shot['project_name']} - " + if episode is not None: + msg = msg + f"{episode['name']}_" + msg = msg + f"{shot['sequence_name']}_" + msg = msg + f"{shot['name']}" + log.info(msg) + def _update_shot(self, data): """Update shot into OP DB.""" - set_op_project(self.dbcon, data["project_id"]) + set_op_project(self.dbcon, data['project_id']) project_name = self.dbcon.active_project() project_doc = get_project(project_name) # Get gazu entity - shot = gazu.shot.get_shot(data["shot_id"]) + shot = gazu.shot.get_shot(data['shot_id']) # Find asset doc # Query all assets of the local project zou_ids_and_asset_docs = { - asset_doc["data"]["zou"]["id"]: asset_doc + asset_doc['data']['zou']['id']: asset_doc for asset_doc in get_assets(project_name) - if asset_doc["data"].get("zou", {}).get("id") + if asset_doc['data'].get("zou", {}).get("id") } - zou_ids_and_asset_docs[shot["project_id"]] = project_doc + zou_ids_and_asset_docs[shot['project_id']] = project_doc + gazu_project = gazu.project.get_project(shot['project_id']) # Update update_op_result = update_op_assets( - self.dbcon, project_doc, [shot], zou_ids_and_asset_docs + self.dbcon, gazu_project, project_doc, + [shot], zou_ids_and_asset_docs ) + if update_op_result: asset_doc_id, asset_update = update_op_result[0] self.dbcon.update_one({"_id": asset_doc_id}, asset_update) def _delete_shot(self, data): """Delete shot of OP DB.""" - set_op_project(self.dbcon, data["project_id"]) + set_op_project(self.dbcon, data['project_id']) + shot = self.dbcon.find_one({"data.zou.id": data['shot_id']}) - # Delete - self.dbcon.delete_one( - {"type": "asset", "data.zou.id": data["shot_id"]} - ) + if shot: + # Delete + self.dbcon.delete_one( + {"type": "asset", "data.zou.id": data['shot_id']} + ) + + # Print message + gazu_project = gazu.project.get_project( + shot['data']['zou']['project_id']) + + msg = "Shot deleted: " + msg = msg + f"{gazu_project['name']} - " + msg = msg + f"{shot['name']}" + log.info(msg) # == Task == def _new_task(self, data): """Create new task into OP DB.""" # Get project entity - set_op_project(self.dbcon, data["project_id"]) + set_op_project(self.dbcon, data['project_id']) project_name = self.dbcon.active_project() # Get gazu entity - task = gazu.task.get_task(data["task_id"]) + task = gazu.task.get_task(data['task_id']) # Find asset doc - parent_name = task["entity"]["name"] + episode = None + ep_id = task['episode_id'] + if ep_id and ep_id != "": + episode = gazu.asset.get_episode(ep_id) + + parent_name = "" + if episode is not None: + parent_name = episode['name'] + "_" + parent_name = parent_name + \ + task['sequence']['name'] + "_" + task['entity']['name'] asset_doc = get_asset_by_name(project_name, parent_name) # Update asset tasks with new one - asset_tasks = asset_doc["data"].get("tasks") - task_type_name = task["task_type"]["name"] + asset_tasks = asset_doc['data'].get("tasks") + task_type_name = task['task_type']['name'] asset_tasks[task_type_name] = {"type": task_type_name, "zou": task} self.dbcon.update_one( - {"_id": asset_doc["_id"]}, {"$set": {"data.tasks": asset_tasks}} + {"_id": asset_doc['_id']}, {"$set": {"data.tasks": asset_tasks}} ) + # Print message + msg = "Task created: " + msg = msg + f"{task['project']['name']} - " + if episode is not None: + msg = msg + f"{episode['name']}_" + msg = msg + f"{task['sequence']['name']}_" + msg = msg + f"{task['entity']['name']} - " + msg = msg + f"{task['task_type']['name']}" + log.info(msg) + def _update_task(self, data): """Update task into OP DB.""" # TODO is it necessary? - pass def _delete_task(self, data): """Delete task of OP DB.""" - set_op_project(self.dbcon, data["project_id"]) + set_op_project(self.dbcon, data['project_id']) project_name = self.dbcon.active_project() # Find asset doc asset_docs = list(get_assets(project_name)) for doc in asset_docs: # Match task - for name, task in doc["data"]["tasks"].items(): - if task.get("zou") and data["task_id"] == task["zou"]["id"]: + for name, task in doc['data']['tasks'].items(): + if task.get("zou") and data['task_id'] == task['zou']['id']: # Pop task - asset_tasks = doc["data"].get("tasks", {}) + asset_tasks = doc['data'].get("tasks", {}) asset_tasks.pop(name) # Delete task in DB self.dbcon.update_one( - {"_id": doc["_id"]}, + {"_id": doc['_id']}, {"$set": {"data.tasks": asset_tasks}}, ) + + # Print message + shot = gazu.shot.get_shot(task['zou']['entity_id']) + + episode = None + ep_id = shot['episode_id'] + if ep_id and ep_id != "": + episode = gazu.asset.get_episode(ep_id) + + msg = "Task deleted: " + msg = msg + f"{shot['project_name']} - " + if episode is not None: + msg = msg + f"{episode['name']}_" + msg = msg + f"{shot['sequence_name']}_" + msg = msg + f"{shot['name']} - " + msg = msg + f"{task['type']}" + log.info(msg) return @@ -396,7 +560,7 @@ def start_listeners(login: str, password: str): """ # Refresh token every week def refresh_token_every_week(): - print("Refreshing token...") + log.info("Refreshing token...") gazu.refresh_token() threading.Timer(7 * 3600 * 24, refresh_token_every_week).start() diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index 15e88947a1..0a59724393 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -5,10 +5,6 @@ from typing import Dict, List from pymongo import DeleteOne, UpdateOne import gazu -from gazu.task import ( - all_tasks_for_asset, - all_tasks_for_shot, -) from openpype.client import ( get_project, @@ -18,7 +14,6 @@ from openpype.client import ( create_project, ) from openpype.pipeline import AvalonMongoDB -from openpype.settings import get_project_settings from openpype.modules.kitsu.utils.credentials import validate_credentials from openpype.lib import Logger @@ -85,8 +80,10 @@ def update_op_assets( Returns: List[Dict[str, dict]]: List of (doc_id, update_dict) tuples """ + if not project_doc: + return + project_name = project_doc["name"] - project_module_settings = get_project_settings(project_name)["kitsu"] assets_with_update = [] for item in entities_list: @@ -170,9 +167,9 @@ def update_op_assets( tasks_list = [] item_type = item["type"] if item_type == "Asset": - tasks_list = all_tasks_for_asset(item) + tasks_list = gazu.task.all_tasks_for_asset(item) elif item_type == "Shot": - tasks_list = all_tasks_for_shot(item) + tasks_list = gazu.task.all_tasks_for_shot(item) item_data["tasks"] = { t["task_type_name"]: {"type": t["task_type_name"], "zou": t} for t in tasks_list @@ -207,7 +204,7 @@ def update_op_assets( # Root parent folder if exist visual_parent_doc_id = ( - asset_doc_ids[parent_zou_id]["_id"] if parent_zou_id else None + asset_doc_ids[parent_zou_id].get("_id") if parent_zou_id else None ) if visual_parent_doc_id is None: # Find root folder doc ("Assets" or "Shots") @@ -282,7 +279,7 @@ def write_project_to_op(project: dict, dbcon: AvalonMongoDB) -> UpdateOne: project_name = project["name"] project_doc = get_project(project_name) if not project_doc: - log.info(f"Creating project '{project_name}'") + log.info(f"Project created: {project_name}") project_doc = create_project(project_name, project_name) # Project data and tasks From c44c5c9ddbada1264691a32c78cf1765b0b9bce1 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 10 Feb 2023 14:08:33 +0100 Subject: [PATCH 753/912] Get asset and task names from instance only --- .../kitsu/plugins/publish/collect_kitsu_entities.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py index 92c8c1823d..5499b1782a 100644 --- a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py +++ b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py @@ -19,14 +19,12 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): # Get all needed names project_name = context.data.get("projectName") - asset_name = context.data.get("asset") - task_name = context.data.get("task") + asset_name = None + task_name = None # If asset and task name doesn't exist in context, look in instance for instance in context: - if not asset_name: - asset_name = instance.data.get("asset") - if not task_name: - task_name = instance.data.get("task") + asset_name = instance.data.get("asset") + task_name = instance.data.get("task") # Get all assets of the local project asset_docs = { From 4bc67437b61326540a2a62f141af5169296ee051 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 10 Feb 2023 14:36:17 +0100 Subject: [PATCH 754/912] Fixed line too long and too many '#' for comments --- openpype/modules/kitsu/utils/sync_service.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index e371c1a9bb..00c8c4eafa 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -2,7 +2,7 @@ Bugs: * Error when adding task type to anything that isn't Shot or Assets * Assets don't get added under an episode if TV show - * Assets added under Main Pack throws error. Can't get the name of Main Pack? + * Assets added under Main Pack throws error. No Main Pack name in dict Features ToDo: * Select in settings what types you wish to sync @@ -130,7 +130,7 @@ class Listener: self._update_project(data) # Print message - ## Happens in write_project_to_op() + # - Happens in write_project_to_op() def _update_project(self, data): """Update project into OP DB.""" From 8652dab47898e30cbdeb9c3ed9ced2f841c4ec4c Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 16 Feb 2023 13:14:14 +0100 Subject: [PATCH 755/912] Fixed 'instance' code --- .../plugins/publish/collect_kitsu_entities.py | 104 ++++++++---------- .../plugins/publish/integrate_kitsu_note.py | 48 ++++---- .../plugins/publish/integrate_kitsu_review.py | 6 +- 3 files changed, 73 insertions(+), 85 deletions(-) diff --git a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py index 5499b1782a..fe6854218d 100644 --- a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py +++ b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py @@ -1,13 +1,7 @@ # -*- coding: utf-8 -*- -import os - import gazu import pyblish.api -from openpype.client import ( - get_assets, -) - class CollectKitsuEntities(pyblish.api.ContextPlugin): """Collect Kitsu entities according to the current context""" @@ -17,67 +11,61 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): def process(self, context): - # Get all needed names - project_name = context.data.get("projectName") - asset_name = None - task_name = None - # If asset and task name doesn't exist in context, look in instance + kitsu_project = None + + kitsu_entities_by_id = {} for instance in context: - asset_name = instance.data.get("asset") + asset_doc = instance.data.get("assetEntity") task_name = instance.data.get("task") + if not asset_doc: + continue - # Get all assets of the local project - asset_docs = { - asset_doc["name"]: asset_doc - for asset_doc in get_assets(project_name) - } + zou_asset_data = asset_doc["data"].get("zou") + if not zou_asset_data: + raise AssertionError("Zou asset data not found in OpenPype!") - # Get asset object - asset = asset_docs.get(asset_name) - if not asset: - raise AssertionError(f"{asset_name} not found in DB") + if kitsu_project is None: + kitsu_project = gazu.project.get_project( + zou_asset_data["project_id"]) + if not kitsu_project: + raise AssertionError("Project not found in kitsu!") - zou_asset_data = asset["data"].get("zou") - if not zou_asset_data: - raise AssertionError("Zou asset data not found in OpenPype!") - self.log.debug(f"Collected zou asset data: {zou_asset_data}") + entity_type = zou_asset_data["type"] + kitsu_id = zou_asset_data["id"] + kitsu_entity = kitsu_entities_by_id.get(kitsu_id) + if not kitsu_entity: + if entity_type == "Shot": + kitsu_entity = gazu.shot.get_shot(kitsu_id) + else: + kitsu_entity = gazu.asset.get_asset(kitsu_id) + kitsu_entities_by_id[kitsu_id] = kitsu_entity - kitsu_project = gazu.project.get_project(zou_asset_data["project_id"]) - if not kitsu_project: - raise AssertionError("Project not found in kitsu!") - context.data["kitsu_project"] = kitsu_project - self.log.debug(f"Collect kitsu project: {kitsu_project}") + if not kitsu_entity: + raise AssertionError( + "{} not found in kitsu!".format(entity_type)) + instance.data["kitsu_entity"] = kitsu_entity - entity_type = zou_asset_data["type"] - if entity_type == "Shot": - kitsu_entity = gazu.shot.get_shot(zou_asset_data["id"]) - else: - kitsu_entity = gazu.asset.get_asset(zou_asset_data["id"]) - if not kitsu_entity: - raise AssertionError(f"{entity_type} not found in kitsu!") - context.data["kitsu_entity"] = kitsu_entity - self.log.debug(f"Collect kitsu {entity_type}: {kitsu_entity}") - - if task_name: - zou_task_data = asset["data"]["tasks"][task_name].get("zou") - self.log.debug(f"Collected zou task data: {zou_task_data}") - if zou_task_data: - kitsu_task = gazu.task.get_task(zou_task_data["id"]) - if not kitsu_task: - raise AssertionError("Task not found in kitsu!") - context.data["kitsu_task"] = kitsu_task - self.log.debug(f"Collect kitsu task: {kitsu_task}") - else: + if not task_name: + continue + zou_task_data = asset_doc["data"]["tasks"][task_name].get("zou") + self.log.debug( + "Collected zou task data: {}".format(zou_task_data)) + if not zou_task_data: kitsu_task_type = gazu.task.get_task_type_by_name(task_name) if not kitsu_task_type: raise AssertionError( - f"Task type {task_name} not found in Kitsu!" + "Task type {} not found in Kitsu!".format(task_name) ) + continue + kitsu_task_id = zou_task_data["id"] + kitsu_task = kitsu_entities_by_id.get(kitsu_task_id) + if not kitsu_task: + kitsu_task = gazu.task.get_task(zou_task_data["id"]) + kitsu_entities_by_id[kitsu_task_id] = kitsu_task - kitsu_task = gazu.task.get_task_by_name( - kitsu_entity, kitsu_task_type - ) - if not kitsu_task: - raise AssertionError("Task not found in kitsu!") - context.data["kitsu_task"] = kitsu_task - self.log.debug(f"Collect kitsu task: {kitsu_task}") + if not kitsu_task: + raise AssertionError("Task not found in kitsu!") + instance.data["kitsu_task"] = kitsu_task + self.log.debug("Collect kitsu task: {}".format(kitsu_task)) + + context.data["kitsu_project"] = kitsu_project diff --git a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py index b801e0e4d4..aeec2481e0 100644 --- a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py +++ b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py @@ -21,30 +21,32 @@ class IntegrateKitsuNote(pyblish.api.ContextPlugin): self.log.debug("Comment is `{}`".format(publish_comment)) - # Get note status, by default uses the task status for the note - # if it is not specified in the configuration - note_status = context.data["kitsu_task"]["task_status_id"] - if self.set_status_note: - kitsu_status = gazu.task.get_task_status_by_short_name( - self.note_status_shortname - ) - if kitsu_status: - note_status = kitsu_status - self.log.info("Note Kitsu status: {}".format(note_status)) - else: - self.log.info( - "Cannot find {} status. The status will not be " - "changed!".format(self.note_status_shortname) + for instance in context: + + # Get note status, by default uses the task status for the note + # if it is not specified in the configuration + note_status = instance.data["kitsu_task"]["task_status"]["id"] + + if self.set_status_note: + kitsu_status = gazu.task.get_task_status_by_short_name( + self.note_status_shortname ) + if kitsu_status: + note_status = kitsu_status + self.log.info("Note Kitsu status: {}".format(note_status)) + else: + self.log.info( + "Cannot find {} status. The status will not be " + "changed!".format(self.note_status_shortname) + ) - # Add comment to kitsu task - self.log.debug( - "Add new note in taks id {}".format( - context.data["kitsu_task"]["id"] + # Add comment to kitsu task + task = instance.data["kitsu_task"]["id"] + self.log.debug( + "Add new note in taks id {}".format(task) + ) + kitsu_comment = gazu.task.add_comment( + task, note_status, comment=publish_comment ) - ) - kitsu_comment = gazu.task.add_comment( - context.data["kitsu_task"], note_status, comment=publish_comment - ) - context.data["kitsu_comment"] = kitsu_comment + instance.data["kitsu_comment"] = kitsu_comment diff --git a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py index 94897b2553..d8f6cb7ac8 100644 --- a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py +++ b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py @@ -13,9 +13,8 @@ class IntegrateKitsuReview(pyblish.api.InstancePlugin): def process(self, instance): - context = instance.context - task = context.data["kitsu_task"] - comment = context.data.get("kitsu_comment") + task = instance.data["kitsu_task"]["id"] + comment = instance.data["kitsu_comment"]["id"] # Check comment has been created if not comment: @@ -29,7 +28,6 @@ class IntegrateKitsuReview(pyblish.api.InstancePlugin): # Skip if not tagged as review if "kitsureview" not in representation.get("tags", []): continue - review_path = representation.get("published_path") self.log.debug("Found review at: {}".format(review_path)) From 290709705e2811c1a87a5f18b859b5880bd09772 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 16 Feb 2023 15:02:31 +0100 Subject: [PATCH 756/912] Changed logging from f-string to .format() --- .../modules/kitsu/actions/launcher_show_in_kitsu.py | 12 ++++++------ openpype/modules/kitsu/utils/credentials.py | 2 +- openpype/modules/kitsu/utils/sync_service.py | 2 +- openpype/modules/kitsu/utils/update_op_with_zou.py | 4 ++-- openpype/modules/kitsu/utils/update_zou_with_op.py | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py b/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py index 4793d60fc3..e3676afc4c 100644 --- a/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py +++ b/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py @@ -32,12 +32,12 @@ class ShowInKitsu(LauncherAction): project = get_project(project_name=project_name, fields=["data.zou_id"]) if not project: - raise RuntimeError(f"Project {project_name} not found.") + raise RuntimeError("Project {} not found.".format(project_name)) project_zou_id = project["data"].get("zou_id") if not project_zou_id: - raise RuntimeError(f"Project {project_name} has no " - f"connected kitsu id.") + raise RuntimeError( + "Project {} has no connected kitsu id.".format(project_name)) asset_zou_name = None asset_zou_id = None @@ -48,7 +48,7 @@ class ShowInKitsu(LauncherAction): asset_zou_name = asset_name asset_fields = ["data.zou.id", "data.zou.type"] if task_name: - asset_fields.append(f"data.tasks.{task_name}.zou.id") + asset_fields.append("data.tasks.{}.zou.id".format(task_name)) asset = get_asset_by_name(project_name, asset_name=asset_name, @@ -67,7 +67,7 @@ class ShowInKitsu(LauncherAction): task_data = asset["data"]["tasks"][task_name] task_zou_data = task_data.get("zou", {}) if not task_zou_data: - self.log.debug(f"No zou task data for task: {task_name}") + self.log.debug("No zou task data for task: {}".format(task_name)) task_zou_id = task_zou_data["id"] # Define URL @@ -78,7 +78,7 @@ class ShowInKitsu(LauncherAction): task_id=task_zou_id) # Open URL in webbrowser - self.log.info(f"Opening URL: {url}") + self.log.info("Opening URL: {}".format(url)) webbrowser.open(url, # Try in new tab new=2) diff --git a/openpype/modules/kitsu/utils/credentials.py b/openpype/modules/kitsu/utils/credentials.py index adcfb07cd5..1731e1ca4f 100644 --- a/openpype/modules/kitsu/utils/credentials.py +++ b/openpype/modules/kitsu/utils/credentials.py @@ -54,7 +54,7 @@ def validate_host(kitsu_url: str) -> bool: if gazu.client.host_is_valid(): return True else: - raise gazu.exception.HostException(f"Host '{kitsu_url}' is invalid.") + raise gazu.exception.HostException("Host '{}' is invalid.".format(kitsu_url)) def clear_credentials(): diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index 00c8c4eafa..d4ef5ce63a 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -162,7 +162,7 @@ class Listener: self.dbcon.database[project_name].drop() # Print message - log.info(f"Project deleted: {project_name}") + log.info("Project deleted: {}".format(project_name)) # == Asset == def _new_asset(self, data): diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index 0a59724393..15e6dd70d9 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -279,7 +279,7 @@ def write_project_to_op(project: dict, dbcon: AvalonMongoDB) -> UpdateOne: project_name = project["name"] project_doc = get_project(project_name) if not project_doc: - log.info(f"Project created: {project_name}") + log.info("Project created: {}".format(project_name)) project_doc = create_project(project_name, project_name) # Project data and tasks @@ -373,7 +373,7 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict): if not project: project = gazu.project.get_project_by_name(project["name"]) - log.info(f"Synchronizing {project['name']}...") + log.info("Synchronizing {}...".format(project['name'])) # Get all assets from zou all_assets = gazu.asset.all_assets_for_project(project) diff --git a/openpype/modules/kitsu/utils/update_zou_with_op.py b/openpype/modules/kitsu/utils/update_zou_with_op.py index 39baf31b93..b13c2dd4c6 100644 --- a/openpype/modules/kitsu/utils/update_zou_with_op.py +++ b/openpype/modules/kitsu/utils/update_zou_with_op.py @@ -61,7 +61,7 @@ def sync_zou_from_op_project( project_doc = get_project(project_name) # Get all entities from zou - print(f"Synchronizing {project_name}...") + print("Synchronizing {}...".format(project_name)) zou_project = gazu.project.get_project_by_name(project_name) # Create project @@ -258,7 +258,7 @@ def sync_zou_from_op_project( for asset_doc in asset_docs.values() } for entity_id in deleted_entities: - gazu.raw.delete(f"data/entities/{entity_id}") + gazu.raw.delete("data/entities/{}".format(entity_id)) # Write into DB if bulk_writes: From 793af30caae9782ab9cb328f7b546231f0c727df Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 16 Feb 2023 15:02:53 +0100 Subject: [PATCH 757/912] Changed AssertionError to ValueError --- .../kitsu/plugins/publish/collect_kitsu_entities.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py index fe6854218d..dc7048cf2a 100644 --- a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py +++ b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py @@ -22,13 +22,13 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): zou_asset_data = asset_doc["data"].get("zou") if not zou_asset_data: - raise AssertionError("Zou asset data not found in OpenPype!") + raise ValueError("Zou asset data not found in OpenPype!") if kitsu_project is None: kitsu_project = gazu.project.get_project( zou_asset_data["project_id"]) if not kitsu_project: - raise AssertionError("Project not found in kitsu!") + raise ValueError("Project not found in kitsu!") entity_type = zou_asset_data["type"] kitsu_id = zou_asset_data["id"] @@ -41,7 +41,7 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): kitsu_entities_by_id[kitsu_id] = kitsu_entity if not kitsu_entity: - raise AssertionError( + raise ValueError( "{} not found in kitsu!".format(entity_type)) instance.data["kitsu_entity"] = kitsu_entity @@ -53,7 +53,7 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): if not zou_task_data: kitsu_task_type = gazu.task.get_task_type_by_name(task_name) if not kitsu_task_type: - raise AssertionError( + raise ValueError( "Task type {} not found in Kitsu!".format(task_name) ) continue @@ -64,7 +64,7 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): kitsu_entities_by_id[kitsu_task_id] = kitsu_task if not kitsu_task: - raise AssertionError("Task not found in kitsu!") + raise ValueError("Task not found in kitsu!") instance.data["kitsu_task"] = kitsu_task self.log.debug("Collect kitsu task: {}".format(kitsu_task)) From 7e6c47967f42f26fd6d0f56c33a14a0e08e77906 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 16 Feb 2023 15:04:05 +0100 Subject: [PATCH 758/912] Get episode_id using get() as ep_id might not always exist --- openpype/modules/kitsu/utils/sync_service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index d4ef5ce63a..a449bf8c06 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -477,7 +477,7 @@ class Listener: # Find asset doc episode = None - ep_id = task['episode_id'] + ep_id = task.get('episode_id') if ep_id and ep_id != "": episode = gazu.asset.get_episode(ep_id) From 1045ee0c1ed5bb10c3c3d8f4e17f399a5f33c754 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 16 Feb 2023 15:04:55 +0100 Subject: [PATCH 759/912] Check if asset_doc exist before processing it --- openpype/modules/kitsu/utils/sync_service.py | 34 ++++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index a449bf8c06..eed259cda6 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -487,25 +487,25 @@ class Listener: parent_name = parent_name + \ task['sequence']['name'] + "_" + task['entity']['name'] - asset_doc = get_asset_by_name(project_name, parent_name) - # Update asset tasks with new one - asset_tasks = asset_doc['data'].get("tasks") - task_type_name = task['task_type']['name'] - asset_tasks[task_type_name] = {"type": task_type_name, "zou": task} - self.dbcon.update_one( - {"_id": asset_doc['_id']}, {"$set": {"data.tasks": asset_tasks}} - ) + asset_doc = get_asset_by_name(project_name, parent_name) + if asset_doc: + asset_tasks = asset_doc['data'].get("tasks") + task_type_name = task['task_type']['name'] + asset_tasks[task_type_name] = {"type": task_type_name, "zou": task} + self.dbcon.update_one( + {"_id": asset_doc['_id']}, {"$set": {"data.tasks": asset_tasks}} + ) - # Print message - msg = "Task created: " - msg = msg + f"{task['project']['name']} - " - if episode is not None: - msg = msg + f"{episode['name']}_" - msg = msg + f"{task['sequence']['name']}_" - msg = msg + f"{task['entity']['name']} - " - msg = msg + f"{task['task_type']['name']}" - log.info(msg) + # Print message + msg = "Task created: " + msg = msg + f"{task['project']['name']} - " + if episode is not None: + msg = msg + f"{episode['name']}_" + msg = msg + f"{task['sequence']['name']}_" + msg = msg + f"{task['entity']['name']} - " + msg = msg + f"{task['task_type']['name']}" + log.info(msg) def _update_task(self, data): """Update task into OP DB.""" From ef698b4aface5ceff0ba1016a242a318853eaa2a Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 16 Feb 2023 15:11:07 +0100 Subject: [PATCH 760/912] Fixed 1 extra frame at frameEnd Same as #4466 --- openpype/modules/kitsu/utils/update_op_with_zou.py | 6 +++--- openpype/modules/kitsu/utils/update_zou_with_op.py | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index 15e6dd70d9..93d0d5e3fb 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -111,18 +111,18 @@ def update_op_assets( except (TypeError, ValueError): frame_in = 1001 item_data["frameStart"] = frame_in - # Frames duration, fallback on 0 + # Frames duration, fallback on 1 try: # NOTE nb_frames is stored directly in item # because of zou's legacy design - frames_duration = int(item.get("nb_frames", 0)) + frames_duration = int(item.get("nb_frames", 1)) except (TypeError, ValueError): frames_duration = None # Frame out, fallback on frame_in + duration or project's value or 1001 frame_out = item_data.pop("frame_out", None) if not frame_out: if frames_duration: - frame_out = frame_in + frames_duration + frame_out = frame_in + frames_duration - 1 else: frame_out = project_doc["data"].get("frameEnd", 1001) item_data["frameEnd"] = frame_out diff --git a/openpype/modules/kitsu/utils/update_zou_with_op.py b/openpype/modules/kitsu/utils/update_zou_with_op.py index b13c2dd4c6..b1a9b8b82c 100644 --- a/openpype/modules/kitsu/utils/update_zou_with_op.py +++ b/openpype/modules/kitsu/utils/update_zou_with_op.py @@ -174,7 +174,8 @@ def sync_zou_from_op_project( doc["name"], frame_in=doc["data"]["frameStart"], frame_out=doc["data"]["frameEnd"], - nb_frames=doc["data"]["frameEnd"] - doc["data"]["frameStart"], + nb_frames=( + doc["data"]["frameEnd"] - doc["data"]["frameStart"] + 1), ) elif match.group(2): # Sequence @@ -229,7 +230,7 @@ def sync_zou_from_op_project( "frame_in": frame_in, "frame_out": frame_out, }, - "nb_frames": frame_out - frame_in, + "nb_frames": frame_out - frame_in + 1, } ) entity = gazu.raw.update("entities", zou_id, entity_data) From c4f1a1f452d8e0f70d6a629db7925642d3acbc8d Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 16 Feb 2023 15:13:51 +0100 Subject: [PATCH 761/912] Fixed hound's "line too long" comments --- openpype/modules/kitsu/actions/launcher_show_in_kitsu.py | 3 ++- openpype/modules/kitsu/utils/credentials.py | 3 ++- openpype/modules/kitsu/utils/sync_service.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py b/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py index e3676afc4c..11224f6e52 100644 --- a/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py +++ b/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py @@ -67,7 +67,8 @@ class ShowInKitsu(LauncherAction): task_data = asset["data"]["tasks"][task_name] task_zou_data = task_data.get("zou", {}) if not task_zou_data: - self.log.debug("No zou task data for task: {}".format(task_name)) + self.log.debug( + "No zou task data for task: {}".format(task_name)) task_zou_id = task_zou_data["id"] # Define URL diff --git a/openpype/modules/kitsu/utils/credentials.py b/openpype/modules/kitsu/utils/credentials.py index 1731e1ca4f..941343cc8d 100644 --- a/openpype/modules/kitsu/utils/credentials.py +++ b/openpype/modules/kitsu/utils/credentials.py @@ -54,7 +54,8 @@ def validate_host(kitsu_url: str) -> bool: if gazu.client.host_is_valid(): return True else: - raise gazu.exception.HostException("Host '{}' is invalid.".format(kitsu_url)) + raise gazu.exception.HostException( + "Host '{}' is invalid.".format(kitsu_url)) def clear_credentials(): diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index eed259cda6..498c8de71e 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -494,7 +494,8 @@ class Listener: task_type_name = task['task_type']['name'] asset_tasks[task_type_name] = {"type": task_type_name, "zou": task} self.dbcon.update_one( - {"_id": asset_doc['_id']}, {"$set": {"data.tasks": asset_tasks}} + {"_id": asset_doc['_id']}, + {"$set": {"data.tasks": asset_tasks}} ) # Print message From 07ac3d8d4db54b111fd0117bed4a5cbc5c9b19d7 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 16 Feb 2023 15:58:49 +0100 Subject: [PATCH 762/912] If no task in instance, continue fix fore https://github.com/ynput/OpenPype/pull/4425#discussion_r1108582918 --- .../modules/kitsu/plugins/publish/integrate_kitsu_note.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py index aeec2481e0..54fb6a4678 100644 --- a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py +++ b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py @@ -22,10 +22,13 @@ class IntegrateKitsuNote(pyblish.api.ContextPlugin): self.log.debug("Comment is `{}`".format(publish_comment)) for instance in context: + kitsu_task = instance.data.get("kitsu_task") + if kitsu_task is None: + continue # Get note status, by default uses the task status for the note # if it is not specified in the configuration - note_status = instance.data["kitsu_task"]["task_status"]["id"] + note_status = kitsu_task["task_status"]["id"] if self.set_status_note: kitsu_status = gazu.task.get_task_status_by_short_name( @@ -41,7 +44,7 @@ class IntegrateKitsuNote(pyblish.api.ContextPlugin): ) # Add comment to kitsu task - task = instance.data["kitsu_task"]["id"] + task = kitsu_task["id"] self.log.debug( "Add new note in taks id {}".format(task) ) From 915d11040493e1e59d2389e9d5f86f678ef4b9ca Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 16 Feb 2023 16:02:53 +0100 Subject: [PATCH 763/912] Set frame_out to frame_in if no duration exists fix for https://github.com/ynput/OpenPype/pull/4425#discussion_r1108593566 --- openpype/modules/kitsu/utils/update_op_with_zou.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index 93d0d5e3fb..265c3638cd 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -124,7 +124,7 @@ def update_op_assets( if frames_duration: frame_out = frame_in + frames_duration - 1 else: - frame_out = project_doc["data"].get("frameEnd", 1001) + frame_out = project_doc["data"].get("frameEnd", frame_in) item_data["frameEnd"] = frame_out # Fps, fallback to project's value or default value (25.0) try: From 4bcef4406803f0210ed3a741ad99de8aa56c80a7 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Sat, 18 Feb 2023 20:52:20 +0100 Subject: [PATCH 764/912] Fixed hound's max-length note --- openpype/modules/kitsu/utils/update_op_with_zou.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index 265c3638cd..898cf076c8 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -146,7 +146,8 @@ def update_op_assets( "resolutionWidth") item_data["resolutionHeight"] = project_doc["data"].get( "resolutionHeight") - # Properties that doesn't fully exist in Kitsu. Guessing the property name + # Properties that doesn't fully exist in Kitsu. + # Guessing those property names below: # Pixel Aspect Ratio item_data["pixelAspect"] = item_data.get( "pixel_aspect", project_doc["data"].get("pixelAspect")) @@ -452,7 +453,8 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict): [ UpdateOne({"_id": id}, update) for id, update in update_op_assets( - dbcon, project, project_doc, all_entities, zou_ids_and_asset_docs + dbcon, project, project_doc, + all_entities, zou_ids_and_asset_docs ) ] ) From 3fc2180e51357cc74a82a76f2fcd21fa11752ecc Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Tue, 28 Feb 2023 23:06:52 +0100 Subject: [PATCH 765/912] Fixed all quotes types so they now match --- openpype/modules/kitsu/utils/sync_service.py | 133 ++++++++++--------- 1 file changed, 67 insertions(+), 66 deletions(-) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index 498c8de71e..1af0b6edc4 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -48,16 +48,16 @@ class Listener: self.dbcon = AvalonMongoDB() self.dbcon.install() - gazu.client.set_host(os.environ['KITSU_SERVER']) + gazu.client.set_host(os.environ["KITSU_SERVER"]) # Authenticate if not validate_credentials(login, password): raise gazu.exception.AuthFailedException( - f"Kitsu authentication failed for login: '{login}'..." + 'Kitsu authentication failed for login: "{}"...'.format(login) ) gazu.set_event_host( - os.environ['KITSU_SERVER'].replace("api", "socket.io") + os.environ["KITSU_SERVER"].replace("api", "socket.io") ) self.event_client = gazu.events.init() @@ -135,14 +135,14 @@ class Listener: def _update_project(self, data): """Update project into OP DB.""" # Get project entity - project = gazu.project.get_project(data['project_id']) + project = gazu.project.get_project(data["project_id"]) update_project = write_project_to_op(project, self.dbcon) # Write into DB if update_project: - self.dbcon.Session['AVALON_PROJECT'] = get_kitsu_project_name( - data['project_id']) + self.dbcon.Session["AVALON_PROJECT"] = get_kitsu_project_name( + data["project_id"]) self.dbcon.bulk_write([update_project]) def _delete_project(self, data): @@ -168,10 +168,10 @@ class Listener: def _new_asset(self, data): """Create new asset into OP DB.""" # Get project entity - set_op_project(self.dbcon, data['project_id']) + set_op_project(self.dbcon, data["project_id"]) # Get asset entity - asset = gazu.asset.get_asset(data['asset_id']) + asset = gazu.asset.get_asset(data["asset_id"]) # Insert doc in DB self.dbcon.insert_one(create_op_asset(asset)) @@ -181,7 +181,7 @@ class Listener: # Print message episode = None - ep_id = asset['episode_id'] + ep_id = asset.get("episode_id") if ep_id and ep_id != "": episode = gazu.asset.get_episode(ep_id) @@ -195,22 +195,22 @@ class Listener: def _update_asset(self, data): """Update asset into OP DB.""" - set_op_project(self.dbcon, data['project_id']) + set_op_project(self.dbcon, data["project_id"]) project_name = self.dbcon.active_project() project_doc = get_project(project_name) # Get gazu entity - asset = gazu.asset.get_asset(data['asset_id']) + asset = gazu.asset.get_asset(data["asset_id"]) # Find asset doc # Query all assets of the local project zou_ids_and_asset_docs = { - asset_doc['data']['zou']['id']: asset_doc + asset_doc["data"]["zou"]["id"]: asset_doc for asset_doc in get_assets(project_name) - if asset_doc['data'].get("zou", {}).get("id") + if asset_doc["data"].get("zou", {}).get("id") } - zou_ids_and_asset_docs[asset['project_id']] = project_doc - gazu_project = gazu.project.get_project(asset['project_id']) + zou_ids_and_asset_docs[asset["project_id"]] = project_doc + gazu_project = gazu.project.get_project(asset["project_id"]) # Update update_op_result = update_op_assets( @@ -223,18 +223,18 @@ class Listener: def _delete_asset(self, data): """Delete asset of OP DB.""" - set_op_project(self.dbcon, data['project_id']) + set_op_project(self.dbcon, data["project_id"]) - asset = self.dbcon.find_one({"data.zou.id": data['asset_id']}) + asset = self.dbcon.find_one({"data.zou.id": data["asset_id"]}) if asset: # Delete self.dbcon.delete_one( - {"type": "asset", "data.zou.id": data['asset_id']} + {"type": "asset", "data.zou.id": data["asset_id"]} ) # Print message episode = None - ep_id = asset['data']['zou']['episode_id'] + ep_id = asset["data"]["zou"].get("episode_id") if ep_id and ep_id != "": episode = gazu.asset.get_episode(ep_id) @@ -250,10 +250,10 @@ class Listener: def _new_episode(self, data): """Create new episode into OP DB.""" # Get project entity - set_op_project(self.dbcon, data['project_id']) + set_op_project(self.dbcon, data["project_id"]) # Get gazu entity - episode = gazu.shot.get_episode(data['episode_id']) + ep = gazu.shot.get_episode(data["episode_id"]) # Insert doc in DB self.dbcon.insert_one(create_op_asset(episode)) @@ -268,22 +268,22 @@ class Listener: def _update_episode(self, data): """Update episode into OP DB.""" - set_op_project(self.dbcon, data['project_id']) + set_op_project(self.dbcon, data["project_id"]) project_name = self.dbcon.active_project() project_doc = get_project(project_name) # Get gazu entity - episode = gazu.shot.get_episode(data['episode_id']) + ep = gazu.shot.get_episode(data["episode_id"]) # Find asset doc # Query all assets of the local project zou_ids_and_asset_docs = { - asset_doc['data']['zou']['id']: asset_doc + asset_doc["data"]["zou"]["id"]: asset_doc for asset_doc in get_assets(project_name) - if asset_doc['data'].get("zou", {}).get("id") + if asset_doc["data"].get("zou", {}).get("id") } - zou_ids_and_asset_docs[episode['project_id']] = project_doc - gazu_project = gazu.project.get_project(episode['project_id']) + zou_ids_and_asset_docs[ep["project_id"]] = project_doc + gazu_project = gazu.project.get_project(ep["project_id"]) # Update update_op_result = update_op_assets( @@ -296,7 +296,7 @@ class Listener: def _delete_episode(self, data): """Delete shot of OP DB.""" - set_op_project(self.dbcon, data['project_id']) + set_op_project(self.dbcon, data["project_id"]) episode = self.dbcon.find_one({"data.zou.id": data['episode_id']}) if episode: @@ -317,10 +317,10 @@ class Listener: def _new_sequence(self, data): """Create new sequnce into OP DB.""" # Get project entity - set_op_project(self.dbcon, data['project_id']) + set_op_project(self.dbcon, data["project_id"]) # Get gazu entity - sequence = gazu.shot.get_sequence(data['sequence_id']) + sequence = gazu.shot.get_sequence(data["sequence_id"]) # Insert doc in DB self.dbcon.insert_one(create_op_asset(sequence)) @@ -331,7 +331,7 @@ class Listener: # Print message episode = None - ep_id = sequence['episode_id'] + ep_id = sequence.get("episode_id") if ep_id and ep_id != "": episode = gazu.asset.get_episode(ep_id) @@ -344,22 +344,22 @@ class Listener: def _update_sequence(self, data): """Update sequence into OP DB.""" - set_op_project(self.dbcon, data['project_id']) + set_op_project(self.dbcon, data["project_id"]) project_name = self.dbcon.active_project() project_doc = get_project(project_name) # Get gazu entity - sequence = gazu.shot.get_sequence(data['sequence_id']) + sequence = gazu.shot.get_sequence(data["sequence_id"]) # Find asset doc # Query all assets of the local project zou_ids_and_asset_docs = { - asset_doc['data']['zou']['id']: asset_doc + asset_doc["data"]["zou"]["id"]: asset_doc for asset_doc in get_assets(project_name) - if asset_doc['data'].get("zou", {}).get("id") + if asset_doc["data"].get("zou", {}).get("id") } - zou_ids_and_asset_docs[sequence['project_id']] = project_doc - gazu_project = gazu.project.get_project(sequence['project_id']) + zou_ids_and_asset_docs[sequence["project_id"]] = project_doc + gazu_project = gazu.project.get_project(sequence["project_id"]) # Update update_op_result = update_op_assets( @@ -372,15 +372,16 @@ class Listener: def _delete_sequence(self, data): """Delete sequence of OP DB.""" - set_op_project(self.dbcon, data['project_id']) - sequence = self.dbcon.find_one({"data.zou.id": data['sequence_id']}) + set_op_project(self.dbcon, data["project_id"]) + sequence = self.dbcon.find_one({"data.zou.id": data["sequence_id"]}) if sequence: # Delete self.dbcon.delete_one( - {"type": "asset", "data.zou.id": data['sequence_id']} + {"type": "asset", "data.zou.id": data["sequence_id"]} ) # Print message + ep_id = sequence["data"]["zou"].get("episode_id") gazu_project = gazu.project.get_project( sequence['data']['zou']['project_id']) msg = f"Sequence deleted: " @@ -392,10 +393,10 @@ class Listener: def _new_shot(self, data): """Create new shot into OP DB.""" # Get project entity - set_op_project(self.dbcon, data['project_id']) + set_op_project(self.dbcon, data["project_id"]) # Get gazu entity - shot = gazu.shot.get_shot(data['shot_id']) + shot = gazu.shot.get_shot(data["shot_id"]) # Insert doc in DB self.dbcon.insert_one(create_op_asset(shot)) @@ -405,7 +406,7 @@ class Listener: # Print message episode = None - if shot['episode_id'] and shot['episode_id'] != "": + if shot["episode_id"] and shot["episode_id"] != "": episode = gazu.asset.get_episode(shot['episode_id']) msg = "Shot created: " @@ -418,21 +419,21 @@ class Listener: def _update_shot(self, data): """Update shot into OP DB.""" - set_op_project(self.dbcon, data['project_id']) + set_op_project(self.dbcon, data["project_id"]) project_name = self.dbcon.active_project() project_doc = get_project(project_name) # Get gazu entity - shot = gazu.shot.get_shot(data['shot_id']) + shot = gazu.shot.get_shot(data["shot_id"]) # Find asset doc # Query all assets of the local project zou_ids_and_asset_docs = { - asset_doc['data']['zou']['id']: asset_doc + asset_doc["data"]["zou"]["id"]: asset_doc for asset_doc in get_assets(project_name) - if asset_doc['data'].get("zou", {}).get("id") - } - zou_ids_and_asset_docs[shot['project_id']] = project_doc + if asset_doc["data"].get("zou", {}).get("id")} + zou_ids_and_asset_docs[shot["project_id"]] = project_doc + gazu_project = gazu.project.get_project(shot["project_id"]) gazu_project = gazu.project.get_project(shot['project_id']) # Update @@ -447,18 +448,18 @@ class Listener: def _delete_shot(self, data): """Delete shot of OP DB.""" - set_op_project(self.dbcon, data['project_id']) - shot = self.dbcon.find_one({"data.zou.id": data['shot_id']}) + set_op_project(self.dbcon, data["project_id"]) + shot = self.dbcon.find_one({"data.zou.id": data["shot_id"]}) if shot: # Delete self.dbcon.delete_one( - {"type": "asset", "data.zou.id": data['shot_id']} + {"type": "asset", "data.zou.id": data["shot_id"]} ) # Print message gazu_project = gazu.project.get_project( - shot['data']['zou']['project_id']) + ep_id = shot["data"]["zou"].get("episode_id") msg = "Shot deleted: " msg = msg + f"{gazu_project['name']} - " @@ -469,15 +470,15 @@ class Listener: def _new_task(self, data): """Create new task into OP DB.""" # Get project entity - set_op_project(self.dbcon, data['project_id']) + set_op_project(self.dbcon, data["project_id"]) project_name = self.dbcon.active_project() # Get gazu entity - task = gazu.task.get_task(data['task_id']) + task = gazu.task.get_task(data["task_id"]) # Find asset doc episode = None - ep_id = task.get('episode_id') + ep_id = task.get("episode_id") if ep_id and ep_id != "": episode = gazu.asset.get_episode(ep_id) @@ -490,11 +491,11 @@ class Listener: # Update asset tasks with new one asset_doc = get_asset_by_name(project_name, parent_name) if asset_doc: - asset_tasks = asset_doc['data'].get("tasks") - task_type_name = task['task_type']['name'] + asset_tasks = asset_doc["data"].get("tasks") + task_type_name = task["task_type"]["name"] asset_tasks[task_type_name] = {"type": task_type_name, "zou": task} self.dbcon.update_one( - {"_id": asset_doc['_id']}, + {"_id": asset_doc["_id"]}, {"$set": {"data.tasks": asset_tasks}} ) @@ -515,29 +516,29 @@ class Listener: def _delete_task(self, data): """Delete task of OP DB.""" - set_op_project(self.dbcon, data['project_id']) + set_op_project(self.dbcon, data["project_id"]) project_name = self.dbcon.active_project() # Find asset doc asset_docs = list(get_assets(project_name)) for doc in asset_docs: # Match task - for name, task in doc['data']['tasks'].items(): - if task.get("zou") and data['task_id'] == task['zou']['id']: + for name, task in doc["data"]["tasks"].items(): + if task.get("zou") and data["task_id"] == task["zou"]["id"]: # Pop task - asset_tasks = doc['data'].get("tasks", {}) + asset_tasks = doc["data"].get("tasks", {}) asset_tasks.pop(name) # Delete task in DB self.dbcon.update_one( - {"_id": doc['_id']}, + {"_id": doc["_id"]}, {"$set": {"data.tasks": asset_tasks}}, ) # Print message - shot = gazu.shot.get_shot(task['zou']['entity_id']) + entity = gazu.entity.get_entity(task["zou"]["entity_id"]) episode = None - ep_id = shot['episode_id'] + ep_id = entity.get("episode_id") if ep_id and ep_id != "": episode = gazu.asset.get_episode(ep_id) From f9137bdb041690f2ef6cc0a3d26878ee70b321bf Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Tue, 28 Feb 2023 23:08:40 +0100 Subject: [PATCH 766/912] Added docstring and changed `doc` to `dict` in var-names --- .../modules/kitsu/utils/update_op_with_zou.py | 78 +++++++++++-------- 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index 898cf076c8..9368848532 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -65,30 +65,32 @@ def set_op_project(dbcon: AvalonMongoDB, project_id: str): def update_op_assets( dbcon: AvalonMongoDB, gazu_project: dict, - project_doc: dict, + project_dict: dict, entities_list: List[dict], - asset_doc_ids: Dict[str, dict], + asset_dict_ids: Dict[str, dict], ) -> List[Dict[str, dict]]: """Update OpenPype assets. Set 'data' and 'parent' fields. Args: dbcon (AvalonMongoDB): Connection to DB + gazu_project dict): Dict of gazu, + project_dict dict): Dict of project, entities_list (List[dict]): List of zou entities to update - asset_doc_ids (Dict[str, dict]): Dicts of [{zou_id: asset_doc}, ...] + asset_dict_ids (Dict[str, dict]): Dicts of [{zou_id: asset_doc}, ...] Returns: List[Dict[str, dict]]: List of (doc_id, update_dict) tuples """ - if not project_doc: + if not project_dict: return - project_name = project_doc["name"] + project_name = project_dict["name"] assets_with_update = [] for item in entities_list: # Check asset exists - item_doc = asset_doc_ids.get(item["id"]) + item_doc = asset_dict_ids.get(item["id"]) if not item_doc: # Create asset op_asset = create_op_asset(item) insert_result = dbcon.insert_one(op_asset) @@ -105,7 +107,7 @@ def update_op_assets( try: frame_in = int( item_data.pop( - "frame_in", project_doc["data"].get("frameStart") + "frame_in", project_dict["data"].get("frameStart") ) ) except (TypeError, ValueError): @@ -124,14 +126,14 @@ def update_op_assets( if frames_duration: frame_out = frame_in + frames_duration - 1 else: - frame_out = project_doc["data"].get("frameEnd", frame_in) + frame_out = project_dict["data"].get("frameEnd", frame_in) item_data["frameEnd"] = frame_out # Fps, fallback to project's value or default value (25.0) try: fps = float(item_data.get("fps")) except (TypeError, ValueError): fps = float(gazu_project.get( - "fps", project_doc["data"].get("fps", 25))) + "fps", project_dict["data"].get("fps", 25))) item_data["fps"] = fps # Resolution, fall back to project default match_res = re.match( @@ -142,27 +144,27 @@ def update_op_assets( item_data["resolutionWidth"] = int(match_res.group(1)) item_data["resolutionHeight"] = int(match_res.group(2)) else: - item_data["resolutionWidth"] = project_doc["data"].get( + item_data["resolutionWidth"] = project_dict["data"].get( "resolutionWidth") - item_data["resolutionHeight"] = project_doc["data"].get( + item_data["resolutionHeight"] = project_dict["data"].get( "resolutionHeight") # Properties that doesn't fully exist in Kitsu. # Guessing those property names below: # Pixel Aspect Ratio item_data["pixelAspect"] = item_data.get( - "pixel_aspect", project_doc["data"].get("pixelAspect")) + "pixel_aspect", project_dict["data"].get("pixelAspect")) # Handle Start item_data["handleStart"] = item_data.get( - "handle_start", project_doc["data"].get("handleStart")) + "handle_start", project_dict["data"].get("handleStart")) # Handle End item_data["handleEnd"] = item_data.get( - "handle_end", project_doc["data"].get("handleEnd")) + "handle_end", project_dict["data"].get("handleEnd")) # Clip In item_data["clipIn"] = item_data.get( - "clip_in", project_doc["data"].get("clipIn")) + "clip_in", project_dict["data"].get("clipIn")) # Clip Out item_data["clipOut"] = item_data.get( - "clip_out", project_doc["data"].get("clipOut")) + "clip_out", project_dict["data"].get("clipOut")) # Tasks tasks_list = [] @@ -204,9 +206,14 @@ def update_op_assets( entity_root_asset_name = "Shots" # Root parent folder if exist - visual_parent_doc_id = ( - asset_doc_ids[parent_zou_id].get("_id") if parent_zou_id else None - ) + visual_parent_doc_id = None + if parent_zou_id is not None: + parent_zou_id_dict = asset_dict_ids.get(parent_zou_id) + if parent_zou_id_dict is not None: + visual_parent_doc_id = ( + parent_zou_id_dict.get("_id") + if parent_zou_id_dict else None) + if visual_parent_doc_id is None: # Find root folder doc ("Assets" or "Shots") root_folder_doc = get_asset_by_name( @@ -225,12 +232,15 @@ def update_op_assets( item_data["parents"] = [] ancestor_id = parent_zou_id while ancestor_id is not None: - parent_doc = asset_doc_ids[ancestor_id] - item_data["parents"].insert(0, parent_doc["name"]) + parent_doc = asset_dict_ids.get(ancestor_id) + if parent_doc is not None: + item_data["parents"].insert(0, parent_doc["name"]) - # Get parent entity - parent_entity = parent_doc["data"]["zou"] - ancestor_id = parent_entity.get("parent_id") + # Get parent entity + parent_entity = parent_doc["data"]["zou"] + ancestor_id = parent_entity.get("parent_id") + else: + ancestor_id = None # Build OpenPype compatible name if item_type in ["Shot", "Sequence"] and parent_zou_id is not None: @@ -239,7 +249,7 @@ def update_op_assets( item_name = f"{item_data['parents'][-1]}_{item['name']}" # Update doc name - asset_doc_ids[item["id"]]["name"] = item_name + asset_dict_ids[item["id"]]["name"] = item_name else: item_name = item["name"] @@ -258,7 +268,7 @@ def update_op_assets( "$set": { "name": item_name, "data": item_data, - "parent": project_doc["_id"], + "parent": project_dict["_id"], } }, ) @@ -278,13 +288,13 @@ def write_project_to_op(project: dict, dbcon: AvalonMongoDB) -> UpdateOne: UpdateOne: Update instance for the project """ project_name = project["name"] - project_doc = get_project(project_name) - if not project_doc: + project_dict = get_project(project_name) + if not project_dict: log.info("Project created: {}".format(project_name)) - project_doc = create_project(project_name, project_name) + project_dict = create_project(project_name, project_name) # Project data and tasks - project_data = project_doc["data"] or {} + project_data = project_dict["data"] or {} # Build project code and update Kitsu project_code = project.get("code") @@ -315,7 +325,7 @@ def write_project_to_op(project: dict, dbcon: AvalonMongoDB) -> UpdateOne: ) return UpdateOne( - {"_id": project_doc["_id"]}, + {"_id": project_dict["_id"]}, { "$set": { "config.tasks": { @@ -398,7 +408,7 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict): # Try to find project document project_name = project["name"] dbcon.Session["AVALON_PROJECT"] = project_name - project_doc = get_project(project_name) + project_dict = get_project(project_name) # Query all assets of the local project zou_ids_and_asset_docs = { @@ -406,7 +416,7 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict): for asset_doc in get_assets(project_name) if asset_doc["data"].get("zou", {}).get("id") } - zou_ids_and_asset_docs[project["id"]] = project_doc + zou_ids_and_asset_docs[project["id"]] = project_dict # Create entities root folders to_insert = [ @@ -453,7 +463,7 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict): [ UpdateOne({"_id": id}, update) for id, update in update_op_assets( - dbcon, project, project_doc, + dbcon, project, project_dict, all_entities, zou_ids_and_asset_docs ) ] From 0f76d3a44e4974b5c0ec81f166a19289d9cb4fd6 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Tue, 28 Feb 2023 23:13:33 +0100 Subject: [PATCH 767/912] Cleaned up the fetching of the entity_id Also changed the name kitsu_id to entity_id and kitsu_entity to just entity as that's what it is. --- .../plugins/publish/collect_kitsu_entities.py | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py index dc7048cf2a..1531c80e04 100644 --- a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py +++ b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py @@ -16,7 +16,6 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): kitsu_entities_by_id = {} for instance in context: asset_doc = instance.data.get("assetEntity") - task_name = instance.data.get("task") if not asset_doc: continue @@ -24,27 +23,24 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): if not zou_asset_data: raise ValueError("Zou asset data not found in OpenPype!") - if kitsu_project is None: - kitsu_project = gazu.project.get_project( - zou_asset_data["project_id"]) - if not kitsu_project: - raise ValueError("Project not found in kitsu!") + kitsu_project = gazu.project.get_project( + zou_asset_data["project_id"]) + if not kitsu_project: + raise ValueError("Project not found in kitsu!") - entity_type = zou_asset_data["type"] - kitsu_id = zou_asset_data["id"] - kitsu_entity = kitsu_entities_by_id.get(kitsu_id) - if not kitsu_entity: - if entity_type == "Shot": - kitsu_entity = gazu.shot.get_shot(kitsu_id) - else: - kitsu_entity = gazu.asset.get_asset(kitsu_id) - kitsu_entities_by_id[kitsu_id] = kitsu_entity + entity_id = zou_asset_data["id"] + entity = kitsu_entities_by_id.get(entity_id) + if not entity: + entity = gazu.entity.get_entity(entity_id) + if not entity: + raise ValueError( + "{} was not found in kitsu!".format( + zou_asset_data["name"])) - if not kitsu_entity: - raise ValueError( - "{} not found in kitsu!".format(entity_type)) - instance.data["kitsu_entity"] = kitsu_entity + kitsu_entities_by_id[entity_id] = entity + instance.data["entity"] = entity + task_name = instance.data.get("task") if not task_name: continue zou_task_data = asset_doc["data"]["tasks"][task_name].get("zou") From 13a4c7201e5fd410e3546b4cd898ab8f0068b4ab Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Tue, 28 Feb 2023 23:18:43 +0100 Subject: [PATCH 768/912] change task to task_id --- .../modules/kitsu/plugins/publish/integrate_kitsu_note.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py index 54fb6a4678..006f0bc6d0 100644 --- a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py +++ b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py @@ -44,12 +44,12 @@ class IntegrateKitsuNote(pyblish.api.ContextPlugin): ) # Add comment to kitsu task - task = kitsu_task["id"] + task_id = kitsu_task["id"] self.log.debug( - "Add new note in taks id {}".format(task) + "Add new note in taks id {}".format(task_id) ) kitsu_comment = gazu.task.add_comment( - task, note_status, comment=publish_comment + task_id, note_status, comment=publish_comment ) instance.data["kitsu_comment"] = kitsu_comment From bcea2c70a269559a2fa370185393d6c4b675a38b Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Tue, 28 Feb 2023 23:20:32 +0100 Subject: [PATCH 769/912] Cleaned up project deletion code --- openpype/modules/kitsu/utils/sync_service.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index 1af0b6edc4..6155b396aa 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -149,20 +149,16 @@ class Listener: """Delete project.""" collections = self.dbcon.database.list_collection_names() - project_name = None for collection in collections: - post = self.dbcon.database[collection].find_one( - {"data.zou_id": data['project_id']}) - if post: - project_name = post['name'] - break + project = self.dbcon.database[collection].find_one( + {"data.zou_id": data["project_id"]}) + if project: + # Delete project collection + self.dbcon.database[project["name"]].drop() - if project_name: - # Delete project collection - self.dbcon.database[project_name].drop() - - # Print message - log.info("Project deleted: {}".format(project_name)) + # Print message + log.info("Project deleted: {}".format(project["name"])) + return # == Asset == def _new_asset(self, data): From d9ac1ee95255c2d663cffaa00e63ad99a74188af Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Tue, 28 Feb 2023 23:24:55 +0100 Subject: [PATCH 770/912] Cleaned up log.info() message creation --- openpype/modules/kitsu/utils/sync_service.py | 171 +++++++++++-------- 1 file changed, 96 insertions(+), 75 deletions(-) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index 6155b396aa..b389d25c4f 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -176,17 +176,18 @@ class Listener: self._update_asset(data) # Print message - episode = None + ep = None ep_id = asset.get("episode_id") if ep_id and ep_id != "": - episode = gazu.asset.get_episode(ep_id) + ep = gazu.asset.get_episode(ep_id) - msg = "Asset created: " - msg = msg + f"{asset['project_name']} - " - if episode is not None: - msg = msg + f"{episode['name']}_" - msg = msg + f"{asset['asset_type_name']}_" - msg = msg + f"{asset['name']}" + msg = "Asset created: {proj_name} - {ep_name}" \ + "{asset_type_name} - {asset_name}".format( + proj_name=asset["project_name"], + ep_name=ep["name"] + " - " if ep is not None else "", + asset_type_name=asset["asset_type_name"], + asset_name=asset["name"] + ) log.info(msg) def _update_asset(self, data): @@ -229,17 +230,18 @@ class Listener: ) # Print message - episode = None + ep = None ep_id = asset["data"]["zou"].get("episode_id") if ep_id and ep_id != "": - episode = gazu.asset.get_episode(ep_id) + ep = gazu.asset.get_episode(ep_id) - msg = "Asset deleted: " - msg = msg + f"{asset['data']['zou']['project_name']} - " - if episode is not None: - msg = msg + f"{episode['name']}_" - msg = msg + f"{asset['data']['zou']['asset_type_name']}_" - msg = msg + f"'{asset['name']}" + msg = "Asset deleted: {proj_name} - {ep_name}" \ + "{asset_type_name} - {asset_name}".format( + proj_name=asset["data"]["zou"]["project_name"], + ep_name=ep["name"] + " - " if ep is not None else "", + asset_type_name=asset["data"]["zou"]["asset_type_name"], + asset_name=asset["name"] + ) log.info(msg) # == Episode == @@ -252,15 +254,17 @@ class Listener: ep = gazu.shot.get_episode(data["episode_id"]) # Insert doc in DB - self.dbcon.insert_one(create_op_asset(episode)) + self.dbcon.insert_one(create_op_asset(ep)) # Update self._update_episode(data) # Print message - msg = "Episode created: " - msg = msg + f"{episode['project_name']} - " - msg = msg + f"{episode['name']}" + msg = "Episode created: {proj_name} - {ep_name}".format( + proj_name=ep["project_name"], + ep_name=ep["name"] + ) + log.info(msg) def _update_episode(self, data): """Update episode into OP DB.""" @@ -283,8 +287,8 @@ class Listener: # Update update_op_result = update_op_assets( - self.dbcon, gazu_project, project_doc, [ - episode], zou_ids_and_asset_docs + self.dbcon, gazu_project, project_doc, + [ep], zou_ids_and_asset_docs ) if update_op_result: asset_doc_id, asset_update = update_op_result[0] @@ -294,20 +298,22 @@ class Listener: """Delete shot of OP DB.""" set_op_project(self.dbcon, data["project_id"]) - episode = self.dbcon.find_one({"data.zou.id": data['episode_id']}) - if episode: + ep = self.dbcon.find_one({"data.zou.id": data["episode_id"]}) + if ep: # Delete self.dbcon.delete_one( - {"type": "asset", "data.zou.id": data['episode_id']} + {"type": "asset", "data.zou.id": data["episode_id"]} ) # Print message project = gazu.project.get_project( - episode['data']['zou']['project_id']) + ep["data"]["zou"]["project_id"]) - msg = "Episode deleted: " - msg = msg + f"{project['name']} - " - msg = msg + f"{episode['name']}" + msg = "Episode deleted: {proj_name} - {ep_name}".format( + proj_name=project["name"], + ep_name=ep["name"] + ) + log.info(msg) # == Sequence == def _new_sequence(self, data): @@ -325,17 +331,17 @@ class Listener: self._update_sequence(data) # Print message - - episode = None + ep = None ep_id = sequence.get("episode_id") if ep_id and ep_id != "": - episode = gazu.asset.get_episode(ep_id) + ep = gazu.asset.get_episode(ep_id) - msg = "Sequence created: " - msg = msg + f"{sequence['project_name']} - " - if episode is not None: - msg = msg + f"{episode['name']}_" - msg = msg + f"{sequence['name']}" + msg = "Sequence created: {proj_name} - {ep_name}" \ + "{sequence_name}".format( + proj_name=sequence["project_name"], + ep_name=ep["name"] + " - " if ep is not None else "", + sequence_name=sequence["name"] + ) log.info(msg) def _update_sequence(self, data): @@ -377,12 +383,20 @@ class Listener: ) # Print message + ep = None ep_id = sequence["data"]["zou"].get("episode_id") + if ep_id and ep_id != "": + ep = gazu.asset.get_episode(ep_id) + gazu_project = gazu.project.get_project( - sequence['data']['zou']['project_id']) - msg = f"Sequence deleted: " - msg = msg + f"{gazu_project['name']} - " - msg = msg + f"{sequence['name']}" + sequence["data"]["zou"]["project_id"]) + + msg = "Sequence created: {proj_name} - {ep_name}" \ + "{sequence_name}".format( + proj_name=gazu_project["name"], + ep_name=ep["name"] + " - " if ep is not None else "", + sequence_name=sequence["name"] + ) log.info(msg) # == Shot == @@ -401,16 +415,17 @@ class Listener: self._update_shot(data) # Print message - episode = None + ep = None if shot["episode_id"] and shot["episode_id"] != "": - episode = gazu.asset.get_episode(shot['episode_id']) + ep = gazu.asset.get_episode(shot["episode_id"]) - msg = "Shot created: " - msg = msg + f"{shot['project_name']} - " - if episode is not None: - msg = msg + f"{episode['name']}_" - msg = msg + f"{shot['sequence_name']}_" - msg = msg + f"{shot['name']}" + msg = "Shot created: {proj_name} - {ep_name}" \ + "{sequence_name} - {shot_name}".format( + proj_name=shot["project_name"], + ep_name=ep["name"] + " - " if ep is not None else "", + sequence_name=shot["sequence_name"], + shot_name=shot["name"] + ) log.info(msg) def _update_shot(self, data): @@ -430,7 +445,6 @@ class Listener: if asset_doc["data"].get("zou", {}).get("id")} zou_ids_and_asset_docs[shot["project_id"]] = project_doc gazu_project = gazu.project.get_project(shot["project_id"]) - gazu_project = gazu.project.get_project(shot['project_id']) # Update update_op_result = update_op_assets( @@ -454,12 +468,18 @@ class Listener: ) # Print message - gazu_project = gazu.project.get_project( + ep = None ep_id = shot["data"]["zou"].get("episode_id") + if ep_id and ep_id != "": + ep = gazu.asset.get_episode(ep_id) - msg = "Shot deleted: " - msg = msg + f"{gazu_project['name']} - " - msg = msg + f"{shot['name']}" + msg = "Shot deleted: {proj_name} - {ep_name}" \ + "{sequence_name} - {shot_name}".format( + proj_name=shot["data"]["zou"]["project_name"], + ep_name=ep["name"] + " - " if ep is not None else "", + sequence_name=shot["data"]["zou"]["sequence_name"], + shot_name=shot["name"] + ) log.info(msg) # == Task == @@ -472,14 +492,14 @@ class Listener: # Get gazu entity task = gazu.task.get_task(data["task_id"]) - # Find asset doc - episode = None + # Print message + ep = None ep_id = task.get("episode_id") if ep_id and ep_id != "": - episode = gazu.asset.get_episode(ep_id) + ep = gazu.asset.get_episode(ep_id) - parent_name = "" - if episode is not None: + parent_name = None + entity_type = None parent_name = episode['name'] + "_" parent_name = parent_name + \ task['sequence']['name'] + "_" + task['entity']['name'] @@ -496,13 +516,13 @@ class Listener: ) # Print message - msg = "Task created: " - msg = msg + f"{task['project']['name']} - " - if episode is not None: - msg = msg + f"{episode['name']}_" - msg = msg + f"{task['sequence']['name']}_" - msg = msg + f"{task['entity']['name']} - " - msg = msg + f"{task['task_type']['name']}" + msg = "Task created: {proj_name} - {entity_type}{parent_name}" \ + " - {task_name}".format( + proj_name=task["project"]["name"], + entity_type=entity_type + " - " if entity_type is not None else "", + parent_name=parent_name, + task_name=task["task_type"]["name"] + ) log.info(msg) def _update_task(self, data): @@ -533,19 +553,20 @@ class Listener: # Print message entity = gazu.entity.get_entity(task["zou"]["entity_id"]) - episode = None + ep = None ep_id = entity.get("episode_id") if ep_id and ep_id != "": - episode = gazu.asset.get_episode(ep_id) + ep = gazu.asset.get_episode(ep_id) - msg = "Task deleted: " - msg = msg + f"{shot['project_name']} - " - if episode is not None: - msg = msg + f"{episode['name']}_" - msg = msg + f"{shot['sequence_name']}_" - msg = msg + f"{shot['name']} - " - msg = msg + f"{task['type']}" + msg = "Task deleted: {proj_name} - {entity_type}{parent_name}" \ + " - {task_name}".format( + proj_name=task["zou"]["project"]["name"], + entity_type=entity_type + " - " if entity_type is not None else "", + parent_name=parent_name, + task_name=task["type"] + ) log.info(msg) + return From d153e6c224a6d2ea21b11a1c33e88b2c19049123 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Tue, 28 Feb 2023 23:26:10 +0100 Subject: [PATCH 771/912] Split up the difference in name and type Assets/Shots generate Before it was only working for shots. Now it also works for Assets. I'm ding an elif as Kitsu now also have tasks for sequences, edits and other things. Will try and add those in at a later stage. --- openpype/modules/kitsu/utils/sync_service.py | 24 +++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index b389d25c4f..7e7f3f557c 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -500,9 +500,15 @@ class Listener: parent_name = None entity_type = None - parent_name = episode['name'] + "_" - parent_name = parent_name + \ - task['sequence']['name'] + "_" + task['entity']['name'] + if task["task_type"]["for_entity"] == "Asset": + parent_name = task["entity"]["name"] + entity_type = task["entity_type"]["name"] + elif task["task_type"]["for_entity"] == "Shot": + parent_name = "{ep_name}{sequence_name} - {shot_name}".format( + ep_name=ep["name"] + " - " if ep is not None else "", + sequence_name=task["sequence"]["name"], + shot_name=task["entity"]["name"] + ) # Update asset tasks with new one asset_doc = get_asset_by_name(project_name, parent_name) @@ -558,6 +564,18 @@ class Listener: if ep_id and ep_id != "": ep = gazu.asset.get_episode(ep_id) + parent_name = None + entity_type = None + if task["task_type"]["for_entity"] == "Asset": + parent_name = task["entity"]["name"] + entity_type = task["entity_type"]["name"] + elif task["task_type"]["for_entity"] == "Shot": + parent_name = "{ep_name}{sequence_name} - {shot_name}".format( + ep_name=ep["name"] + " - " if ep is not None else "", + sequence_name=task["sequence"]["name"], + shot_name=task["entity"]["name"] + ) + msg = "Task deleted: {proj_name} - {entity_type}{parent_name}" \ " - {task_name}".format( proj_name=task["zou"]["project"]["name"], From 7965b91dafd59e0a75b498961d94aa8fdaa14467 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Wed, 1 Mar 2023 11:02:25 +0100 Subject: [PATCH 772/912] Moved kitsu_project out of context loop --- .../plugins/publish/collect_kitsu_entities.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py index 1531c80e04..f68226a4a5 100644 --- a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py +++ b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py @@ -11,7 +11,13 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): def process(self, context): - kitsu_project = None + kitsu_project = gazu.project.get_project_by_name( + context.data["projectName"]) + if not kitsu_project: + raise ValueError("Project not found in kitsu!") + + context.data["kitsu_project"] = kitsu_project + self.log.debug("Collect kitsu project: {}".format(kitsu_project)) kitsu_entities_by_id = {} for instance in context: @@ -23,10 +29,10 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): if not zou_asset_data: raise ValueError("Zou asset data not found in OpenPype!") - kitsu_project = gazu.project.get_project( - zou_asset_data["project_id"]) - if not kitsu_project: - raise ValueError("Project not found in kitsu!") + task_name = instance.data.get("task") + if not task_name: + continue + entity_id = zou_asset_data["id"] entity = kitsu_entities_by_id.get(entity_id) @@ -63,5 +69,3 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): raise ValueError("Task not found in kitsu!") instance.data["kitsu_task"] = kitsu_task self.log.debug("Collect kitsu task: {}".format(kitsu_task)) - - context.data["kitsu_project"] = kitsu_project From 962d0783b06d804cacf1ce628d17e1d0836951b2 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Wed, 1 Mar 2023 11:05:38 +0100 Subject: [PATCH 773/912] Fixed fetching of kitsu_task + moved data checks to the top of loop --- .../plugins/publish/collect_kitsu_entities.py | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py index f68226a4a5..9b34bd15a9 100644 --- a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py +++ b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py @@ -33,6 +33,9 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): if not task_name: continue + zou_task_data = asset_doc["data"]["tasks"][task_name].get("zou") + self.log.debug( + "Collected zou task data: {}".format(zou_task_data)) entity_id = zou_asset_data["id"] entity = kitsu_entities_by_id.get(entity_id) @@ -45,25 +48,26 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): kitsu_entities_by_id[entity_id] = entity instance.data["entity"] = entity - - task_name = instance.data.get("task") - if not task_name: - continue - zou_task_data = asset_doc["data"]["tasks"][task_name].get("zou") self.log.debug( - "Collected zou task data: {}".format(zou_task_data)) - if not zou_task_data: + "Collect kitsu {}: {}".format(zou_asset_data["type"], entity) + ) + + if zou_task_data: + kitsu_task_id = zou_task_data["id"] + kitsu_task = kitsu_entities_by_id.get(kitsu_task_id) + if not kitsu_task: + kitsu_task = gazu.task.get_task(zou_task_data["id"]) + kitsu_entities_by_id[kitsu_task_id] = kitsu_task + else: kitsu_task_type = gazu.task.get_task_type_by_name(task_name) if not kitsu_task_type: raise ValueError( "Task type {} not found in Kitsu!".format(task_name) ) - continue - kitsu_task_id = zou_task_data["id"] - kitsu_task = kitsu_entities_by_id.get(kitsu_task_id) - if not kitsu_task: - kitsu_task = gazu.task.get_task(zou_task_data["id"]) - kitsu_entities_by_id[kitsu_task_id] = kitsu_task + + kitsu_task = gazu.task.get_task_by_name( + entity, kitsu_task_type + ) if not kitsu_task: raise ValueError("Task not found in kitsu!") From 8bf970e8b96b80c2cae601530d076b27d3a6d8f7 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Wed, 1 Mar 2023 11:16:05 +0100 Subject: [PATCH 774/912] fixed hound's comments --- .../kitsu/plugins/publish/collect_kitsu_entities.py | 2 +- openpype/modules/kitsu/utils/sync_service.py | 9 ++++++--- openpype/modules/kitsu/utils/update_op_with_zou.py | 6 ++++-- openpype/modules/kitsu/utils/update_zou_with_op.py | 3 ++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py index 9b34bd15a9..71ed563580 100644 --- a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py +++ b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py @@ -64,7 +64,7 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): raise ValueError( "Task type {} not found in Kitsu!".format(task_name) ) - + kitsu_task = gazu.task.get_task_by_name( entity, kitsu_task_type ) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index 7e7f3f557c..9c5c9e24ec 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -101,7 +101,8 @@ class Listener: self.event_client, "sequence:delete", self._delete_sequence ) - gazu.events.add_listener(self.event_client, "shot:new", self._new_shot) + gazu.events.add_listener( + self.event_client, "shot:new", self._new_shot) gazu.events.add_listener( self.event_client, "shot:update", self._update_shot ) @@ -109,7 +110,8 @@ class Listener: self.event_client, "shot:delete", self._delete_shot ) - gazu.events.add_listener(self.event_client, "task:new", self._new_task) + gazu.events.add_listener( + self.event_client, "task:new", self._new_task) gazu.events.add_listener( self.event_client, "task:update", self._update_task ) @@ -515,7 +517,8 @@ class Listener: if asset_doc: asset_tasks = asset_doc["data"].get("tasks") task_type_name = task["task_type"]["name"] - asset_tasks[task_type_name] = {"type": task_type_name, "zou": task} + asset_tasks[task_type_name] = { + "type": task_type_name, "zou": task} self.dbcon.update_one( {"_id": asset_doc["_id"]}, {"$set": {"data.tasks": asset_tasks}} diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index 9368848532..6590d05a82 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -94,7 +94,8 @@ def update_op_assets( if not item_doc: # Create asset op_asset = create_op_asset(item) insert_result = dbcon.insert_one(op_asset) - item_doc = get_asset_by_id(project_name, insert_result.inserted_id) + item_doc = get_asset_by_id( + project_name, insert_result.inserted_id) # Update asset item_data = deepcopy(item_doc["data"]) @@ -339,7 +340,8 @@ def write_project_to_op(project: dict, dbcon: AvalonMongoDB) -> UpdateOne: ) -def sync_all_projects(login: str, password: str, ignore_projects: list = None): +def sync_all_projects( + login: str, password: str, ignore_projects: list = None): """Update all OP projects in DB with Zou data. Args: diff --git a/openpype/modules/kitsu/utils/update_zou_with_op.py b/openpype/modules/kitsu/utils/update_zou_with_op.py index b1a9b8b82c..617f037c1e 100644 --- a/openpype/modules/kitsu/utils/update_zou_with_op.py +++ b/openpype/modules/kitsu/utils/update_zou_with_op.py @@ -82,7 +82,8 @@ def sync_zou_from_op_project( f"x{project_doc['data']['resolutionHeight']}", } ) - gazu.project.update_project_data(zou_project, data=project_doc["data"]) + gazu.project.update_project_data( + zou_project, data=project_doc["data"]) gazu.project.update_project(zou_project) asset_types = gazu.asset.all_asset_types() From 0d981a61291d78f25c53425de4161d3f109f1505 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Wed, 1 Mar 2023 11:42:18 +0100 Subject: [PATCH 775/912] Fixed hound's comments --- openpype/modules/kitsu/utils/sync_service.py | 41 ++++++++++---------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index 9c5c9e24ec..da81a23495 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -501,10 +501,10 @@ class Listener: ep = gazu.asset.get_episode(ep_id) parent_name = None - entity_type = None + ent_type = None if task["task_type"]["for_entity"] == "Asset": parent_name = task["entity"]["name"] - entity_type = task["entity_type"]["name"] + ent_type = task["entity_type"]["name"] elif task["task_type"]["for_entity"] == "Shot": parent_name = "{ep_name}{sequence_name} - {shot_name}".format( ep_name=ep["name"] + " - " if ep is not None else "", @@ -525,12 +525,12 @@ class Listener: ) # Print message - msg = "Task created: {proj_name} - {entity_type}{parent_name}" \ - " - {task_name}".format( - proj_name=task["project"]["name"], - entity_type=entity_type + " - " if entity_type is not None else "", - parent_name=parent_name, - task_name=task["task_type"]["name"] + msg = "Task created: {proj} - {ent_type}{parent}" \ + " - {task}".format( + proj=task["project"]["name"], + ent_type=ent_type + " - " if ent_type is not None else "", + parent=parent_name, + task=task["task_type"]["name"] ) log.info(msg) @@ -568,23 +568,24 @@ class Listener: ep = gazu.asset.get_episode(ep_id) parent_name = None - entity_type = None + ent_type = None if task["task_type"]["for_entity"] == "Asset": parent_name = task["entity"]["name"] - entity_type = task["entity_type"]["name"] + ent_type = task["entity_type"]["name"] elif task["task_type"]["for_entity"] == "Shot": - parent_name = "{ep_name}{sequence_name} - {shot_name}".format( - ep_name=ep["name"] + " - " if ep is not None else "", - sequence_name=task["sequence"]["name"], - shot_name=task["entity"]["name"] + parent_name = "{ep}{sequence} - {shot}".format( + ep=ep["name"] + " - " if ep is not None else "", + sequence=task["sequence"]["name"], + shot=task["entity"]["name"] ) - msg = "Task deleted: {proj_name} - {entity_type}{parent_name}" \ - " - {task_name}".format( - proj_name=task["zou"]["project"]["name"], - entity_type=entity_type + " - " if entity_type is not None else "", - parent_name=parent_name, - task_name=task["type"] + ent_type=ent_type + " - " if ent_type is not None else "", + msg = "Task deleted: {proj} - {ent_type}{parent}" \ + " - {task}".format( + proj=task["zou"]["project"]["name"], + ent_type=ent_type, + parent=parent_name, + task=task["type"] ) log.info(msg) From 0beec8c3a710e7c3e950678a4c0b6606f4f079d7 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Wed, 1 Mar 2023 11:44:55 +0100 Subject: [PATCH 776/912] Fixed hound's comments --- openpype/modules/kitsu/utils/sync_service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index da81a23495..91ce84637d 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -579,7 +579,7 @@ class Listener: shot=task["entity"]["name"] ) - ent_type=ent_type + " - " if ent_type is not None else "", + ent_type=ent_type + " - " if ent_type is not None else "" msg = "Task deleted: {proj} - {ent_type}{parent}" \ " - {task}".format( proj=task["zou"]["project"]["name"], From 247778575f2e5c03cf055da288b444034bca4475 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 2 Mar 2023 12:30:19 +0100 Subject: [PATCH 777/912] Project creation logs happens outside of write_project_to_op() function --- openpype/modules/kitsu/utils/sync_service.py | 12 ++++++------ openpype/modules/kitsu/utils/update_op_with_zou.py | 9 ++++++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index 91ce84637d..172f7555ac 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -129,12 +129,9 @@ class Listener: """Create new project into OP DB.""" # Use update process to avoid duplicating code - self._update_project(data) + self._update_project(data, new_project=True) - # Print message - # - Happens in write_project_to_op() - - def _update_project(self, data): + def _update_project(self, data, new_project=False): """Update project into OP DB.""" # Get project entity project = gazu.project.get_project(data["project_id"]) @@ -147,6 +144,9 @@ class Listener: data["project_id"]) self.dbcon.bulk_write([update_project]) + if new_project: + log.info("Project created: {}".format(project["name"])) + def _delete_project(self, data): """Delete project.""" @@ -579,7 +579,7 @@ class Listener: shot=task["entity"]["name"] ) - ent_type=ent_type + " - " if ent_type is not None else "" + ent_type = ent_type + " - " if ent_type is not None else "" msg = "Task deleted: {proj} - {ent_type}{parent}" \ " - {task}".format( proj=task["zou"]["project"]["name"], diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index 6590d05a82..a559d8a19f 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -291,7 +291,6 @@ def write_project_to_op(project: dict, dbcon: AvalonMongoDB) -> UpdateOne: project_name = project["name"] project_dict = get_project(project_name) if not project_dict: - log.info("Project created: {}".format(project_name)) project_dict = create_project(project_name, project_name) # Project data and tasks @@ -405,12 +404,16 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict): ] # Sync project. Create if doesn't exist + project_name = project["name"] + project_dict = get_project(project_name) + if not project_dict: + log.info("Project created: {}".format(project_name)) bulk_writes.append(write_project_to_op(project, dbcon)) # Try to find project document - project_name = project["name"] + if not project_dict: + project_dict = get_project(project_name) dbcon.Session["AVALON_PROJECT"] = project_name - project_dict = get_project(project_name) # Query all assets of the local project zou_ids_and_asset_docs = { From 5a9ea0d130ba6009804ac479e3ebe6ef4ff46906 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 2 Mar 2023 12:36:57 +0100 Subject: [PATCH 778/912] Changed back from dict to doc for var names --- .../modules/kitsu/utils/update_op_with_zou.py | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index a559d8a19f..c215126dac 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -65,32 +65,32 @@ def set_op_project(dbcon: AvalonMongoDB, project_id: str): def update_op_assets( dbcon: AvalonMongoDB, gazu_project: dict, - project_dict: dict, + project_doc: dict, entities_list: List[dict], - asset_dict_ids: Dict[str, dict], + asset_doc_ids: Dict[str, dict], ) -> List[Dict[str, dict]]: """Update OpenPype assets. Set 'data' and 'parent' fields. Args: dbcon (AvalonMongoDB): Connection to DB - gazu_project dict): Dict of gazu, - project_dict dict): Dict of project, + gazu_project (dict): Dict of gazu, + project_doc (dict): Dict of project, entities_list (List[dict]): List of zou entities to update - asset_dict_ids (Dict[str, dict]): Dicts of [{zou_id: asset_doc}, ...] + asset_doc_ids (Dict[str, dict]): Dicts of [{zou_id: asset_doc}, ...] Returns: List[Dict[str, dict]]: List of (doc_id, update_dict) tuples """ - if not project_dict: + if not project_doc: return - project_name = project_dict["name"] + project_name = project_doc["name"] assets_with_update = [] for item in entities_list: # Check asset exists - item_doc = asset_dict_ids.get(item["id"]) + item_doc = asset_doc_ids.get(item["id"]) if not item_doc: # Create asset op_asset = create_op_asset(item) insert_result = dbcon.insert_one(op_asset) @@ -108,7 +108,7 @@ def update_op_assets( try: frame_in = int( item_data.pop( - "frame_in", project_dict["data"].get("frameStart") + "frame_in", project_doc["data"].get("frameStart") ) ) except (TypeError, ValueError): @@ -127,14 +127,14 @@ def update_op_assets( if frames_duration: frame_out = frame_in + frames_duration - 1 else: - frame_out = project_dict["data"].get("frameEnd", frame_in) + frame_out = project_doc["data"].get("frameEnd", frame_in) item_data["frameEnd"] = frame_out # Fps, fallback to project's value or default value (25.0) try: fps = float(item_data.get("fps")) except (TypeError, ValueError): fps = float(gazu_project.get( - "fps", project_dict["data"].get("fps", 25))) + "fps", project_doc["data"].get("fps", 25))) item_data["fps"] = fps # Resolution, fall back to project default match_res = re.match( @@ -145,27 +145,27 @@ def update_op_assets( item_data["resolutionWidth"] = int(match_res.group(1)) item_data["resolutionHeight"] = int(match_res.group(2)) else: - item_data["resolutionWidth"] = project_dict["data"].get( + item_data["resolutionWidth"] = project_doc["data"].get( "resolutionWidth") - item_data["resolutionHeight"] = project_dict["data"].get( + item_data["resolutionHeight"] = project_doc["data"].get( "resolutionHeight") # Properties that doesn't fully exist in Kitsu. # Guessing those property names below: # Pixel Aspect Ratio item_data["pixelAspect"] = item_data.get( - "pixel_aspect", project_dict["data"].get("pixelAspect")) + "pixel_aspect", project_doc["data"].get("pixelAspect")) # Handle Start item_data["handleStart"] = item_data.get( - "handle_start", project_dict["data"].get("handleStart")) + "handle_start", project_doc["data"].get("handleStart")) # Handle End item_data["handleEnd"] = item_data.get( - "handle_end", project_dict["data"].get("handleEnd")) + "handle_end", project_doc["data"].get("handleEnd")) # Clip In item_data["clipIn"] = item_data.get( - "clip_in", project_dict["data"].get("clipIn")) + "clip_in", project_doc["data"].get("clipIn")) # Clip Out item_data["clipOut"] = item_data.get( - "clip_out", project_dict["data"].get("clipOut")) + "clip_out", project_doc["data"].get("clipOut")) # Tasks tasks_list = [] @@ -209,7 +209,7 @@ def update_op_assets( # Root parent folder if exist visual_parent_doc_id = None if parent_zou_id is not None: - parent_zou_id_dict = asset_dict_ids.get(parent_zou_id) + parent_zou_id_dict = asset_doc_ids.get(parent_zou_id) if parent_zou_id_dict is not None: visual_parent_doc_id = ( parent_zou_id_dict.get("_id") @@ -233,7 +233,7 @@ def update_op_assets( item_data["parents"] = [] ancestor_id = parent_zou_id while ancestor_id is not None: - parent_doc = asset_dict_ids.get(ancestor_id) + parent_doc = asset_doc_ids.get(ancestor_id) if parent_doc is not None: item_data["parents"].insert(0, parent_doc["name"]) @@ -250,7 +250,7 @@ def update_op_assets( item_name = f"{item_data['parents'][-1]}_{item['name']}" # Update doc name - asset_dict_ids[item["id"]]["name"] = item_name + asset_doc_ids[item["id"]]["name"] = item_name else: item_name = item["name"] @@ -269,7 +269,7 @@ def update_op_assets( "$set": { "name": item_name, "data": item_data, - "parent": project_dict["_id"], + "parent": project_doc["_id"], } }, ) From 93eb9fce8609b0d6543a1f91ddb84907f89b63a3 Mon Sep 17 00:00:00 2001 From: Ember Light <49758407+EmberLightVFX@users.noreply.github.com> Date: Thu, 2 Mar 2023 12:38:37 +0100 Subject: [PATCH 779/912] Update openpype/modules/kitsu/utils/sync_service.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Félix David --- openpype/modules/kitsu/utils/sync_service.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index 172f7555ac..1efebb2d47 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -178,10 +178,11 @@ class Listener: self._update_asset(data) # Print message - ep = None ep_id = asset.get("episode_id") if ep_id and ep_id != "": ep = gazu.asset.get_episode(ep_id) + else: + ep = None msg = "Asset created: {proj_name} - {ep_name}" \ "{asset_type_name} - {asset_name}".format( From 95e1f95bc1896547bde026f5c2a2517103e9e8e8 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 2 Mar 2023 14:05:36 +0100 Subject: [PATCH 780/912] Moved all ep_dict code into one function --- openpype/modules/kitsu/utils/sync_service.py | 35 ++++++++------------ 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index 1efebb2d47..d6bdb5391e 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -124,6 +124,11 @@ class Listener: log.info("Listening to Kitsu events...") gazu.events.run_client(self.event_client) + def get_ep_dict(self, ep_id): + if ep_id and ep_id != "": + return gazu.entity.get_entity(ep_id) + return + # == Project == def _new_project(self, data): """Create new project into OP DB.""" @@ -179,10 +184,7 @@ class Listener: # Print message ep_id = asset.get("episode_id") - if ep_id and ep_id != "": - ep = gazu.asset.get_episode(ep_id) - else: - ep = None + ep = self.get_ep_dict(ep_id) msg = "Asset created: {proj_name} - {ep_name}" \ "{asset_type_name} - {asset_name}".format( @@ -233,10 +235,8 @@ class Listener: ) # Print message - ep = None ep_id = asset["data"]["zou"].get("episode_id") - if ep_id and ep_id != "": - ep = gazu.asset.get_episode(ep_id) + ep = self.get_ep_dict(ep_id) msg = "Asset deleted: {proj_name} - {ep_name}" \ "{asset_type_name} - {asset_name}".format( @@ -334,10 +334,8 @@ class Listener: self._update_sequence(data) # Print message - ep = None ep_id = sequence.get("episode_id") - if ep_id and ep_id != "": - ep = gazu.asset.get_episode(ep_id) + ep = self.get_ep_dict(ep_id) msg = "Sequence created: {proj_name} - {ep_name}" \ "{sequence_name}".format( @@ -386,10 +384,8 @@ class Listener: ) # Print message - ep = None ep_id = sequence["data"]["zou"].get("episode_id") - if ep_id and ep_id != "": - ep = gazu.asset.get_episode(ep_id) + ep = self.get_ep_dict(ep_id) gazu_project = gazu.project.get_project( sequence["data"]["zou"]["project_id"]) @@ -418,9 +414,8 @@ class Listener: self._update_shot(data) # Print message - ep = None - if shot["episode_id"] and shot["episode_id"] != "": - ep = gazu.asset.get_episode(shot["episode_id"]) + ep_id = shot["episode_id"] + ep = self.get_ep_dict(ep_id) msg = "Shot created: {proj_name} - {ep_name}" \ "{sequence_name} - {shot_name}".format( @@ -471,10 +466,8 @@ class Listener: ) # Print message - ep = None ep_id = shot["data"]["zou"].get("episode_id") - if ep_id and ep_id != "": - ep = gazu.asset.get_episode(ep_id) + ep = self.get_ep_dict(ep_id) msg = "Shot deleted: {proj_name} - {ep_name}" \ "{sequence_name} - {shot_name}".format( @@ -496,10 +489,8 @@ class Listener: task = gazu.task.get_task(data["task_id"]) # Print message - ep = None ep_id = task.get("episode_id") - if ep_id and ep_id != "": - ep = gazu.asset.get_episode(ep_id) + ep = self.get_ep_dict(ep_id) parent_name = None ent_type = None From 966ba0166e349b2882cb5db1f686b6235abbd44b Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 2 Mar 2023 14:07:14 +0100 Subject: [PATCH 781/912] Fixed delete_task msg creation to work with assets and episodes --- openpype/modules/kitsu/utils/sync_service.py | 41 ++++++++++---------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index d6bdb5391e..893d6a8b5e 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -554,31 +554,32 @@ class Listener: # Print message entity = gazu.entity.get_entity(task["zou"]["entity_id"]) - ep = None - ep_id = entity.get("episode_id") - if ep_id and ep_id != "": - ep = gazu.asset.get_episode(ep_id) + if entity["type"] == "Asset": + ep = self.get_ep_dict(entity["source_id"]) + + parent_name = "{ep}{entity_type} - {entity}".format( + ep=ep["name"] + " - " if ep is not None else "", + entity_type=task["zou"]["entity_type_name"], + entity=task["zou"]["entity_name"] + ) + elif entity["type"] == "Shot": + shot_dict = gazu.entity.get_entity( + task["zou"]["entity_id"]) + seq_dict = gazu.entity.get_entity( + shot_dict["parent_id"]) + ep = self.get_ep_dict(seq_dict["parent_id"]) - parent_name = None - ent_type = None - if task["task_type"]["for_entity"] == "Asset": - parent_name = task["entity"]["name"] - ent_type = task["entity_type"]["name"] - elif task["task_type"]["for_entity"] == "Shot": parent_name = "{ep}{sequence} - {shot}".format( ep=ep["name"] + " - " if ep is not None else "", - sequence=task["sequence"]["name"], - shot=task["entity"]["name"] + sequence=seq_dict["name"], + shot=shot_dict["name"] ) - ent_type = ent_type + " - " if ent_type is not None else "" - msg = "Task deleted: {proj} - {ent_type}{parent}" \ - " - {task}".format( - proj=task["zou"]["project"]["name"], - ent_type=ent_type, - parent=parent_name, - task=task["type"] - ) + msg = "Task deleted: {proj} - {parent} - {task}".format( + proj=task["zou"]["project_name"], + parent=parent_name, + task=task["zou"]["task_type_name"] + ) log.info(msg) return From 804cdcafd6268d84a3c7d2e887c9e05e5798dec4 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 2 Mar 2023 19:33:11 +0100 Subject: [PATCH 782/912] Store the gazu asset data in OPs DB as sync_service does This isn't the most optimal way to do it but it makes sure the data is consistent through out the code until we can revision sync_service to only use the ID from the dict. --- openpype/modules/kitsu/utils/update_op_with_zou.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index c215126dac..6797df6344 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -175,7 +175,7 @@ def update_op_assets( elif item_type == "Shot": tasks_list = gazu.task.all_tasks_for_shot(item) item_data["tasks"] = { - t["task_type_name"]: {"type": t["task_type_name"], "zou": t} + t["task_type_name"]: {"type": t["task_type_name"], "zou": gazu.task.get_task(t["id"])} for t in tasks_list } From 7176be9f92e71ee6942971e25ffc72199c1eecf8 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Thu, 2 Mar 2023 19:35:07 +0100 Subject: [PATCH 783/912] Log msg for new_task now work for both shot and assets --- openpype/modules/kitsu/utils/sync_service.py | 37 ++++++++++---------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index 893d6a8b5e..1f12217d44 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -239,10 +239,10 @@ class Listener: ep = self.get_ep_dict(ep_id) msg = "Asset deleted: {proj_name} - {ep_name}" \ - "{asset_type_name} - {asset_name}".format( + "{type_name} - {asset_name}".format( proj_name=asset["data"]["zou"]["project_name"], ep_name=ep["name"] + " - " if ep is not None else "", - asset_type_name=asset["data"]["zou"]["asset_type_name"], + type_name=asset["data"]["zou"]["asset_type_name"], asset_name=asset["name"] ) log.info(msg) @@ -390,7 +390,7 @@ class Listener: gazu_project = gazu.project.get_project( sequence["data"]["zou"]["project_id"]) - msg = "Sequence created: {proj_name} - {ep_name}" \ + msg = "Sequence deleted: {proj_name} - {ep_name}" \ "{sequence_name}".format( proj_name=gazu_project["name"], ep_name=ep["name"] + " - " if ep is not None else "", @@ -493,9 +493,12 @@ class Listener: ep = self.get_ep_dict(ep_id) parent_name = None + asset_name = None ent_type = None + if task["task_type"]["for_entity"] == "Asset": parent_name = task["entity"]["name"] + asset_name = task["entity"]["name"] ent_type = task["entity_type"]["name"] elif task["task_type"]["for_entity"] == "Shot": parent_name = "{ep_name}{sequence_name} - {shot_name}".format( @@ -503,9 +506,14 @@ class Listener: sequence_name=task["sequence"]["name"], shot_name=task["entity"]["name"] ) + asset_name = "{ep_name}{sequence_name}_{shot_name}".format( + ep_name=ep["name"] + "_" if ep is not None else "", + sequence_name=task["sequence"]["name"], + shot_name=task["entity"]["name"] + ) # Update asset tasks with new one - asset_doc = get_asset_by_name(project_name, parent_name) + asset_doc = get_asset_by_name(project_name, asset_name) if asset_doc: asset_tasks = asset_doc["data"].get("tasks") task_type_name = task["task_type"]["name"] @@ -553,32 +561,25 @@ class Listener: # Print message entity = gazu.entity.get_entity(task["zou"]["entity_id"]) + ep = self.get_ep_dict(entity["source_id"]) if entity["type"] == "Asset": - ep = self.get_ep_dict(entity["source_id"]) - parent_name = "{ep}{entity_type} - {entity}".format( ep=ep["name"] + " - " if ep is not None else "", - entity_type=task["zou"]["entity_type_name"], - entity=task["zou"]["entity_name"] + entity_type=task["zou"]["entity_type"]["name"], + entity=task["zou"]["entity"]["name"] ) elif entity["type"] == "Shot": - shot_dict = gazu.entity.get_entity( - task["zou"]["entity_id"]) - seq_dict = gazu.entity.get_entity( - shot_dict["parent_id"]) - ep = self.get_ep_dict(seq_dict["parent_id"]) - parent_name = "{ep}{sequence} - {shot}".format( ep=ep["name"] + " - " if ep is not None else "", - sequence=seq_dict["name"], - shot=shot_dict["name"] + sequence=task["zou"]["sequence"]["name"], + shot=task["zou"]["entity"]["name"] ) msg = "Task deleted: {proj} - {parent} - {task}".format( - proj=task["zou"]["project_name"], + proj=task["zou"]["project"]["name"], parent=parent_name, - task=task["zou"]["task_type_name"] + task=name ) log.info(msg) From c50678bcb8c0a1cb2696fbb526d61cbe4261a361 Mon Sep 17 00:00:00 2001 From: Ember Light <49758407+EmberLightVFX@users.noreply.github.com> Date: Fri, 3 Mar 2023 10:34:17 +0100 Subject: [PATCH 784/912] Update openpype/modules/kitsu/utils/update_op_with_zou.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Félix David --- openpype/modules/kitsu/utils/update_op_with_zou.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index 6797df6344..73b7a4249d 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -175,7 +175,12 @@ def update_op_assets( elif item_type == "Shot": tasks_list = gazu.task.all_tasks_for_shot(item) item_data["tasks"] = { - t["task_type_name"]: {"type": t["task_type_name"], "zou": gazu.task.get_task(t["id"])} + item_data["tasks"] = { + t["task_type_name"]: { + "type": t["task_type_name"], + "zou": gazu.task.get_task(t["id"]), + } + } for t in tasks_list } From 8fc6978ea2f56778d794e213c541f89888b24795 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 3 Mar 2023 11:10:12 +0100 Subject: [PATCH 785/912] Formatted with Black --- .../kitsu/actions/launcher_show_in_kitsu.py | 65 +++++----- .../publish/collect_kitsu_credential.py | 1 - .../plugins/publish/collect_kitsu_entities.py | 11 +- .../plugins/publish/integrate_kitsu_note.py | 5 +- .../plugins/publish/integrate_kitsu_review.py | 1 - openpype/modules/kitsu/utils/sync_service.py | 114 ++++++++++++------ .../modules/kitsu/utils/update_zou_with_op.py | 9 +- 7 files changed, 123 insertions(+), 83 deletions(-) diff --git a/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py b/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py index 11224f6e52..81d98cfffb 100644 --- a/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py +++ b/openpype/modules/kitsu/actions/launcher_show_in_kitsu.py @@ -23,36 +23,37 @@ class ShowInKitsu(LauncherAction): return True def process(self, session, **kwargs): - # Context inputs project_name = session["AVALON_PROJECT"] asset_name = session.get("AVALON_ASSET", None) task_name = session.get("AVALON_TASK", None) - project = get_project(project_name=project_name, - fields=["data.zou_id"]) + project = get_project( + project_name=project_name, fields=["data.zou_id"] + ) if not project: raise RuntimeError("Project {} not found.".format(project_name)) project_zou_id = project["data"].get("zou_id") if not project_zou_id: raise RuntimeError( - "Project {} has no connected kitsu id.".format(project_name)) + "Project {} has no connected kitsu id.".format(project_name) + ) asset_zou_name = None asset_zou_id = None - asset_zou_type = 'Assets' + asset_zou_type = "Assets" task_zou_id = None - zou_sub_type = ['AssetType', 'Sequence'] + zou_sub_type = ["AssetType", "Sequence"] if asset_name: asset_zou_name = asset_name asset_fields = ["data.zou.id", "data.zou.type"] if task_name: asset_fields.append("data.tasks.{}.zou.id".format(task_name)) - asset = get_asset_by_name(project_name, - asset_name=asset_name, - fields=asset_fields) + asset = get_asset_by_name( + project_name, asset_name=asset_name, fields=asset_fields + ) asset_zou_data = asset["data"].get("zou") @@ -68,37 +69,43 @@ class ShowInKitsu(LauncherAction): task_zou_data = task_data.get("zou", {}) if not task_zou_data: self.log.debug( - "No zou task data for task: {}".format(task_name)) + "No zou task data for task: {}".format(task_name) + ) task_zou_id = task_zou_data["id"] # Define URL - url = self.get_url(project_id=project_zou_id, - asset_name=asset_zou_name, - asset_id=asset_zou_id, - asset_type=asset_zou_type, - task_id=task_zou_id) + url = self.get_url( + project_id=project_zou_id, + asset_name=asset_zou_name, + asset_id=asset_zou_id, + asset_type=asset_zou_type, + task_id=task_zou_id, + ) # Open URL in webbrowser self.log.info("Opening URL: {}".format(url)) - webbrowser.open(url, - # Try in new tab - new=2) + webbrowser.open( + url, + # Try in new tab + new=2, + ) - def get_url(self, - project_id, - asset_name=None, - asset_id=None, - asset_type=None, - task_id=None): - - shots_url = {'Shots', 'Sequence', 'Shot'} - sub_type = {'AssetType', 'Sequence'} + def get_url( + self, + project_id, + asset_name=None, + asset_id=None, + asset_type=None, + task_id=None, + ): + shots_url = {"Shots", "Sequence", "Shot"} + sub_type = {"AssetType", "Sequence"} kitsu_module = self.get_kitsu_module() # Get kitsu url with /api stripped kitsu_url = kitsu_module.server_url if kitsu_url.endswith("/api"): - kitsu_url = kitsu_url[:-len("/api")] + kitsu_url = kitsu_url[: -len("/api")] sub_url = f"/productions/{project_id}" asset_type_url = "shots" if asset_type in shots_url else "assets" @@ -121,6 +128,6 @@ class ShowInKitsu(LauncherAction): # Add search method if is a sub_type sub_url += f"/{asset_type_url}" if asset_type in sub_type: - sub_url += f'?search={asset_name}' + sub_url += f"?search={asset_name}" return f"{kitsu_url}{sub_url}" diff --git a/openpype/modules/kitsu/plugins/publish/collect_kitsu_credential.py b/openpype/modules/kitsu/plugins/publish/collect_kitsu_credential.py index b7f6f67a40..ac501dd47d 100644 --- a/openpype/modules/kitsu/plugins/publish/collect_kitsu_credential.py +++ b/openpype/modules/kitsu/plugins/publish/collect_kitsu_credential.py @@ -13,6 +13,5 @@ class CollectKitsuSession(pyblish.api.ContextPlugin): # rename log in # families = ["kitsu"] def process(self, context): - gazu.client.set_host(os.environ["KITSU_SERVER"]) gazu.log_in(os.environ["KITSU_LOGIN"], os.environ["KITSU_PWD"]) diff --git a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py index 71ed563580..a0bd2b305b 100644 --- a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py +++ b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py @@ -10,9 +10,9 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): label = "Kitsu entities" def process(self, context): - kitsu_project = gazu.project.get_project_by_name( - context.data["projectName"]) + context.data["projectName"] + ) if not kitsu_project: raise ValueError("Project not found in kitsu!") @@ -35,7 +35,8 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): zou_task_data = asset_doc["data"]["tasks"][task_name].get("zou") self.log.debug( - "Collected zou task data: {}".format(zou_task_data)) + "Collected zou task data: {}".format(zou_task_data) + ) entity_id = zou_asset_data["id"] entity = kitsu_entities_by_id.get(entity_id) @@ -44,7 +45,9 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin): if not entity: raise ValueError( "{} was not found in kitsu!".format( - zou_asset_data["name"])) + zou_asset_data["name"] + ) + ) kitsu_entities_by_id[entity_id] = entity instance.data["entity"] = entity diff --git a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py index 006f0bc6d0..6702cbe7aa 100644 --- a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py +++ b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py @@ -13,7 +13,6 @@ class IntegrateKitsuNote(pyblish.api.ContextPlugin): note_status_shortname = "wfa" def process(self, context): - # Get comment text body publish_comment = context.data.get("comment") if not publish_comment: @@ -45,9 +44,7 @@ class IntegrateKitsuNote(pyblish.api.ContextPlugin): # Add comment to kitsu task task_id = kitsu_task["id"] - self.log.debug( - "Add new note in taks id {}".format(task_id) - ) + self.log.debug("Add new note in taks id {}".format(task_id)) kitsu_comment = gazu.task.add_comment( task_id, note_status, comment=publish_comment ) diff --git a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py index d8f6cb7ac8..12482b5657 100644 --- a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py +++ b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_review.py @@ -12,7 +12,6 @@ class IntegrateKitsuReview(pyblish.api.InstancePlugin): optional = True def process(self, instance): - task = instance.data["kitsu_task"]["id"] comment = instance.data["kitsu_comment"]["id"] diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py index 1f12217d44..34714fa4b3 100644 --- a/openpype/modules/kitsu/utils/sync_service.py +++ b/openpype/modules/kitsu/utils/sync_service.py @@ -102,7 +102,8 @@ class Listener: ) gazu.events.add_listener( - self.event_client, "shot:new", self._new_shot) + self.event_client, "shot:new", self._new_shot + ) gazu.events.add_listener( self.event_client, "shot:update", self._update_shot ) @@ -111,7 +112,8 @@ class Listener: ) gazu.events.add_listener( - self.event_client, "task:new", self._new_task) + self.event_client, "task:new", self._new_task + ) gazu.events.add_listener( self.event_client, "task:update", self._update_task ) @@ -146,7 +148,8 @@ class Listener: # Write into DB if update_project: self.dbcon.Session["AVALON_PROJECT"] = get_kitsu_project_name( - data["project_id"]) + data["project_id"] + ) self.dbcon.bulk_write([update_project]) if new_project: @@ -158,7 +161,8 @@ class Listener: collections = self.dbcon.database.list_collection_names() for collection in collections: project = self.dbcon.database[collection].find_one( - {"data.zou_id": data["project_id"]}) + {"data.zou_id": data["project_id"]} + ) if project: # Delete project collection self.dbcon.database[project["name"]].drop() @@ -186,13 +190,15 @@ class Listener: ep_id = asset.get("episode_id") ep = self.get_ep_dict(ep_id) - msg = "Asset created: {proj_name} - {ep_name}" \ + msg = ( + "Asset created: {proj_name} - {ep_name}" "{asset_type_name} - {asset_name}".format( proj_name=asset["project_name"], ep_name=ep["name"] + " - " if ep is not None else "", asset_type_name=asset["asset_type_name"], - asset_name=asset["name"] + asset_name=asset["name"], ) + ) log.info(msg) def _update_asset(self, data): @@ -216,8 +222,11 @@ class Listener: # Update update_op_result = update_op_assets( - self.dbcon, gazu_project, project_doc, - [asset], zou_ids_and_asset_docs + self.dbcon, + gazu_project, + project_doc, + [asset], + zou_ids_and_asset_docs, ) if update_op_result: asset_doc_id, asset_update = update_op_result[0] @@ -238,13 +247,15 @@ class Listener: ep_id = asset["data"]["zou"].get("episode_id") ep = self.get_ep_dict(ep_id) - msg = "Asset deleted: {proj_name} - {ep_name}" \ + msg = ( + "Asset deleted: {proj_name} - {ep_name}" "{type_name} - {asset_name}".format( proj_name=asset["data"]["zou"]["project_name"], ep_name=ep["name"] + " - " if ep is not None else "", type_name=asset["data"]["zou"]["asset_type_name"], - asset_name=asset["name"] + asset_name=asset["name"], ) + ) log.info(msg) # == Episode == @@ -264,8 +275,7 @@ class Listener: # Print message msg = "Episode created: {proj_name} - {ep_name}".format( - proj_name=ep["project_name"], - ep_name=ep["name"] + proj_name=ep["project_name"], ep_name=ep["name"] ) log.info(msg) @@ -290,8 +300,11 @@ class Listener: # Update update_op_result = update_op_assets( - self.dbcon, gazu_project, project_doc, - [ep], zou_ids_and_asset_docs + self.dbcon, + gazu_project, + project_doc, + [ep], + zou_ids_and_asset_docs, ) if update_op_result: asset_doc_id, asset_update = update_op_result[0] @@ -310,11 +323,11 @@ class Listener: # Print message project = gazu.project.get_project( - ep["data"]["zou"]["project_id"]) + ep["data"]["zou"]["project_id"] + ) msg = "Episode deleted: {proj_name} - {ep_name}".format( - proj_name=project["name"], - ep_name=ep["name"] + proj_name=project["name"], ep_name=ep["name"] ) log.info(msg) @@ -337,12 +350,14 @@ class Listener: ep_id = sequence.get("episode_id") ep = self.get_ep_dict(ep_id) - msg = "Sequence created: {proj_name} - {ep_name}" \ + msg = ( + "Sequence created: {proj_name} - {ep_name}" "{sequence_name}".format( proj_name=sequence["project_name"], ep_name=ep["name"] + " - " if ep is not None else "", - sequence_name=sequence["name"] + sequence_name=sequence["name"], ) + ) log.info(msg) def _update_sequence(self, data): @@ -366,8 +381,11 @@ class Listener: # Update update_op_result = update_op_assets( - self.dbcon, gazu_project, project_doc, - [sequence], zou_ids_and_asset_docs + self.dbcon, + gazu_project, + project_doc, + [sequence], + zou_ids_and_asset_docs, ) if update_op_result: asset_doc_id, asset_update = update_op_result[0] @@ -388,14 +406,17 @@ class Listener: ep = self.get_ep_dict(ep_id) gazu_project = gazu.project.get_project( - sequence["data"]["zou"]["project_id"]) + sequence["data"]["zou"]["project_id"] + ) - msg = "Sequence deleted: {proj_name} - {ep_name}" \ + msg = ( + "Sequence deleted: {proj_name} - {ep_name}" "{sequence_name}".format( proj_name=gazu_project["name"], ep_name=ep["name"] + " - " if ep is not None else "", - sequence_name=sequence["name"] + sequence_name=sequence["name"], ) + ) log.info(msg) # == Shot == @@ -417,13 +438,15 @@ class Listener: ep_id = shot["episode_id"] ep = self.get_ep_dict(ep_id) - msg = "Shot created: {proj_name} - {ep_name}" \ + msg = ( + "Shot created: {proj_name} - {ep_name}" "{sequence_name} - {shot_name}".format( proj_name=shot["project_name"], ep_name=ep["name"] + " - " if ep is not None else "", sequence_name=shot["sequence_name"], - shot_name=shot["name"] + shot_name=shot["name"], ) + ) log.info(msg) def _update_shot(self, data): @@ -440,14 +463,18 @@ class Listener: zou_ids_and_asset_docs = { asset_doc["data"]["zou"]["id"]: asset_doc for asset_doc in get_assets(project_name) - if asset_doc["data"].get("zou", {}).get("id")} + if asset_doc["data"].get("zou", {}).get("id") + } zou_ids_and_asset_docs[shot["project_id"]] = project_doc gazu_project = gazu.project.get_project(shot["project_id"]) # Update update_op_result = update_op_assets( - self.dbcon, gazu_project, project_doc, - [shot], zou_ids_and_asset_docs + self.dbcon, + gazu_project, + project_doc, + [shot], + zou_ids_and_asset_docs, ) if update_op_result: @@ -469,13 +496,15 @@ class Listener: ep_id = shot["data"]["zou"].get("episode_id") ep = self.get_ep_dict(ep_id) - msg = "Shot deleted: {proj_name} - {ep_name}" \ + msg = ( + "Shot deleted: {proj_name} - {ep_name}" "{sequence_name} - {shot_name}".format( proj_name=shot["data"]["zou"]["project_name"], ep_name=ep["name"] + " - " if ep is not None else "", sequence_name=shot["data"]["zou"]["sequence_name"], - shot_name=shot["name"] + shot_name=shot["name"], ) + ) log.info(msg) # == Task == @@ -504,12 +533,12 @@ class Listener: parent_name = "{ep_name}{sequence_name} - {shot_name}".format( ep_name=ep["name"] + " - " if ep is not None else "", sequence_name=task["sequence"]["name"], - shot_name=task["entity"]["name"] + shot_name=task["entity"]["name"], ) asset_name = "{ep_name}{sequence_name}_{shot_name}".format( ep_name=ep["name"] + "_" if ep is not None else "", sequence_name=task["sequence"]["name"], - shot_name=task["entity"]["name"] + shot_name=task["entity"]["name"], ) # Update asset tasks with new one @@ -518,20 +547,24 @@ class Listener: asset_tasks = asset_doc["data"].get("tasks") task_type_name = task["task_type"]["name"] asset_tasks[task_type_name] = { - "type": task_type_name, "zou": task} + "type": task_type_name, + "zou": task, + } self.dbcon.update_one( {"_id": asset_doc["_id"]}, - {"$set": {"data.tasks": asset_tasks}} + {"$set": {"data.tasks": asset_tasks}}, ) # Print message - msg = "Task created: {proj} - {ent_type}{parent}" \ + msg = ( + "Task created: {proj} - {ent_type}{parent}" " - {task}".format( proj=task["project"]["name"], ent_type=ent_type + " - " if ent_type is not None else "", parent=parent_name, - task=task["task_type"]["name"] + task=task["task_type"]["name"], ) + ) log.info(msg) def _update_task(self, data): @@ -567,19 +600,19 @@ class Listener: parent_name = "{ep}{entity_type} - {entity}".format( ep=ep["name"] + " - " if ep is not None else "", entity_type=task["zou"]["entity_type"]["name"], - entity=task["zou"]["entity"]["name"] + entity=task["zou"]["entity"]["name"], ) elif entity["type"] == "Shot": parent_name = "{ep}{sequence} - {shot}".format( ep=ep["name"] + " - " if ep is not None else "", sequence=task["zou"]["sequence"]["name"], - shot=task["zou"]["entity"]["name"] + shot=task["zou"]["entity"]["name"], ) msg = "Task deleted: {proj} - {parent} - {task}".format( proj=task["zou"]["project"]["name"], parent=parent_name, - task=name + task=name, ) log.info(msg) @@ -593,6 +626,7 @@ def start_listeners(login: str, password: str): login (str): Kitsu user login password (str): Kitsu user password """ + # Refresh token every week def refresh_token_every_week(): log.info("Refreshing token...") diff --git a/openpype/modules/kitsu/utils/update_zou_with_op.py b/openpype/modules/kitsu/utils/update_zou_with_op.py index 617f037c1e..be931af233 100644 --- a/openpype/modules/kitsu/utils/update_zou_with_op.py +++ b/openpype/modules/kitsu/utils/update_zou_with_op.py @@ -83,7 +83,8 @@ def sync_zou_from_op_project( } ) gazu.project.update_project_data( - zou_project, data=project_doc["data"]) + zou_project, data=project_doc["data"] + ) gazu.project.update_project(zou_project) asset_types = gazu.asset.all_asset_types() @@ -99,8 +100,7 @@ def sync_zou_from_op_project( project_module_settings = get_project_settings(project_name)["kitsu"] dbcon.Session["AVALON_PROJECT"] = project_name asset_docs = { - asset_doc["_id"]: asset_doc - for asset_doc in get_assets(project_name) + asset_doc["_id"]: asset_doc for asset_doc in get_assets(project_name) } # Create new assets @@ -176,7 +176,8 @@ def sync_zou_from_op_project( frame_in=doc["data"]["frameStart"], frame_out=doc["data"]["frameEnd"], nb_frames=( - doc["data"]["frameEnd"] - doc["data"]["frameStart"] + 1), + doc["data"]["frameEnd"] - doc["data"]["frameStart"] + 1 + ), ) elif match.group(2): # Sequence From 67bc287321fd03287aedf222e6d9c7ebf25e3332 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Fri, 3 Mar 2023 11:12:17 +0100 Subject: [PATCH 786/912] Fix hound comments --- openpype/modules/kitsu/utils/update_op_with_zou.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index 73b7a4249d..053e803ff3 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -175,12 +175,12 @@ def update_op_assets( elif item_type == "Shot": tasks_list = gazu.task.all_tasks_for_shot(item) item_data["tasks"] = { - item_data["tasks"] = { - t["task_type_name"]: { - "type": t["task_type_name"], - "zou": gazu.task.get_task(t["id"]), + item_data["tasks"] = { + t["task_type_name"]: { + "type": t["task_type_name"], + "zou": gazu.task.get_task(t["id"]), + } } - } for t in tasks_list } From 67e8f59935a7a1824aceb71cdc32e354c8a33a98 Mon Sep 17 00:00:00 2001 From: Ynbot Date: Sat, 4 Mar 2023 03:27:48 +0000 Subject: [PATCH 787/912] [Automated] Bump version --- openpype/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/version.py b/openpype/version.py index 4d6f3d43e4..2939ddbbac 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.15.2-nightly.3" +__version__ = "3.15.2-nightly.4" From 7c9c2864c51a58d7dcb4768d5483fcf35615c3e9 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Sat, 4 Mar 2023 15:41:49 +0300 Subject: [PATCH 788/912] add up to 3 decimals to fps allows input 23.976 to the FPS settings both in Project Manager and the Project Anatomy. --- .../schemas/schema_anatomy_attributes.json | 2 +- .../project_manager/project_manager/delegates.py | 5 ++++- .../tools/project_manager/project_manager/view.py | 14 ++++++++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_attributes.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_attributes.json index 3667c9d5d8..a728024376 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_attributes.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_attributes.json @@ -10,7 +10,7 @@ "type": "number", "key": "fps", "label": "Frame Rate", - "decimal": 2, + "decimal": 3, "minimum": 0 }, { diff --git a/openpype/tools/project_manager/project_manager/delegates.py b/openpype/tools/project_manager/project_manager/delegates.py index 79e9554b0f..023dd668ec 100644 --- a/openpype/tools/project_manager/project_manager/delegates.py +++ b/openpype/tools/project_manager/project_manager/delegates.py @@ -83,15 +83,18 @@ class NumberDelegate(QtWidgets.QStyledItemDelegate): decimals(int): How many decimal points can be used. Float will be used as value if is higher than 0. """ - def __init__(self, minimum, maximum, decimals, *args, **kwargs): + def __init__(self, minimum, maximum, decimals, step, *args, **kwargs): super(NumberDelegate, self).__init__(*args, **kwargs) self.minimum = minimum self.maximum = maximum self.decimals = decimals + self.step = step def createEditor(self, parent, option, index): if self.decimals > 0: editor = DoubleSpinBoxScrollFixed(parent) + editor.setSingleStep(self.step) + editor.setDecimals(self.decimals) else: editor = SpinBoxScrollFixed(parent) diff --git a/openpype/tools/project_manager/project_manager/view.py b/openpype/tools/project_manager/project_manager/view.py index fa08943ea5..0dd04aa7b9 100644 --- a/openpype/tools/project_manager/project_manager/view.py +++ b/openpype/tools/project_manager/project_manager/view.py @@ -26,10 +26,11 @@ class NameDef: class NumberDef: - def __init__(self, minimum=None, maximum=None, decimals=None): + def __init__(self, minimum=None, maximum=None, decimals=None, step=None): self.minimum = 0 if minimum is None else minimum self.maximum = 999999999 if maximum is None else maximum self.decimals = 0 if decimals is None else decimals + self.step = 1 if decimals is None else step class TypeDef: @@ -73,14 +74,14 @@ class HierarchyView(QtWidgets.QTreeView): "type": TypeDef(), "frameStart": NumberDef(1), "frameEnd": NumberDef(1), - "fps": NumberDef(1, decimals=2), + "fps": NumberDef(1, decimals=3, step=0.01), "resolutionWidth": NumberDef(0), "resolutionHeight": NumberDef(0), "handleStart": NumberDef(0), "handleEnd": NumberDef(0), "clipIn": NumberDef(1), "clipOut": NumberDef(1), - "pixelAspect": NumberDef(0, decimals=2), + "pixelAspect": NumberDef(0, decimals=2, step=0.1), "tools_env": ToolsDef() } @@ -96,6 +97,10 @@ class HierarchyView(QtWidgets.QTreeView): "stretch": QtWidgets.QHeaderView.Interactive, "width": 140 }, + "fps": { + "stretch": QtWidgets.QHeaderView.Interactive, + "width": 65 + }, "tools_env": { "stretch": QtWidgets.QHeaderView.Interactive, "width": 200 @@ -148,7 +153,8 @@ class HierarchyView(QtWidgets.QTreeView): delegate = NumberDelegate( item_type.minimum, item_type.maximum, - item_type.decimals + item_type.decimals, + item_type.step ) elif isinstance(item_type, TypeDef): From 384d928d854d086fea75a4ae418e1d81357879d1 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Sat, 4 Mar 2023 22:19:58 +0300 Subject: [PATCH 789/912] set fps and pixel aspect precision steps default values --- openpype/tools/project_manager/project_manager/view.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/tools/project_manager/project_manager/view.py b/openpype/tools/project_manager/project_manager/view.py index 0dd04aa7b9..b35491c5b2 100644 --- a/openpype/tools/project_manager/project_manager/view.py +++ b/openpype/tools/project_manager/project_manager/view.py @@ -74,14 +74,14 @@ class HierarchyView(QtWidgets.QTreeView): "type": TypeDef(), "frameStart": NumberDef(1), "frameEnd": NumberDef(1), - "fps": NumberDef(1, decimals=3, step=0.01), + "fps": NumberDef(1, decimals=3, step=1), "resolutionWidth": NumberDef(0), "resolutionHeight": NumberDef(0), "handleStart": NumberDef(0), "handleEnd": NumberDef(0), "clipIn": NumberDef(1), "clipOut": NumberDef(1), - "pixelAspect": NumberDef(0, decimals=2, step=0.1), + "pixelAspect": NumberDef(0, decimals=2, step=0.01), "tools_env": ToolsDef() } From b077815dc5adcb7c839cc77825498369402ef7af Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sun, 5 Mar 2023 10:32:13 +0100 Subject: [PATCH 790/912] Get and set openpype context data on comp --- openpype/hosts/fusion/api/pipeline.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/api/pipeline.py b/openpype/hosts/fusion/api/pipeline.py index 2d0a1da8fa..b982e1c2e9 100644 --- a/openpype/hosts/fusion/api/pipeline.py +++ b/openpype/hosts/fusion/api/pipeline.py @@ -155,10 +155,12 @@ class FusionHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): return ls() def update_context_data(self, data, changes): - print(data, changes) + comp = get_current_comp() + comp.SetData("openpype", data) def get_context_data(self): - return {} + comp = get_current_comp() + return comp.GetData("openpype") or {} def on_pyblish_instance_toggled(instance, old_value, new_value): From 406bc798c45fff19edee17730ffaee587a5a8b48 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sun, 5 Mar 2023 10:39:57 +0100 Subject: [PATCH 791/912] Tweak creator updates to newer style updates --- .../fusion/plugins/create/create_saver.py | 11 +++-------- .../fusion/plugins/create/create_workfile.py | 18 ++++-------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/openpype/hosts/fusion/plugins/create/create_saver.py b/openpype/hosts/fusion/plugins/create/create_saver.py index 439064770e..777dfb2e67 100644 --- a/openpype/hosts/fusion/plugins/create/create_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_saver.py @@ -87,15 +87,10 @@ class CreateSaver(Creator): return qtawesome.icon("fa.eye", color="white") def update_instances(self, update_list): - for update in update_list: - instance = update.instance + for created_inst, _changes in update_list: - # Get the new values after the changes by key, ignore old value - new_data = { - key: new for key, (_old, new) in update.changes.items() - } - - tool = instance.transient_data["tool"] + new_data = created_inst.data_to_store() + tool = created_inst.transient_data["tool"] self._update_tool_with_data(tool, new_data) self._imprint(tool, new_data) diff --git a/openpype/hosts/fusion/plugins/create/create_workfile.py b/openpype/hosts/fusion/plugins/create/create_workfile.py index 917780c56e..3f11d69425 100644 --- a/openpype/hosts/fusion/plugins/create/create_workfile.py +++ b/openpype/hosts/fusion/plugins/create/create_workfile.py @@ -53,20 +53,15 @@ class FusionWorkfileCreator(AutoCreator): self._add_instance_to_context(instance) def update_instances(self, update_list): - for update in update_list: - instance = update.instance - comp = instance.transient_data["comp"] + for created_inst, _changes in update_list: + comp = created_inst.transient_data["comp"] if not hasattr(comp, "SetData"): # Comp is not alive anymore, likely closed by the user self.log.error("Workfile comp not found for existing instance." " Comp might have been closed in the meantime.") continue - # TODO: It appears sometimes this could be 'nested' - # Get the new values after the changes by key, ignore old value - new_data = { - key: new for key, (_old, new) in update.changes.items() - } + new_data = created_inst.data_to_store() self._imprint(comp, new_data) def create(self, options=None): @@ -128,9 +123,4 @@ class FusionWorkfileCreator(AutoCreator): for key in ["variant", "subset", "asset", "task"]: data.pop(key, None) - # Flatten any potential nested dicts - data = flatten_dict(data, separator=".") - - # Prefix with data key openpype.workfile - data = {f"{self.data_key}.{key}" for key, value in data.items()} - comp.SetData(data) + comp.SetData(self.data_key, data) From 37591de2913bfadd033e904fdfb88ffee550c4ad Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sun, 5 Mar 2023 10:40:56 +0100 Subject: [PATCH 792/912] Change workfile Creator data key so it doesn't interfere with global comp context data in any way (Fusion allows to access nested dicts (lua tables) using the dot notation) --- openpype/hosts/fusion/plugins/create/create_workfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/plugins/create/create_workfile.py b/openpype/hosts/fusion/plugins/create/create_workfile.py index 3f11d69425..c67a9793dd 100644 --- a/openpype/hosts/fusion/plugins/create/create_workfile.py +++ b/openpype/hosts/fusion/plugins/create/create_workfile.py @@ -33,7 +33,7 @@ class FusionWorkfileCreator(AutoCreator): create_allow_context_change = False - data_key = "openpype.workfile" + data_key = "openpype_workfile" def collect_instances(self): From 5efc9e0ff0cdf0f410b7a0b92b27cc2ed03256e2 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 6 Mar 2023 11:00:02 +0100 Subject: [PATCH 793/912] Editorial: Fix tasks removal (#4558) Fix tasks removal in editorial --- .../publish/extract_hierarchy_avalon.py | 52 +++++++++++++------ 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/openpype/plugins/publish/extract_hierarchy_avalon.py b/openpype/plugins/publish/extract_hierarchy_avalon.py index b2a6adc210..493780645c 100644 --- a/openpype/plugins/publish/extract_hierarchy_avalon.py +++ b/openpype/plugins/publish/extract_hierarchy_avalon.py @@ -135,6 +135,38 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin): ) return project_doc + def _prepare_new_tasks(self, asset_doc, entity_data): + new_tasks = entity_data.get("tasks") or {} + if not asset_doc: + return new_tasks + + old_tasks = asset_doc.get("data", {}).get("tasks") + # Just use new tasks if old are not available + if not old_tasks: + return new_tasks + + output = deepcopy(old_tasks) + # Create mapping of lowered task names from old tasks + cur_task_low_mapping = { + task_name.lower(): task_name + for task_name in old_tasks + } + # Add/update tasks from new entity data + for task_name, task_info in new_tasks.items(): + task_info = deepcopy(task_info) + task_name_low = task_name.lower() + # Add new task + if task_name_low not in cur_task_low_mapping: + output[task_name] = task_info + continue + + # Update existing task with new info + mapped_task_name = cur_task_low_mapping.pop(task_name_low) + src_task_info = output.pop(mapped_task_name) + src_task_info.update(task_info) + output[task_name] = src_task_info + return output + def sync_asset( self, asset_name, @@ -170,11 +202,12 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin): data["parents"] = parents asset_doc = asset_docs_by_name.get(asset_name) + + # Tasks + data["tasks"] = self._prepare_new_tasks(asset_doc, entity_data) + # --- Create/Unarchive asset and end --- if not asset_doc: - # Just use tasks from entity data as they are - # - this is different from the case when tasks are updated - data["tasks"] = entity_data.get("tasks") or {} archived_asset_doc = None for archived_entity in archived_asset_docs_by_name[asset_name]: archived_parents = ( @@ -201,19 +234,6 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin): if "data" not in asset_doc: asset_doc["data"] = {} cur_entity_data = asset_doc["data"] - cur_entity_tasks = cur_entity_data.get("tasks") or {} - - # Tasks - data["tasks"] = {} - new_tasks = entity_data.get("tasks") or {} - for task_name, task_info in new_tasks.items(): - task_info = deepcopy(task_info) - if task_name in cur_entity_tasks: - src_task_info = deepcopy(cur_entity_tasks[task_name]) - src_task_info.update(task_info) - task_info = src_task_info - - data["tasks"][task_name] = task_info changes = {} for key, value in data.items(): From 08c71380709cf672e4b930b351a0671331521610 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 6 Mar 2023 11:13:57 +0100 Subject: [PATCH 794/912] Nuke: moving deepcopy to abstraction --- openpype/pipeline/colorspace.py | 31 ++++++++++---------- openpype/pipeline/publish/publish_plugins.py | 5 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/openpype/pipeline/colorspace.py b/openpype/pipeline/colorspace.py index 6f68bdc5bf..2085e2d37f 100644 --- a/openpype/pipeline/colorspace.py +++ b/openpype/pipeline/colorspace.py @@ -335,9 +335,10 @@ def get_imageio_config( get_template_data_from_session) anatomy_data = get_template_data_from_session() + formatting_data = deepcopy(anatomy_data) # add project roots to anatomy data - anatomy_data["root"] = anatomy.roots - anatomy_data["platform"] = platform.system().lower() + formatting_data["root"] = anatomy.roots + formatting_data["platform"] = platform.system().lower() # get colorspace settings imageio_global, imageio_host = _get_imageio_settings( @@ -347,7 +348,7 @@ def get_imageio_config( if config_host.get("enabled"): config_data = _get_config_data( - config_host["filepath"], anatomy_data + config_host["filepath"], formatting_data ) else: config_data = None @@ -356,7 +357,7 @@ def get_imageio_config( # get config path from either global or host_name config_global = imageio_global["ocio_config"] config_data = _get_config_data( - config_global["filepath"], anatomy_data + config_global["filepath"], formatting_data ) if not config_data: @@ -372,12 +373,12 @@ def _get_config_data(path_list, anatomy_data): """Return first existing path in path list. If template is used in path inputs, - then it is formated by anatomy data + then it is formatted by anatomy data and environment variables Args: path_list (list[str]): list of abs paths - anatomy_data (dict): formating data + anatomy_data (dict): formatting data Returns: dict: config data @@ -389,30 +390,30 @@ def _get_config_data(path_list, anatomy_data): # first try host config paths for path_ in path_list: - formated_path = _format_path(path_, formatting_data) + formatted_path = _format_path(path_, formatting_data) - if not os.path.exists(formated_path): + if not os.path.exists(formatted_path): continue return { - "path": os.path.normpath(formated_path), + "path": os.path.normpath(formatted_path), "template": path_ } -def _format_path(tempate_path, formatting_data): - """Single template path formating. +def _format_path(template_path, formatting_data): + """Single template path formatting. Args: - tempate_path (str): template string + template_path (str): template string formatting_data (dict): data to be used for - template formating + template formatting Returns: - str: absolute formated path + str: absolute formatted path """ # format path for anatomy keys - formatted_path = StringTemplate(tempate_path).format( + formatted_path = StringTemplate(template_path).format( formatting_data) return os.path.abspath(formatted_path) diff --git a/openpype/pipeline/publish/publish_plugins.py b/openpype/pipeline/publish/publish_plugins.py index 2df98221ba..331235fadc 100644 --- a/openpype/pipeline/publish/publish_plugins.py +++ b/openpype/pipeline/publish/publish_plugins.py @@ -1,4 +1,3 @@ -from copy import deepcopy import inspect from abc import ABCMeta from pprint import pformat @@ -311,7 +310,7 @@ class ColormanagedPyblishPluginMixin(object): @staticmethod def get_colorspace_settings(context): - """Retuns solved settings for the host context. + """Returns solved settings for the host context. Args: context (publish.Context): publishing context @@ -324,7 +323,7 @@ class ColormanagedPyblishPluginMixin(object): project_name = context.data["projectName"] host_name = context.data["hostName"] - anatomy_data = deepcopy(context.data["anatomyData"]) + anatomy_data = context.data["anatomyData"] project_settings_ = context.data["project_settings"] config_data = get_imageio_config( From ec78ebff691eec6c124dfc95c10c9760bac1d1b5 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Mon, 6 Mar 2023 10:20:12 +0000 Subject: [PATCH 795/912] Add skeletalmesh family as loadable as reference --- openpype/hosts/maya/plugins/load/load_reference.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/maya/plugins/load/load_reference.py b/openpype/hosts/maya/plugins/load/load_reference.py index 858c9b709e..d93702a16d 100644 --- a/openpype/hosts/maya/plugins/load/load_reference.py +++ b/openpype/hosts/maya/plugins/load/load_reference.py @@ -26,6 +26,7 @@ class ReferenceLoader(openpype.hosts.maya.api.plugin.ReferenceLoader): "rig", "camerarig", "staticMesh", + "skeletalMesh", "mvLook"] representations = ["ma", "abc", "fbx", "mb"] From 84574eaca8cc8bfa707d39d411c784621754975a Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 6 Mar 2023 11:50:41 +0100 Subject: [PATCH 796/912] Nuke: fix clip sequence loading --- openpype/hosts/nuke/plugins/load/load_clip.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/nuke/plugins/load/load_clip.py b/openpype/hosts/nuke/plugins/load/load_clip.py index d170276add..cb3da79ef5 100644 --- a/openpype/hosts/nuke/plugins/load/load_clip.py +++ b/openpype/hosts/nuke/plugins/load/load_clip.py @@ -222,18 +222,21 @@ class LoadClip(plugin.NukeLoader): """ representation = deepcopy(representation) context = representation["context"] - template = representation["data"]["template"] + + # Get the frame from the context and hash it + frame = context["frame"] + hashed_frame = "#" * len(str(frame)) + + # Replace the frame with the hash in the originalBasename if ( - "{originalBasename}" in template - and "frame" in context + "{originalBasename}" in representation["data"]["template"] ): - frame = context["frame"] - hashed_frame = "#" * len(str(frame)) origin_basename = context["originalBasename"] context["originalBasename"] = origin_basename.replace( frame, hashed_frame ) + # Replace the frame with the hash in the frame representation["context"]["frame"] = hashed_frame return representation From b513bb437d2e48b20f305fadb4b71639724a3875 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 6 Mar 2023 16:28:37 +0100 Subject: [PATCH 797/912] Set subset in a more correct OpenPype way --- .../hosts/fusion/plugins/create/create_saver.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/plugins/create/create_saver.py b/openpype/hosts/fusion/plugins/create/create_saver.py index 777dfb2e67..b0c0d830a3 100644 --- a/openpype/hosts/fusion/plugins/create/create_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_saver.py @@ -12,6 +12,7 @@ from openpype.pipeline import ( Creator, CreatedInstance ) +from openpype.client import get_asset_by_name class CreateSaver(Creator): @@ -145,14 +146,22 @@ class CreateSaver(Creator): asset = legacy_io.Session["AVALON_ASSET"] task = legacy_io.Session["AVALON_TASK"] + asset_doc = get_asset_by_name(project_name=project, + asset_name=asset) + path = tool["Clip"][comp.TIME_UNDEFINED] fname = os.path.basename(path) fname, _ext = os.path.splitext(fname) - subset = fname.rstrip(".") + variant = fname.rstrip(".") + subset = self.get_subset_name( + variant=variant, + task_name=task, + asset_doc=asset_doc, + project_name=project, + ) attrs = tool.GetAttrs() passthrough = attrs["TOOLB_PassThrough"] - variant = subset[len("render"):] return { # Required data "project": project, From 99637875efa176a7e462212880a5f4c26f2b6f78 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 6 Mar 2023 16:31:09 +0100 Subject: [PATCH 798/912] Do not secretly pop data that OP generates by default --- openpype/hosts/fusion/plugins/create/create_workfile.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/openpype/hosts/fusion/plugins/create/create_workfile.py b/openpype/hosts/fusion/plugins/create/create_workfile.py index c67a9793dd..e539dcf019 100644 --- a/openpype/hosts/fusion/plugins/create/create_workfile.py +++ b/openpype/hosts/fusion/plugins/create/create_workfile.py @@ -117,10 +117,4 @@ class FusionWorkfileCreator(AutoCreator): return qtawesome.icon("fa.file-o", color="white") def _imprint(self, comp, data): - - # TODO: Should this keys persist or not? I'd prefer not - # Do not persist the current context for the Workfile - for key in ["variant", "subset", "asset", "task"]: - data.pop(key, None) - comp.SetData(self.data_key, data) From b2eb14914b6644c8d5b3797751da74c37b804e83 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 6 Mar 2023 16:55:05 +0100 Subject: [PATCH 799/912] global, nuke: adding support for first workfile creation --- openpype/hosts/nuke/api/lib.py | 9 ++-- openpype/hosts/nuke/api/pipeline.py | 2 +- .../nuke/api/workfile_template_builder.py | 1 - openpype/hosts/nuke/api/workio.py | 2 +- .../workfile/workfile_template_builder.py | 46 +++++++++++++------ 5 files changed, 39 insertions(+), 21 deletions(-) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index cd31e42690..793dc8fcdd 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -2682,11 +2682,12 @@ def start_workfile_template_builder(): build_workfile_template ) - # to avoid looping of the callback, remove it! - # nuke.removeOnCreate(start_workfile_template_builder, nodeClass="Root") - log.info("Starting workfile template builder...") - build_workfile_template(run_from_callback=True) + # to avoid looping of the callback, remove it! + log.info("Starting workfile template builder...") + build_workfile_template(workfile_creation_enabled=True) + + nuke.removeOnCreate(start_workfile_template_builder, nodeClass="Root") @deprecated def recreate_instance(origin_node, avalon_data=None): diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py index 30270a4e5f..d649ffae7f 100644 --- a/openpype/hosts/nuke/api/pipeline.py +++ b/openpype/hosts/nuke/api/pipeline.py @@ -155,8 +155,8 @@ def add_nuke_callbacks(): # Set context settings. nuke.addOnCreate( workfile_settings.set_context_settings, nodeClass="Root") - nuke.addOnCreate(start_workfile_template_builder, nodeClass="Root") nuke.addOnCreate(workfile_settings.set_favorites, nodeClass="Root") + nuke.addOnCreate(start_workfile_template_builder, nodeClass="Root") nuke.addOnCreate(process_workfile_builder, nodeClass="Root") # fix ffmpeg settings on script diff --git a/openpype/hosts/nuke/api/workfile_template_builder.py b/openpype/hosts/nuke/api/workfile_template_builder.py index 80db0d160c..a6805d1b14 100644 --- a/openpype/hosts/nuke/api/workfile_template_builder.py +++ b/openpype/hosts/nuke/api/workfile_template_builder.py @@ -56,7 +56,6 @@ class NukeTemplateBuilder(AbstractTemplateBuilder): return True - class NukePlaceholderPlugin(PlaceholderPlugin): node_color = 4278190335 diff --git a/openpype/hosts/nuke/api/workio.py b/openpype/hosts/nuke/api/workio.py index 65b86bf01b..5692f8e63c 100644 --- a/openpype/hosts/nuke/api/workio.py +++ b/openpype/hosts/nuke/api/workio.py @@ -13,7 +13,7 @@ def has_unsaved_changes(): def save_file(filepath): path = filepath.replace("\\", "/") - nuke.scriptSaveAs(path) + nuke.scriptSaveAs(path, overwrite=1) nuke.Root()["name"].setValue(path) nuke.Root()["project_directory"].setValue(os.path.dirname(path)) nuke.Root().setModified(False) diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py index 3dd769447f..d578114de2 100644 --- a/openpype/pipeline/workfile/workfile_template_builder.py +++ b/openpype/pipeline/workfile/workfile_template_builder.py @@ -443,7 +443,7 @@ class AbstractTemplateBuilder(object): level_limit=None, keep_placeholders=None, create_first_version=None, - run_from_callback=False + workfile_creation_enabled=False ): """Main callback for building workfile from template path. @@ -461,7 +461,7 @@ class AbstractTemplateBuilder(object): hosts to decide if they want to remove placeholder after it is used. create_first_version (bool): create first version of a workfile - run_from_callback (bool): If True, it might create first version + workfile_creation_enabled (bool): If True, it might create first version but ignore process if version is created """ @@ -475,13 +475,25 @@ class AbstractTemplateBuilder(object): if create_first_version is None: create_first_version = template_preset["create_first_version"] - # run creation of first version only if it is - # run from callback and no new version is created - first_creation = False - if create_first_version and run_from_callback: - first_creation = not self.create_first_workfile_version() + # check if first version is created + created_version_workfile = self.create_first_workfile_version() - if first_creation: + # if first version is created, import template and populate placeholders + if ( + create_first_version + and workfile_creation_enabled + and created_version_workfile + ): + self.import_template(template_path) + self.populate_scene_placeholders( + level_limit, keep_placeholders) + + # save workfile after template is populated + self.save_workfile(created_version_workfile) + + # ignore process if first workfile is enabled + # but a version is already created + if workfile_creation_enabled: return self.import_template(template_path) @@ -546,20 +558,26 @@ class AbstractTemplateBuilder(object): host's template file. """ last_workfile_path = os.environ.get("AVALON_LAST_WORKFILE") + self.log.info("__ last_workfile_path: {}".format(last_workfile_path)) if os.path.exists(last_workfile_path): # ignore in case workfile existence self.log.info("Workfile already exists, skipping creation.") return False - # Save current scene, continue to open file - if isinstance(self.host, IWorkfileHost): - self.host.save_workfile(last_workfile_path) - else: - self.host.save_file(last_workfile_path) + # Create first version + self.log.info("Creating first version of workfile.") + self.save_workfile(last_workfile_path) # Confirm creation of first version - return True + return last_workfile_path + def save_workfile(self, workfile_path): + """Save workfile in current host.""" + # Save current scene, continue to open file + if isinstance(self.host, IWorkfileHost): + self.host.save_workfile(workfile_path) + else: + self.host.save_file(workfile_path) def _prepare_placeholders(self, placeholders): """Run preparation part for placeholders on plugins. From 6d9084b14424e6c41e859ce633f8b861f6619cd2 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 6 Mar 2023 16:58:17 +0100 Subject: [PATCH 800/912] Match workfile creator logic more with the one from After Effects --- .../fusion/plugins/create/create_workfile.py | 84 ++++++++----------- 1 file changed, 37 insertions(+), 47 deletions(-) diff --git a/openpype/hosts/fusion/plugins/create/create_workfile.py b/openpype/hosts/fusion/plugins/create/create_workfile.py index e539dcf019..19da2c36a6 100644 --- a/openpype/hosts/fusion/plugins/create/create_workfile.py +++ b/openpype/hosts/fusion/plugins/create/create_workfile.py @@ -13,17 +13,6 @@ from openpype.pipeline import ( ) -def flatten_dict(d, parent_key=None, separator="."): - items = [] - for key, v in d.items(): - new_key = parent_key + separator + key if parent_key else key - if isinstance(v, collections.MutableMapping): - items.extend(flatten_dict(v, new_key, separator=separator).items()) - else: - items.append((new_key, v)) - return dict(items) - - class FusionWorkfileCreator(AutoCreator): identifier = "workfile" family = "workfile" @@ -61,8 +50,9 @@ class FusionWorkfileCreator(AutoCreator): " Comp might have been closed in the meantime.") continue - new_data = created_inst.data_to_store() - self._imprint(comp, new_data) + # Imprint data into the comp + data = created_inst.data_to_store() + comp.SetData(self.data_key, data) def create(self, options=None): @@ -71,50 +61,50 @@ class FusionWorkfileCreator(AutoCreator): self.log.error("Unable to find current comp") return - # TODO: Is this really necessary? - # Force kill any existing "workfile" instances + existing_instance = None for instance in self.create_context.instances: if instance.family == self.family: - self.log.debug(f"Removing instance: {instance}") - self._remove_instance_from_context(instance) + existing_instance = instance + break project_name = legacy_io.Session["AVALON_PROJECT"] asset_name = legacy_io.Session["AVALON_ASSET"] task_name = legacy_io.Session["AVALON_TASK"] host_name = legacy_io.Session["AVALON_APP"] - asset_doc = get_asset_by_name(project_name, asset_name) - subset_name = self.get_subset_name( - self.default_variant, task_name, asset_doc, - project_name, host_name - ) - data = { - "asset": asset_name, - "task": task_name, - "variant": self.default_variant - } - data.update(self.get_dynamic_data( - self.default_variant, - task_name, - asset_doc, - project_name, - host_name, - data - )) + if existing_instance is None: + asset_doc = get_asset_by_name(project_name, asset_name) + subset_name = self.get_subset_name( + self.default_variant, task_name, asset_doc, + project_name, host_name + ) + data = { + "asset": asset_name, + "task": task_name, + "variant": self.default_variant + } + data.update(self.get_dynamic_data( + self.default_variant, task_name, asset_doc, + project_name, host_name, None + )) - instance = CreatedInstance( - family=self.family, - subset_name=subset_name, - data=data, - creator=self - ) - instance.transient_data["comp"] = comp - self._add_instance_to_context(instance) + new_instance = CreatedInstance( + self.family, subset_name, data, self + ) + self._add_instance_to_context(new_instance) - self._imprint(comp, data) + elif ( + existing_instance["asset"] != asset_name + or existing_instance["task"] != task_name + ): + asset_doc = get_asset_by_name(project_name, asset_name) + subset_name = self.get_subset_name( + self.default_variant, task_name, asset_doc, + project_name, host_name + ) + existing_instance["asset"] = asset_name + existing_instance["task"] = task_name + existing_instance["subset"] = subset_name def get_icon(self): return qtawesome.icon("fa.file-o", color="white") - - def _imprint(self, comp, data): - comp.SetData(self.data_key, data) From 52fac29164d279823a72b15a1ad5ac4c1b57b8b6 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 6 Mar 2023 17:07:15 +0100 Subject: [PATCH 801/912] Cleanup unused import --- openpype/hosts/fusion/plugins/create/create_workfile.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/openpype/hosts/fusion/plugins/create/create_workfile.py b/openpype/hosts/fusion/plugins/create/create_workfile.py index 19da2c36a6..2f78e4fe52 100644 --- a/openpype/hosts/fusion/plugins/create/create_workfile.py +++ b/openpype/hosts/fusion/plugins/create/create_workfile.py @@ -1,5 +1,3 @@ -import collections - import qtawesome from openpype.hosts.fusion.api import ( From af393688389346fc590a504514d4eb8de0c375ce Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 6 Mar 2023 17:07:56 +0100 Subject: [PATCH 802/912] hound --- openpype/hosts/nuke/api/lib.py | 2 +- openpype/hosts/nuke/api/workfile_template_builder.py | 4 ---- openpype/pipeline/workfile/workfile_template_builder.py | 8 +++++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index 793dc8fcdd..a5a631cc70 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -2682,11 +2682,11 @@ def start_workfile_template_builder(): build_workfile_template ) - # to avoid looping of the callback, remove it! log.info("Starting workfile template builder...") build_workfile_template(workfile_creation_enabled=True) + # remove callback since it would be duplicating the workfile nuke.removeOnCreate(start_workfile_template_builder, nodeClass="Root") @deprecated diff --git a/openpype/hosts/nuke/api/workfile_template_builder.py b/openpype/hosts/nuke/api/workfile_template_builder.py index a6805d1b14..fb0afb3d55 100644 --- a/openpype/hosts/nuke/api/workfile_template_builder.py +++ b/openpype/hosts/nuke/api/workfile_template_builder.py @@ -1,8 +1,5 @@ -import os import collections - import nuke - from openpype.pipeline import registered_host from openpype.pipeline.workfile.workfile_template_builder import ( AbstractTemplateBuilder, @@ -15,7 +12,6 @@ from openpype.pipeline.workfile.workfile_template_builder import ( from openpype.tools.workfile_template_build import ( WorkfileBuildPlaceholderDialog, ) -from openpype.host import IWorkfileHost from .lib import ( find_free_space_to_paste_nodes, get_extreme_positions, diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py index d578114de2..0ce59de8ad 100644 --- a/openpype/pipeline/workfile/workfile_template_builder.py +++ b/openpype/pipeline/workfile/workfile_template_builder.py @@ -461,8 +461,9 @@ class AbstractTemplateBuilder(object): hosts to decide if they want to remove placeholder after it is used. create_first_version (bool): create first version of a workfile - workfile_creation_enabled (bool): If True, it might create first version - but ignore process if version is created + workfile_creation_enabled (bool): If True, it might create + first version but ignore + process if version is created """ template_preset = self.get_template_preset() @@ -478,7 +479,8 @@ class AbstractTemplateBuilder(object): # check if first version is created created_version_workfile = self.create_first_workfile_version() - # if first version is created, import template and populate placeholders + # if first version is created, import template + # and populate placeholders if ( create_first_version and workfile_creation_enabled From de50783c0435ec75a8ac7d9b29068c96a7bab8de Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 6 Mar 2023 18:34:56 +0100 Subject: [PATCH 803/912] Nuke: Add option to use new creating system in workfile template builder (#4545) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * added option to use new creating system in workfile template builder * fix spaces * use 'create' method on create context to trigger creation * fix attribute access * adding headless to creators and workfile builder abstraction * adding noqa for hound * hound --------- Co-authored-by: Jakub Jezek Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com> --- .../maya/api/workfile_template_builder.py | 2 + openpype/hosts/nuke/api/plugin.py | 6 +- .../nuke/plugins/create/create_write_image.py | 2 +- .../plugins/create/create_write_prerender.py | 2 +- .../plugins/create/create_write_render.py | 2 +- .../workfile/workfile_template_builder.py | 97 ++++++++++++++----- 6 files changed, 81 insertions(+), 30 deletions(-) diff --git a/openpype/hosts/maya/api/workfile_template_builder.py b/openpype/hosts/maya/api/workfile_template_builder.py index 2f550e787a..90ab6e21e0 100644 --- a/openpype/hosts/maya/api/workfile_template_builder.py +++ b/openpype/hosts/maya/api/workfile_template_builder.py @@ -22,6 +22,8 @@ PLACEHOLDER_SET = "PLACEHOLDERS_SET" class MayaTemplateBuilder(AbstractTemplateBuilder): """Concrete implementation of AbstractTemplateBuilder for maya""" + use_legacy_creators = True + def import_template(self, path): """Import template into current scene. Block if a template is already loaded. diff --git a/openpype/hosts/nuke/api/plugin.py b/openpype/hosts/nuke/api/plugin.py index 6c2d4b84be..aec87be5ab 100644 --- a/openpype/hosts/nuke/api/plugin.py +++ b/openpype/hosts/nuke/api/plugin.py @@ -239,7 +239,11 @@ class NukeCreator(NewCreator): def get_pre_create_attr_defs(self): return [ - BoolDef("use_selection", label="Use selection") + BoolDef( + "use_selection", + default=not self.create_context.headless, + label="Use selection" + ) ] def get_creator_settings(self, project_settings, settings_key=None): diff --git a/openpype/hosts/nuke/plugins/create/create_write_image.py b/openpype/hosts/nuke/plugins/create/create_write_image.py index 1e23b3ad7f..d38253ab2f 100644 --- a/openpype/hosts/nuke/plugins/create/create_write_image.py +++ b/openpype/hosts/nuke/plugins/create/create_write_image.py @@ -35,7 +35,7 @@ class CreateWriteImage(napi.NukeWriteCreator): attr_defs = [ BoolDef( "use_selection", - default=True, + default=not self.create_context.headless, label="Use selection" ), self._get_render_target_enum(), diff --git a/openpype/hosts/nuke/plugins/create/create_write_prerender.py b/openpype/hosts/nuke/plugins/create/create_write_prerender.py index 1603bf17e3..8103cb7c4d 100644 --- a/openpype/hosts/nuke/plugins/create/create_write_prerender.py +++ b/openpype/hosts/nuke/plugins/create/create_write_prerender.py @@ -34,7 +34,7 @@ class CreateWritePrerender(napi.NukeWriteCreator): attr_defs = [ BoolDef( "use_selection", - default=True, + default=not self.create_context.headless, label="Use selection" ), self._get_render_target_enum() diff --git a/openpype/hosts/nuke/plugins/create/create_write_render.py b/openpype/hosts/nuke/plugins/create/create_write_render.py index 72fcb4f232..23efa62e36 100644 --- a/openpype/hosts/nuke/plugins/create/create_write_render.py +++ b/openpype/hosts/nuke/plugins/create/create_write_render.py @@ -31,7 +31,7 @@ class CreateWriteRender(napi.NukeWriteCreator): attr_defs = [ BoolDef( "use_selection", - default=True, + default=not self.create_context.headless, label="Use selection" ), self._get_render_target_enum() diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py index 119e4aaeb7..27214af79f 100644 --- a/openpype/pipeline/workfile/workfile_template_builder.py +++ b/openpype/pipeline/workfile/workfile_template_builder.py @@ -43,7 +43,8 @@ from openpype.pipeline.load import ( load_with_repre_context, ) from openpype.pipeline.create import ( - discover_legacy_creator_plugins + discover_legacy_creator_plugins, + CreateContext, ) @@ -91,6 +92,7 @@ class AbstractTemplateBuilder(object): """ _log = None + use_legacy_creators = False def __init__(self, host): # Get host name @@ -110,6 +112,7 @@ class AbstractTemplateBuilder(object): self._placeholder_plugins = None self._loaders_by_name = None self._creators_by_name = None + self._create_context = None self._system_settings = None self._project_settings = None @@ -171,6 +174,16 @@ class AbstractTemplateBuilder(object): .get("type") ) + @property + def create_context(self): + if self._create_context is None: + self._create_context = CreateContext( + self.host, + discover_publish_plugins=False, + headless=True + ) + return self._create_context + def get_placeholder_plugin_classes(self): """Get placeholder plugin classes that can be used to build template. @@ -235,18 +248,29 @@ class AbstractTemplateBuilder(object): self._loaders_by_name = get_loaders_by_name() return self._loaders_by_name + def _collect_legacy_creators(self): + creators_by_name = {} + for creator in discover_legacy_creator_plugins(): + if not creator.enabled: + continue + creator_name = creator.__name__ + if creator_name in creators_by_name: + raise KeyError( + "Duplicated creator name {} !".format(creator_name) + ) + creators_by_name[creator_name] = creator + self._creators_by_name = creators_by_name + + def _collect_creators(self): + self._creators_by_name = dict(self.create_context.creators) + def get_creators_by_name(self): if self._creators_by_name is None: - self._creators_by_name = {} - for creator in discover_legacy_creator_plugins(): - if not creator.enabled: - continue - creator_name = creator.__name__ - if creator_name in self._creators_by_name: - raise KeyError( - "Duplicated creator name {} !".format(creator_name) - ) - self._creators_by_name[creator_name] = creator + if self.use_legacy_creators: + self._collect_legacy_creators() + else: + self._collect_creators() + return self._creators_by_name def get_shared_data(self, key): @@ -1579,6 +1603,8 @@ class PlaceholderCreateMixin(object): placeholder (PlaceholderItem): Placeholder item with information about requested publishable instance. """ + + legacy_create = self.builder.use_legacy_creators creator_name = placeholder.data["creator"] create_variant = placeholder.data["create_variant"] @@ -1589,17 +1615,28 @@ class PlaceholderCreateMixin(object): task_name = legacy_io.Session["AVALON_TASK"] asset_name = legacy_io.Session["AVALON_ASSET"] - # get asset id - asset_doc = get_asset_by_name(project_name, asset_name, fields=["_id"]) - assert asset_doc, "No current asset found in Session" - asset_id = asset_doc['_id'] + if legacy_create: + asset_doc = get_asset_by_name( + project_name, asset_name, fields=["_id"] + ) + assert asset_doc, "No current asset found in Session" + subset_name = creator_plugin.get_subset_name( + create_variant, + task_name, + asset_doc["_id"], + project_name + ) - subset_name = creator_plugin.get_subset_name( - create_variant, - task_name, - asset_id, - project_name - ) + else: + asset_doc = get_asset_by_name(project_name, asset_name) + assert asset_doc, "No current asset found in Session" + subset_name = creator_plugin.get_subset_name( + create_variant, + task_name, + asset_doc, + project_name, + self.builder.host_name + ) creator_data = { "creator_name": creator_name, @@ -1612,12 +1649,20 @@ class PlaceholderCreateMixin(object): # compile subset name from variant try: - creator_instance = creator_plugin( - subset_name, - asset_name - ).process() + if legacy_create: + creator_instance = creator_plugin( + subset_name, + asset_name + ).process() + else: + creator_instance = self.builder.create_context.create( + creator_plugin.identifier, + create_variant, + asset_doc, + task_name=task_name + ) - except Exception: + except: # noqa: E722 failed = True self.create_failed(placeholder, creator_data) From 16cece3e499b0336e490b1ac0bf01d69f715d0f6 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 6 Mar 2023 19:45:17 +0100 Subject: [PATCH 804/912] Fusion: get filepath from representation instead of listing files from publish folder --- .../fusion/plugins/load/load_sequence.py | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/openpype/hosts/fusion/plugins/load/load_sequence.py b/openpype/hosts/fusion/plugins/load/load_sequence.py index 6f44c61d1b..9daf4b007d 100644 --- a/openpype/hosts/fusion/plugins/load/load_sequence.py +++ b/openpype/hosts/fusion/plugins/load/load_sequence.py @@ -1,11 +1,9 @@ -import os import contextlib -from openpype.client import get_version_by_id -from openpype.pipeline import ( - load, - legacy_io, - get_representation_path, +import openpype.pipeline.load as load +from openpype.pipeline.load import ( + get_representation_context, + get_representation_path_from_context ) from openpype.hosts.fusion.api import ( imprint_container, @@ -141,7 +139,7 @@ class FusionLoadSequence(load.LoaderPlugin): namespace = context['asset']['name'] # Use the first file for now - path = self._get_first_image(os.path.dirname(self.fname)) + path = get_representation_path_from_context(context) # Create the Loader with the filename path set comp = get_current_comp() @@ -210,13 +208,11 @@ class FusionLoadSequence(load.LoaderPlugin): assert tool.ID == "Loader", "Must be Loader" comp = tool.Comp() - root = os.path.dirname(get_representation_path(representation)) - path = self._get_first_image(root) + context = get_representation_context(representation) + path = get_representation_path_from_context(context) # Get start frame from version data - project_name = legacy_io.active_project() - version = get_version_by_id(project_name, representation["parent"]) - start = self._get_start(version, tool) + start = self._get_start(context["version"], tool) with comp_lock_and_undo_chunk(comp, "Update Loader"): @@ -249,11 +245,6 @@ class FusionLoadSequence(load.LoaderPlugin): with comp_lock_and_undo_chunk(comp, "Remove Loader"): tool.Delete() - def _get_first_image(self, root): - """Get first file in representation root""" - files = sorted(os.listdir(root)) - return os.path.join(root, files[0]) - def _get_start(self, version_doc, tool): """Return real start frame of published files (incl. handles)""" data = version_doc["data"] From bc1ef9229c2250aa0be84917bf6bc23e9ec65354 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 7 Mar 2023 10:39:20 +0100 Subject: [PATCH 805/912] Photoshop: context is not changed in publisher (#4570) * OP-5025 - fix - proper changing of context When PS is already opened, new opening from different context should change it. * OP-5025 - open last workfile for new context if present * OP-5025 - remove unneeded assignemnt * OP-5025 - removed whitespace --- openpype/hosts/photoshop/api/launch_logic.py | 79 ++++++++++++++++---- 1 file changed, 63 insertions(+), 16 deletions(-) diff --git a/openpype/hosts/photoshop/api/launch_logic.py b/openpype/hosts/photoshop/api/launch_logic.py index a4377a9972..89ba6ad4e6 100644 --- a/openpype/hosts/photoshop/api/launch_logic.py +++ b/openpype/hosts/photoshop/api/launch_logic.py @@ -10,10 +10,20 @@ from wsrpc_aiohttp import ( from qtpy import QtCore -from openpype.lib import Logger -from openpype.pipeline import legacy_io +from openpype.lib import Logger, StringTemplate +from openpype.pipeline import ( + registered_host, + Anatomy, +) +from openpype.pipeline.workfile import ( + get_workfile_template_key_from_context, + get_last_workfile, +) +from openpype.pipeline.template_data import get_template_data_with_names from openpype.tools.utils import host_tools from openpype.tools.adobe_webserver.app import WebServerTool +from openpype.pipeline.context_tools import change_current_context +from openpype.client import get_asset_by_name from .ws_stub import PhotoshopServerStub @@ -310,23 +320,28 @@ class PhotoshopRoute(WebSocketRoute): # client functions async def set_context(self, project, asset, task): """ - Sets 'project' and 'asset' to envs, eg. setting context + Sets 'project' and 'asset' to envs, eg. setting context. - Args: - project (str) - asset (str) + Opens last workile from that context if exists. + + Args: + project (str) + asset (str) + task (str """ log.info("Setting context change") - log.info("project {} asset {} ".format(project, asset)) - if project: - legacy_io.Session["AVALON_PROJECT"] = project - os.environ["AVALON_PROJECT"] = project - if asset: - legacy_io.Session["AVALON_ASSET"] = asset - os.environ["AVALON_ASSET"] = asset - if task: - legacy_io.Session["AVALON_TASK"] = task - os.environ["AVALON_TASK"] = task + log.info(f"project {project} asset {asset} task {task}") + + asset_doc = get_asset_by_name(project, asset) + change_current_context(asset_doc, task) + + last_workfile_path = self._get_last_workfile_path(project, + asset, + task) + if last_workfile_path and os.path.exists(last_workfile_path): + ProcessLauncher.execute_in_main_thread( + lambda: stub().open(last_workfile_path)) + async def read(self): log.debug("photoshop.read client calls server server calls " @@ -356,3 +371,35 @@ class PhotoshopRoute(WebSocketRoute): # Required return statement. return "nothing" + + def _get_last_workfile_path(self, project_name, asset_name, task_name): + """Returns last workfile path if exists""" + host = registered_host() + host_name = "photoshop" + template_key = get_workfile_template_key_from_context( + asset_name, + task_name, + host_name, + project_name=project_name + ) + anatomy = Anatomy(project_name) + + data = get_template_data_with_names( + project_name, asset_name, task_name, host_name + ) + data["root"] = anatomy.roots + + file_template = anatomy.templates[template_key]["file"] + + # Define saving file extension + extensions = host.get_workfile_extensions() + + folder_template = anatomy.templates[template_key]["folder"] + work_root = StringTemplate.format_strict_template( + folder_template, data + ) + last_workfile_path = get_last_workfile( + work_root, file_template, data, extensions, True + ) + + return last_workfile_path From 73e0ba9cb266507c0f7ea562d6895bcd2dbaaddb Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 10:53:06 +0100 Subject: [PATCH 806/912] Set colorspace based on file rules in imageio settings --- openpype/hosts/fusion/plugins/publish/render_local.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index 0eca7f6cdd..212242630b 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -1,9 +1,11 @@ import os import pyblish.api +from openpype.pipeline import publish from openpype.hosts.fusion.api import comp_lock_and_undo_chunk -class Fusionlocal(pyblish.api.InstancePlugin): +class Fusionlocal(pyblish.api.InstancePlugin, + publish.ColormanagedPyblishPluginMixin): """Render the current Fusion composition locally. Extract the result of savers by starting a comp render @@ -50,6 +52,11 @@ class Fusionlocal(pyblish.api.InstancePlugin): "stagingDir": output_dir, } + self.set_representation_colorspace( + representation=repre, + context=context, + ) + if "representations" not in instance.data: instance.data["representations"] = [] instance.data["representations"].append(repre) From 1bb7dbc9d9707335d246e9a7a924859c1d09fd84 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 10:55:40 +0100 Subject: [PATCH 807/912] Make sure repre preview copy is a deepcopy --- openpype/hosts/fusion/plugins/publish/render_local.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index 212242630b..9ed17f23c6 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -1,4 +1,6 @@ import os +import copy + import pyblish.api from openpype.pipeline import publish from openpype.hosts.fusion.api import comp_lock_and_undo_chunk @@ -62,7 +64,7 @@ class Fusionlocal(pyblish.api.InstancePlugin, instance.data["representations"].append(repre) # review representation - repre_preview = repre.copy() + repre_preview = copy.deepcopy(repre) repre_preview["name"] = repre_preview["ext"] = "mp4" repre_preview["tags"] = ["review", "ftrackreview", "delete"] instance.data["representations"].append(repre_preview) From 70611ee884d63400e9466deaa66be7beb89d0003 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 11:36:12 +0100 Subject: [PATCH 808/912] Make sure to add the `comp` transient data for new instances --- openpype/hosts/fusion/plugins/create/create_workfile.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/fusion/plugins/create/create_workfile.py b/openpype/hosts/fusion/plugins/create/create_workfile.py index 2f78e4fe52..0bb3a0d3d4 100644 --- a/openpype/hosts/fusion/plugins/create/create_workfile.py +++ b/openpype/hosts/fusion/plugins/create/create_workfile.py @@ -89,6 +89,7 @@ class FusionWorkfileCreator(AutoCreator): new_instance = CreatedInstance( self.family, subset_name, data, self ) + new_instance.transient_data["comp"] = comp self._add_instance_to_context(new_instance) elif ( From 113b958369ae9853a3e9872a00d5c925d359b381 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 12:05:58 +0100 Subject: [PATCH 809/912] Collect Fusion workfile representation --- .../plugins/publish/collect_workfile.py | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 openpype/hosts/fusion/plugins/publish/collect_workfile.py diff --git a/openpype/hosts/fusion/plugins/publish/collect_workfile.py b/openpype/hosts/fusion/plugins/publish/collect_workfile.py new file mode 100644 index 0000000000..4c288edb3e --- /dev/null +++ b/openpype/hosts/fusion/plugins/publish/collect_workfile.py @@ -0,0 +1,26 @@ +import os + +import pyblish.api + + +class CollectFusionWorkfile(pyblish.api.InstancePlugin): + """Collect Fusion workfile representation.""" + + order = pyblish.api.CollectorOrder + 0.1 + label = "Collect Workfile" + hosts = ["fusion"] + families = ["workfile"] + + def process(self, instance): + + current_file = instance.context.data["currentFile"] + + folder, file = os.path.split(current_file) + filename, ext = os.path.splitext(file) + + instance.data['representations'] = [{ + 'name': ext.lstrip("."), + 'ext': ext.lstrip("."), + 'files': file, + "stagingDir": folder, + }] From b3636b9f558ace05722798e2343fcbc01ba55ca4 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 7 Mar 2023 13:45:49 +0100 Subject: [PATCH 810/912] General: Input representation ids are not ObjectIds (#4576) * input representation ids are not ObjectIds during publishing * changed set back to list * use 'setdefault' to set 'inputVersions' * added default value to 'get' * Use default value in second loop too Co-authored-by: Roy Nieterau * simplify variable assignment Co-authored-by: Roy Nieterau --------- Co-authored-by: Roy Nieterau --- .../fusion/plugins/publish/collect_inputs.py | 5 +---- .../houdini/plugins/publish/collect_inputs.py | 5 +---- .../hosts/maya/plugins/publish/collect_inputs.py | 4 +--- .../collect_input_representations_to_versions.py | 15 ++++++++------- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/collect_inputs.py b/openpype/hosts/fusion/plugins/publish/collect_inputs.py index 8f9857b02f..b6619fdcd6 100644 --- a/openpype/hosts/fusion/plugins/publish/collect_inputs.py +++ b/openpype/hosts/fusion/plugins/publish/collect_inputs.py @@ -1,5 +1,3 @@ -from bson.objectid import ObjectId - import pyblish.api from openpype.pipeline import registered_host @@ -108,7 +106,6 @@ class CollectUpstreamInputs(pyblish.api.InstancePlugin): # Collect containers for the given set of nodes containers = collect_input_containers(nodes) - inputs = [ObjectId(c["representation"]) for c in containers] + inputs = [c["representation"] for c in containers] instance.data["inputRepresentations"] = inputs - self.log.info("Collected inputs: %s" % inputs) diff --git a/openpype/hosts/houdini/plugins/publish/collect_inputs.py b/openpype/hosts/houdini/plugins/publish/collect_inputs.py index 0b54b244bb..6411376ea3 100644 --- a/openpype/hosts/houdini/plugins/publish/collect_inputs.py +++ b/openpype/hosts/houdini/plugins/publish/collect_inputs.py @@ -1,5 +1,3 @@ -from bson.objectid import ObjectId - import pyblish.api from openpype.pipeline import registered_host @@ -117,7 +115,6 @@ class CollectUpstreamInputs(pyblish.api.InstancePlugin): # Collect containers for the given set of nodes containers = collect_input_containers(nodes) - inputs = [ObjectId(c["representation"]) for c in containers] + inputs = [c["representation"] for c in containers] instance.data["inputRepresentations"] = inputs - self.log.info("Collected inputs: %s" % inputs) diff --git a/openpype/hosts/maya/plugins/publish/collect_inputs.py b/openpype/hosts/maya/plugins/publish/collect_inputs.py index 470fceffc9..9c3f0f5efa 100644 --- a/openpype/hosts/maya/plugins/publish/collect_inputs.py +++ b/openpype/hosts/maya/plugins/publish/collect_inputs.py @@ -1,5 +1,4 @@ import copy -from bson.objectid import ObjectId from maya import cmds import maya.api.OpenMaya as om @@ -165,9 +164,8 @@ class CollectUpstreamInputs(pyblish.api.InstancePlugin): containers = collect_input_containers(scene_containers, nodes) - inputs = [ObjectId(c["representation"]) for c in containers] + inputs = [c["representation"] for c in containers] instance.data["inputRepresentations"] = inputs - self.log.info("Collected inputs: %s" % inputs) def _collect_renderlayer_inputs(self, scene_containers, instance): diff --git a/openpype/plugins/publish/collect_input_representations_to_versions.py b/openpype/plugins/publish/collect_input_representations_to_versions.py index 18a19bce80..54a3214647 100644 --- a/openpype/plugins/publish/collect_input_representations_to_versions.py +++ b/openpype/plugins/publish/collect_input_representations_to_versions.py @@ -23,7 +23,8 @@ class CollectInputRepresentationsToVersions(pyblish.api.ContextPlugin): representations = set() for instance in context: inst_repre = instance.data.get("inputRepresentations", []) - representations.update(inst_repre) + if inst_repre: + representations.update(inst_repre) representations_docs = get_representations( project_name=context.data["projectEntity"]["name"], @@ -31,7 +32,8 @@ class CollectInputRepresentationsToVersions(pyblish.api.ContextPlugin): fields=["_id", "parent"]) representation_id_to_version_id = { - repre["_id"]: repre["parent"] for repre in representations_docs + str(repre["_id"]): repre["parent"] + for repre in representations_docs } for instance in context: @@ -39,9 +41,8 @@ class CollectInputRepresentationsToVersions(pyblish.api.ContextPlugin): if not inst_repre: continue - input_versions = instance.data.get("inputVersions", []) + input_versions = instance.data.setdefault("inputVersions", []) for repre_id in inst_repre: - repre_id = ObjectId(repre_id) - version_id = representation_id_to_version_id[repre_id] - input_versions.append(version_id) - instance.data["inputVersions"] = input_versions + version_id = representation_id_to_version_id.get(repre_id) + if version_id: + input_versions.append(version_id) From f94fb76a238c5fc24ff26d84061fc7f7f5d5c90f Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 13:56:53 +0100 Subject: [PATCH 811/912] Update OCIO config hook to use the correct imageio settings --- .../fusion/hooks/pre_fusion_ocio_hook.py | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_ocio_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_ocio_hook.py index d1ae5f64fd..6bf0f55081 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_ocio_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_ocio_hook.py @@ -1,7 +1,7 @@ -import os -import platform +from openpype.lib import PreLaunchHook -from openpype.lib import PreLaunchHook, ApplicationLaunchFailed +from openpype.pipeline.colorspace import get_imageio_config +from openpype.pipeline.template_data import get_template_data_with_names class FusionPreLaunchOCIO(PreLaunchHook): @@ -11,24 +11,22 @@ class FusionPreLaunchOCIO(PreLaunchHook): def execute(self): """Hook entry method.""" - # get image io - project_settings = self.data["project_settings"] + template_data = get_template_data_with_names( + project_name=self.data["project_name"], + asset_name=self.data["asset_name"], + task_name=self.data["task_name"], + host_name=self.host_name, + system_settings=self.data["system_settings"] + ) - # make sure anatomy settings are having flame key - imageio_fusion = project_settings["fusion"]["imageio"] - - ocio = imageio_fusion.get("ocio") - enabled = ocio.get("enabled", False) - if not enabled: - return - - platform_key = platform.system().lower() - ocio_path = ocio["configFilePath"][platform_key] - if not ocio_path: - raise ApplicationLaunchFailed( - "Fusion OCIO is enabled in project settings but no OCIO config" - f"path is set for your current platform: {platform_key}" - ) + config_data = get_imageio_config( + project_name=self.data["project_name"], + host_name=self.host_name, + project_settings=self.data["project_settings"], + anatomy_data=template_data, + anatomy=self.data["anatomy"] + ) + ocio_path = config_data["path"] self.log.info(f"Setting OCIO config path: {ocio_path}") - self.launch_context.env["OCIO"] = os.pathsep.join(ocio_path) + self.launch_context.env["OCIO"] = ocio_path From d47f0054deb49827890ad3b070e282d74aa2c62a Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 14:38:42 +0100 Subject: [PATCH 812/912] Fix actions --- .../hosts/fusion/plugins/publish/validate_background_depth.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/validate_background_depth.py b/openpype/hosts/fusion/plugins/publish/validate_background_depth.py index 261533de01..db2c4f0dd9 100644 --- a/openpype/hosts/fusion/plugins/publish/validate_background_depth.py +++ b/openpype/hosts/fusion/plugins/publish/validate_background_depth.py @@ -11,12 +11,11 @@ class ValidateBackgroundDepth(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder label = "Validate Background Depth 32 bit" - actions = [RepairAction] hosts = ["fusion"] families = ["render"] optional = True - actions = [SelectInvalidAction] + actions = [SelectInvalidAction, RepairAction] @classmethod def get_invalid(cls, instance): From b4727101c969689fb8bebbfc7afde20680da7dfb Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 14:39:20 +0100 Subject: [PATCH 813/912] Directly collect comp frame ranges in Collect comp --- .../fusion/plugins/publish/collect_comp.py | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/collect_comp.py b/openpype/hosts/fusion/plugins/publish/collect_comp.py index dfa540fa7f..911071c9a0 100644 --- a/openpype/hosts/fusion/plugins/publish/collect_comp.py +++ b/openpype/hosts/fusion/plugins/publish/collect_comp.py @@ -1,10 +1,26 @@ -import os - import pyblish.api from openpype.hosts.fusion.api import get_current_comp +def get_comp_render_range(comp): + """Return comp's start-end render range and global start-end range.""" + comp_attrs = comp.GetAttrs() + start = comp_attrs["COMPN_RenderStart"] + end = comp_attrs["COMPN_RenderEnd"] + global_start = comp_attrs["COMPN_GlobalStart"] + global_end = comp_attrs["COMPN_GlobalEnd"] + + # Whenever render ranges are undefined fall back + # to the comp's global start and end + if start == -1000000000: + start = global_start + if end == -1000000000: + end = global_end + + return start, end, global_start, global_end + + class CollectCurrentCompFusion(pyblish.api.ContextPlugin): """Collect current comp""" @@ -15,10 +31,17 @@ class CollectCurrentCompFusion(pyblish.api.ContextPlugin): def process(self, context): """Collect all image sequence tools""" - current_comp = get_current_comp() - assert current_comp, "Must have active Fusion composition" - context.data["currentComp"] = current_comp + comp = get_current_comp() + assert comp, "Must have active Fusion composition" + context.data["currentComp"] = comp # Store path to current file - filepath = current_comp.GetAttrs().get("COMPS_FileName", "") + filepath = comp.GetAttrs().get("COMPS_FileName", "") context.data['currentFile'] = filepath + + # Store comp render ranges + start, end, global_start, global_end = get_comp_render_range(comp) + context.data["frameStart"] = int(start) + context.data["frameEnd"] = int(end) + context.data["frameStartHandle"] = int(global_start) + context.data["frameEndHandle"] = int(global_end) From a4ae05086cbbd7968b37801c3a70f0a763ab487e Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 14:41:16 +0100 Subject: [PATCH 814/912] Allow to enable/disable review per saver instance + Don't create a copy of representation for review but just mark representation as review + Change Collect instances into InstancePlugin to just collect instance data per instance --- .../fusion/plugins/create/create_saver.py | 10 ++ .../plugins/publish/collect_instances.py | 122 ++++++++---------- .../fusion/plugins/publish/render_local.py | 6 +- 3 files changed, 66 insertions(+), 72 deletions(-) diff --git a/openpype/hosts/fusion/plugins/create/create_saver.py b/openpype/hosts/fusion/plugins/create/create_saver.py index b0c0d830a3..bf11dc95c5 100644 --- a/openpype/hosts/fusion/plugins/create/create_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_saver.py @@ -7,6 +7,7 @@ from openpype.hosts.fusion.api import ( comp_lock_and_undo_chunk ) +from openpype.lib import BoolDef from openpype.pipeline import ( legacy_io, Creator, @@ -192,3 +193,12 @@ class CreateSaver(Creator): return return data + + def get_instance_attr_defs(self): + return [ + BoolDef( + "review", + default=True, + label="Review" + ) + ] diff --git a/openpype/hosts/fusion/plugins/publish/collect_instances.py b/openpype/hosts/fusion/plugins/publish/collect_instances.py index 4e5e151789..1e6d095cc2 100644 --- a/openpype/hosts/fusion/plugins/publish/collect_instances.py +++ b/openpype/hosts/fusion/plugins/publish/collect_instances.py @@ -3,25 +3,7 @@ import os import pyblish.api -def get_comp_render_range(comp): - """Return comp's start-end render range and global start-end range.""" - comp_attrs = comp.GetAttrs() - start = comp_attrs["COMPN_RenderStart"] - end = comp_attrs["COMPN_RenderEnd"] - global_start = comp_attrs["COMPN_GlobalStart"] - global_end = comp_attrs["COMPN_GlobalEnd"] - - # Whenever render ranges are undefined fall back - # to the comp's global start and end - if start == -1000000000: - start = global_start - if end == -1000000000: - end = global_end - - return start, end, global_start, global_end - - -class CollectInstances(pyblish.api.ContextPlugin): +class CollectInstanceData(pyblish.api.InstancePlugin): """Collect Fusion saver instances This additionally stores the Comp start and end render range in the @@ -33,59 +15,63 @@ class CollectInstances(pyblish.api.ContextPlugin): label = "Collect Instances Data" hosts = ["fusion"] - def process(self, context): + def process(self, instance): """Collect all image sequence tools""" - from openpype.hosts.fusion.api.lib import get_frame_path + context = instance.context - comp = context.data["currentComp"] - start, end, global_start, global_end = get_comp_render_range(comp) - context.data["frameStart"] = int(start) - context.data["frameEnd"] = int(end) - context.data["frameStartHandle"] = int(global_start) - context.data["frameEndHandle"] = int(global_end) + # Include creator attributes directly as instance data + creator_attributes = instance.data["creator_attributes"] + instance.data.update(creator_attributes) + + # Include start and end render frame in label + subset = instance.data["subset"] + start = context.data["frameStart"] + end = context.data["frameEnd"] + label = "{subset} ({start}-{end})".format(subset=subset, + start=int(start), + end=int(end)) + instance.data.update({ + "label": label, + + # todo: Allow custom frame range per instance + "frameStart": context.data["frameStart"], + "frameEnd": context.data["frameEnd"], + "frameStartHandle": context.data["frameStartHandle"], + "frameEndHandle": context.data["frameStartHandle"], + "fps": context.data["fps"], + }) + + # Add review family if the instance is marked as 'review' + # This could be done through a 'review' Creator attribute. + if instance.data.get("review", False): + self.log.info("Adding review family..") + instance.data["families"].append("review") + + if instance.data["family"] == "render": + # TODO: This should probably move into a collector of + # its own for the "render" family + from openpype.hosts.fusion.api.lib import get_frame_path + comp = context.data["currentComp"] + + # This is only the case for savers currently but not + # for workfile instances. So we assume saver here. + tool = instance.data["transientData"]["tool"] + path = tool["Clip"][comp.TIME_UNDEFINED] + + filename = os.path.basename(path) + head, padding, tail = get_frame_path(filename) + ext = os.path.splitext(path)[1] + assert tail == ext, ("Tail does not match %s" % ext) - for instance in context: - # Include start and end render frame in label - subset = instance.data["subset"] - label = "{subset} ({start}-{end})".format(subset=subset, - start=int(start), - end=int(end)) instance.data.update({ - "label": label, - # todo: Allow custom frame range per instance - "task": context.data["task"], - "frameStart": context.data["frameStart"], - "frameEnd": context.data["frameEnd"], - "frameStartHandle": context.data["frameStartHandle"], - "frameEndHandle": context.data["frameStartHandle"], - "fps": context.data["fps"], + "path": path, + "outputDir": os.path.dirname(path), + "ext": ext, # todo: should be redundant? + + # Backwards compatibility: embed tool in instance.data + "tool": tool }) - if instance.data["family"] == "render": - # TODO: This should probably move into a collector of - # its own for the "render" family - # This is only the case for savers currently but not - # for workfile instances. So we assume saver here. - tool = instance.data["transientData"]["tool"] - path = tool["Clip"][comp.TIME_UNDEFINED] - - filename = os.path.basename(path) - head, padding, tail = get_frame_path(filename) - ext = os.path.splitext(path)[1] - assert tail == ext, ("Tail does not match %s" % ext) - - instance.data.update({ - "path": path, - "outputDir": os.path.dirname(path), - "ext": ext, # todo: should be redundant? - - "families": ["render", "review"], - "family": "render", - - # Backwards compatibility: embed tool in instance.data - "tool": tool - }) - - # Add tool itself as member - instance.append(tool) + # Add tool itself as member + instance.append(tool) diff --git a/openpype/hosts/fusion/plugins/publish/render_local.py b/openpype/hosts/fusion/plugins/publish/render_local.py index 53d8eb64e1..30943edd4b 100644 --- a/openpype/hosts/fusion/plugins/publish/render_local.py +++ b/openpype/hosts/fusion/plugins/publish/render_local.py @@ -53,10 +53,8 @@ class Fusionlocal(pyblish.api.InstancePlugin): instance.data["representations"].append(repre) # review representation - repre_preview = repre.copy() - repre_preview["name"] = repre_preview["ext"] = "mp4" - repre_preview["tags"] = ["review", "ftrackreview", "delete"] - instance.data["representations"].append(repre_preview) + if instance.data.get("review", False): + repre["tags"] = ["review", "ftrackreview"] def render_once(self, context): """Render context comp only once, even with more render instances""" From c43a8b073296cb95ba1700faf5e32cb9f7c31fa4 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 16:06:44 +0100 Subject: [PATCH 815/912] Collect comp frame range later in publishing - Otherwise it gets overridden by global plugin `CollectContextEntities` --- .../fusion/plugins/publish/collect_comp.py | 25 ----------- .../publish/collect_comp_frame_range.py | 41 +++++++++++++++++++ 2 files changed, 41 insertions(+), 25 deletions(-) create mode 100644 openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py diff --git a/openpype/hosts/fusion/plugins/publish/collect_comp.py b/openpype/hosts/fusion/plugins/publish/collect_comp.py index 911071c9a0..d26bf66d1f 100644 --- a/openpype/hosts/fusion/plugins/publish/collect_comp.py +++ b/openpype/hosts/fusion/plugins/publish/collect_comp.py @@ -3,24 +3,6 @@ import pyblish.api from openpype.hosts.fusion.api import get_current_comp -def get_comp_render_range(comp): - """Return comp's start-end render range and global start-end range.""" - comp_attrs = comp.GetAttrs() - start = comp_attrs["COMPN_RenderStart"] - end = comp_attrs["COMPN_RenderEnd"] - global_start = comp_attrs["COMPN_GlobalStart"] - global_end = comp_attrs["COMPN_GlobalEnd"] - - # Whenever render ranges are undefined fall back - # to the comp's global start and end - if start == -1000000000: - start = global_start - if end == -1000000000: - end = global_end - - return start, end, global_start, global_end - - class CollectCurrentCompFusion(pyblish.api.ContextPlugin): """Collect current comp""" @@ -38,10 +20,3 @@ class CollectCurrentCompFusion(pyblish.api.ContextPlugin): # Store path to current file filepath = comp.GetAttrs().get("COMPS_FileName", "") context.data['currentFile'] = filepath - - # Store comp render ranges - start, end, global_start, global_end = get_comp_render_range(comp) - context.data["frameStart"] = int(start) - context.data["frameEnd"] = int(end) - context.data["frameStartHandle"] = int(global_start) - context.data["frameEndHandle"] = int(global_end) diff --git a/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py b/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py new file mode 100644 index 0000000000..dc88dd79c6 --- /dev/null +++ b/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py @@ -0,0 +1,41 @@ +import pyblish.api + +from openpype.hosts.fusion.api import get_current_comp + + +def get_comp_render_range(comp): + """Return comp's start-end render range and global start-end range.""" + comp_attrs = comp.GetAttrs() + start = comp_attrs["COMPN_RenderStart"] + end = comp_attrs["COMPN_RenderEnd"] + global_start = comp_attrs["COMPN_GlobalStart"] + global_end = comp_attrs["COMPN_GlobalEnd"] + + # Whenever render ranges are undefined fall back + # to the comp's global start and end + if start == -1000000000: + start = global_start + if end == -1000000000: + end = global_end + + return start, end, global_start, global_end + + +class CollectFusionCompFrameRanges(pyblish.api.ContextPlugin): + """Collect current comp""" + + order = pyblish.api.CollectorOrder - 0.05 + label = "Collect Comp Frame Ranges" + hosts = ["fusion"] + + def process(self, context): + """Collect all image sequence tools""" + + comp = context.data["currentComp"] + + # Store comp render ranges + start, end, global_start, global_end = get_comp_render_range(comp) + context.data["frameStart"] = int(start) + context.data["frameEnd"] = int(end) + context.data["frameStartHandle"] = int(global_start) + context.data["frameEndHandle"] = int(global_end) From f6b8a8df61af591427e1192ecf7ce416db338db6 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 16:07:54 +0100 Subject: [PATCH 816/912] Revert redundant variable name change since plugin is now basically reverted --- openpype/hosts/fusion/plugins/publish/collect_comp.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/collect_comp.py b/openpype/hosts/fusion/plugins/publish/collect_comp.py index d26bf66d1f..d1c49790fa 100644 --- a/openpype/hosts/fusion/plugins/publish/collect_comp.py +++ b/openpype/hosts/fusion/plugins/publish/collect_comp.py @@ -13,10 +13,10 @@ class CollectCurrentCompFusion(pyblish.api.ContextPlugin): def process(self, context): """Collect all image sequence tools""" - comp = get_current_comp() - assert comp, "Must have active Fusion composition" - context.data["currentComp"] = comp + current_comp = get_current_comp() + assert current_comp, "Must have active Fusion composition" + context.data["currentComp"] = current_comp # Store path to current file - filepath = comp.GetAttrs().get("COMPS_FileName", "") + filepath = current_comp.GetAttrs().get("COMPS_FileName", "") context.data['currentFile'] = filepath From 146f5cd439652d454b656163f00b1521bf5ee227 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 16:09:36 +0100 Subject: [PATCH 817/912] Add descriptive comment --- .../hosts/fusion/plugins/publish/collect_comp_frame_range.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py b/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py index dc88dd79c6..98128e1ccf 100644 --- a/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py +++ b/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py @@ -24,6 +24,8 @@ def get_comp_render_range(comp): class CollectFusionCompFrameRanges(pyblish.api.ContextPlugin): """Collect current comp""" + # We run this after CollectorOrder - 0.1 otherwise it gets + # overridden by global plug-in `CollectContextEntities` order = pyblish.api.CollectorOrder - 0.05 label = "Collect Comp Frame Ranges" hosts = ["fusion"] From 43d084cf7f5a7f277a44c50bab623f31a74a8975 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 16:09:55 +0100 Subject: [PATCH 818/912] Remove unused import --- .../hosts/fusion/plugins/publish/collect_comp_frame_range.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py b/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py index 98128e1ccf..c6d7a73a04 100644 --- a/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py +++ b/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py @@ -1,7 +1,5 @@ import pyblish.api -from openpype.hosts.fusion.api import get_current_comp - def get_comp_render_range(comp): """Return comp's start-end render range and global start-end range.""" From 1b18483f7b480665922847ceb556375d49026d35 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 7 Mar 2023 16:41:35 +0100 Subject: [PATCH 819/912] use right type for signal emit (#4584) --- openpype/tools/attribute_defs/widgets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/tools/attribute_defs/widgets.py b/openpype/tools/attribute_defs/widgets.py index 18e2e13d06..0d4e1e88a9 100644 --- a/openpype/tools/attribute_defs/widgets.py +++ b/openpype/tools/attribute_defs/widgets.py @@ -186,7 +186,7 @@ class AttributeDefinitionsWidget(QtWidgets.QWidget): class _BaseAttrDefWidget(QtWidgets.QWidget): # Type 'object' may not work with older PySide versions - value_changed = QtCore.Signal(object, uuid.UUID) + value_changed = QtCore.Signal(object, str) def __init__(self, attr_def, parent): super(_BaseAttrDefWidget, self).__init__(parent) From 70163a2f255413fbe706101b261dac3c3e65e2a8 Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Tue, 7 Mar 2023 17:26:09 +0100 Subject: [PATCH 820/912] Added Create button to menu and set tab data for create and publish btn --- openpype/hosts/fusion/api/menu.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/openpype/hosts/fusion/api/menu.py b/openpype/hosts/fusion/api/menu.py index 568e03464d..e37380017e 100644 --- a/openpype/hosts/fusion/api/menu.py +++ b/openpype/hosts/fusion/api/menu.py @@ -7,11 +7,11 @@ from openpype.style import load_stylesheet from openpype.lib import register_event_callback from openpype.hosts.fusion.scripts import ( set_rendermode, - duplicate_with_inputs + duplicate_with_inputs, ) from openpype.hosts.fusion.api.lib import ( set_asset_framerange, - set_asset_resolution + set_asset_resolution, ) from openpype.pipeline import legacy_io from openpype.resources import get_openpype_icon_filepath @@ -45,14 +45,17 @@ class OpenPypeMenu(QtWidgets.QWidget): self.setWindowTitle("OpenPype") asset_label = QtWidgets.QLabel("Context", self) - asset_label.setStyleSheet("""QLabel { + asset_label.setStyleSheet( + """QLabel { font-size: 14px; font-weight: 600; color: #5f9fb8; - }""") + }""" + ) asset_label.setAlignment(QtCore.Qt.AlignHCenter) workfiles_btn = QtWidgets.QPushButton("Workfiles...", self) + create_btn = QtWidgets.QPushButton("Create...", self) publish_btn = QtWidgets.QPushButton("Publish...", self) load_btn = QtWidgets.QPushButton("Load...", self) manager_btn = QtWidgets.QPushButton("Manage...", self) @@ -76,6 +79,7 @@ class OpenPypeMenu(QtWidgets.QWidget): layout.addSpacing(20) layout.addWidget(load_btn) + layout.addWidget(create_btn) layout.addWidget(publish_btn) layout.addWidget(manager_btn) @@ -99,13 +103,15 @@ class OpenPypeMenu(QtWidgets.QWidget): self.asset_label = asset_label workfiles_btn.clicked.connect(self.on_workfile_clicked) + create_btn.clicked.connect(self.on_create_clicked) publish_btn.clicked.connect(self.on_publish_clicked) load_btn.clicked.connect(self.on_load_clicked) manager_btn.clicked.connect(self.on_manager_clicked) libload_btn.clicked.connect(self.on_libload_clicked) rendermode_btn.clicked.connect(self.on_rendermode_clicked) duplicate_with_inputs_btn.clicked.connect( - self.on_duplicate_with_inputs_clicked) + self.on_duplicate_with_inputs_clicked + ) set_resolution_btn.clicked.connect(self.on_set_resolution_clicked) set_framerange_btn.clicked.connect(self.on_set_framerange_clicked) @@ -127,7 +133,6 @@ class OpenPypeMenu(QtWidgets.QWidget): self.asset_label.setText(label) def register_callback(self, name, fn): - # Create a wrapper callback that we only store # for as long as we want it to persist as callback def _callback(*args): @@ -142,8 +147,11 @@ class OpenPypeMenu(QtWidgets.QWidget): def on_workfile_clicked(self): host_tools.show_workfiles() + def on_create_clicked(self): + host_tools.show_publisher(tab="create") + def on_publish_clicked(self): - host_tools.show_publisher() + host_tools.show_publisher(tab="publish") def on_load_clicked(self): host_tools.show_loader(use_context=True) From b1fac42e94a668e9b072dc5f64edca865d06afcd Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 7 Mar 2023 17:26:31 +0100 Subject: [PATCH 821/912] updating pr tempate --- .github/pull_request_template.md | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 20ae298f70..2adaffd23d 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,16 +1,9 @@ -## Brief description -First sentence is brief description. - -## Description -Next paragraf is more elaborate text with more info. This will be displayed for example in collapsed form under the first sentence in a changelog. +## Changelog Description +Paragraphs contain detailed information on the changes made to the product or service, providing an in-depth description of the updates and enhancements. They can be used to explain the reasoning behind the changes, or to highlight the importance of the new features. Paragraphs can often include links to further information or support documentation. ## Additional info -The rest will be ignored in changelog and should contain any additional -technical information. - -## Documentation (add _"type: documentation"_ label) -[feature_documentation](future_url_after_it_will_be_merged) +Paragraphs of text giving context of additional technical information or code examples. ## Testing notes: 1. start with this step -2. follow this step \ No newline at end of file +2. follow this step From 9c9c134a794a5ab9bd36a415ef15d2b2b64dbdd8 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 17:39:05 +0100 Subject: [PATCH 822/912] Use passthrough state of saver tool to store and load the active state --- openpype/hosts/fusion/plugins/create/create_saver.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/openpype/hosts/fusion/plugins/create/create_saver.py b/openpype/hosts/fusion/plugins/create/create_saver.py index bf11dc95c5..e581bac20f 100644 --- a/openpype/hosts/fusion/plugins/create/create_saver.py +++ b/openpype/hosts/fusion/plugins/create/create_saver.py @@ -109,6 +109,12 @@ class CreateSaver(Creator): def _imprint(self, tool, data): # Save all data in a "openpype.{key}" = value data + + active = data.pop("active", None) + if active is not None: + # Use active value to set the passthrough state + tool.SetAttrs({"TOOLB_PassThrough": not active}) + for key, value in data.items(): tool.SetData(f"openpype.{key}", value) @@ -192,6 +198,11 @@ class CreateSaver(Creator): if key not in data or data[key] != value: return + # Get active state from the actual tool state + attrs = tool.GetAttrs() + passthrough = attrs["TOOLB_PassThrough"] + data["active"] = not passthrough + return data def get_instance_attr_defs(self): From 5c8bbe28713aaabbabf99b4739f1654a0bea4b71 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 17:41:03 +0100 Subject: [PATCH 823/912] Remove pyblish callback which does nothing in new publisher --- openpype/hosts/fusion/api/pipeline.py | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/openpype/hosts/fusion/api/pipeline.py b/openpype/hosts/fusion/api/pipeline.py index b982e1c2e9..a768a3f0f8 100644 --- a/openpype/hosts/fusion/api/pipeline.py +++ b/openpype/hosts/fusion/api/pipeline.py @@ -102,9 +102,6 @@ class FusionHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): register_creator_plugin_path(CREATE_PATH) register_inventory_action_path(INVENTORY_PATH) - pyblish.api.register_callback( - "instanceToggled", on_pyblish_instance_toggled) - # Register events register_event_callback("open", on_after_open) register_event_callback("save", on_save) @@ -163,29 +160,6 @@ class FusionHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): return comp.GetData("openpype") or {} -def on_pyblish_instance_toggled(instance, old_value, new_value): - """Toggle saver tool passthrough states on instance toggles.""" - comp = instance.context.data.get("currentComp") - if not comp: - return - - savers = [tool for tool in instance if - getattr(tool, "ID", None) == "Saver"] - if not savers: - return - - # Whether instances should be passthrough based on new value - passthrough = not new_value - with comp_lock_and_undo_chunk(comp, - undo_queue_name="Change instance " - "active state"): - for tool in savers: - attrs = tool.GetAttrs() - current = attrs["TOOLB_PassThrough"] - if current != passthrough: - tool.SetAttrs({"TOOLB_PassThrough": passthrough}) - - def on_new(event): comp = event["Rets"]["comp"] validate_comp_prefs(comp, force_repair=True) From 0f037666f83226e9ec832a58a49ee848683b9b04 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 17:49:31 +0100 Subject: [PATCH 824/912] Change menu order to how it was originally and match with e.g. maya menu order --- openpype/hosts/fusion/api/menu.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/api/menu.py b/openpype/hosts/fusion/api/menu.py index e37380017e..343f5f803a 100644 --- a/openpype/hosts/fusion/api/menu.py +++ b/openpype/hosts/fusion/api/menu.py @@ -56,8 +56,8 @@ class OpenPypeMenu(QtWidgets.QWidget): workfiles_btn = QtWidgets.QPushButton("Workfiles...", self) create_btn = QtWidgets.QPushButton("Create...", self) - publish_btn = QtWidgets.QPushButton("Publish...", self) load_btn = QtWidgets.QPushButton("Load...", self) + publish_btn = QtWidgets.QPushButton("Publish...", self) manager_btn = QtWidgets.QPushButton("Manage...", self) libload_btn = QtWidgets.QPushButton("Library...", self) rendermode_btn = QtWidgets.QPushButton("Set render mode...", self) @@ -78,8 +78,8 @@ class OpenPypeMenu(QtWidgets.QWidget): layout.addSpacing(20) - layout.addWidget(load_btn) layout.addWidget(create_btn) + layout.addWidget(load_btn) layout.addWidget(publish_btn) layout.addWidget(manager_btn) From acbfb5985b52516ac99d45bd6b5e7f8121d89b6c Mon Sep 17 00:00:00 2001 From: Jacob Danell Date: Mon, 6 Mar 2023 14:50:00 +0100 Subject: [PATCH 825/912] Fixed task itteration From the last PR (https://github.com/ynput/OpenPype/pull/4425) a comment-commit last second messed up and resultet in two lines being the same, crashing the script. This fixes that. --- .../modules/kitsu/utils/update_op_with_zou.py | 55 ++++++++++++------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py index 053e803ff3..4fa8cf9fdd 100644 --- a/openpype/modules/kitsu/utils/update_op_with_zou.py +++ b/openpype/modules/kitsu/utils/update_op_with_zou.py @@ -95,7 +95,8 @@ def update_op_assets( op_asset = create_op_asset(item) insert_result = dbcon.insert_one(op_asset) item_doc = get_asset_by_id( - project_name, insert_result.inserted_id) + project_name, insert_result.inserted_id + ) # Update asset item_data = deepcopy(item_doc["data"]) @@ -133,39 +134,47 @@ def update_op_assets( try: fps = float(item_data.get("fps")) except (TypeError, ValueError): - fps = float(gazu_project.get( - "fps", project_doc["data"].get("fps", 25))) + fps = float( + gazu_project.get("fps", project_doc["data"].get("fps", 25)) + ) item_data["fps"] = fps # Resolution, fall back to project default match_res = re.match( r"(\d+)x(\d+)", - item_data.get("resolution", gazu_project.get("resolution")) + item_data.get("resolution", gazu_project.get("resolution")), ) if match_res: item_data["resolutionWidth"] = int(match_res.group(1)) item_data["resolutionHeight"] = int(match_res.group(2)) else: item_data["resolutionWidth"] = project_doc["data"].get( - "resolutionWidth") + "resolutionWidth" + ) item_data["resolutionHeight"] = project_doc["data"].get( - "resolutionHeight") + "resolutionHeight" + ) # Properties that doesn't fully exist in Kitsu. # Guessing those property names below: # Pixel Aspect Ratio item_data["pixelAspect"] = item_data.get( - "pixel_aspect", project_doc["data"].get("pixelAspect")) + "pixel_aspect", project_doc["data"].get("pixelAspect") + ) # Handle Start item_data["handleStart"] = item_data.get( - "handle_start", project_doc["data"].get("handleStart")) + "handle_start", project_doc["data"].get("handleStart") + ) # Handle End item_data["handleEnd"] = item_data.get( - "handle_end", project_doc["data"].get("handleEnd")) + "handle_end", project_doc["data"].get("handleEnd") + ) # Clip In item_data["clipIn"] = item_data.get( - "clip_in", project_doc["data"].get("clipIn")) + "clip_in", project_doc["data"].get("clipIn") + ) # Clip Out item_data["clipOut"] = item_data.get( - "clip_out", project_doc["data"].get("clipOut")) + "clip_out", project_doc["data"].get("clipOut") + ) # Tasks tasks_list = [] @@ -175,11 +184,9 @@ def update_op_assets( elif item_type == "Shot": tasks_list = gazu.task.all_tasks_for_shot(item) item_data["tasks"] = { - item_data["tasks"] = { - t["task_type_name"]: { - "type": t["task_type_name"], - "zou": gazu.task.get_task(t["id"]), - } + t["task_type_name"]: { + "type": t["task_type_name"], + "zou": gazu.task.get_task(t["id"]), } for t in tasks_list } @@ -218,7 +225,9 @@ def update_op_assets( if parent_zou_id_dict is not None: visual_parent_doc_id = ( parent_zou_id_dict.get("_id") - if parent_zou_id_dict else None) + if parent_zou_id_dict + else None + ) if visual_parent_doc_id is None: # Find root folder doc ("Assets" or "Shots") @@ -345,7 +354,8 @@ def write_project_to_op(project: dict, dbcon: AvalonMongoDB) -> UpdateOne: def sync_all_projects( - login: str, password: str, ignore_projects: list = None): + login: str, password: str, ignore_projects: list = None +): """Update all OP projects in DB with Zou data. Args: @@ -390,7 +400,7 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict): if not project: project = gazu.project.get_project_by_name(project["name"]) - log.info("Synchronizing {}...".format(project['name'])) + log.info("Synchronizing {}...".format(project["name"])) # Get all assets from zou all_assets = gazu.asset.all_assets_for_project(project) @@ -473,8 +483,11 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict): [ UpdateOne({"_id": id}, update) for id, update in update_op_assets( - dbcon, project, project_dict, - all_entities, zou_ids_and_asset_docs + dbcon, + project, + project_dict, + all_entities, + zou_ids_and_asset_docs, ) ] ) From 40125fa6a5518b7ca202a892a3f4196913058600 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 10:17:44 +0100 Subject: [PATCH 826/912] Avoid error in PySide6+ --- openpype/widgets/popup.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/openpype/widgets/popup.py b/openpype/widgets/popup.py index 97a8461060..28bbd45072 100644 --- a/openpype/widgets/popup.py +++ b/openpype/widgets/popup.py @@ -98,15 +98,22 @@ class Popup(QtWidgets.QDialog): height = window.height() height = max(height, window.sizeHint().height()) - desktop_geometry = QtWidgets.QDesktopWidget().availableGeometry() - screen_geometry = window.geometry() + try: + screen = QtWidgets.QApplication.primaryScreen() + desktop_geometry = screen.availableGeometry() + except AttributeError: + # Backwards compatibility for older Qt versions + # PySide6 removed QDesktopWidget + desktop_geometry = QtWidgets.QDesktopWidget().availableGeometry() - screen_width = screen_geometry.width() - screen_height = screen_geometry.height() + window_geometry = window.geometry() + + screen_width = window_geometry.width() + screen_height = window_geometry.height() # Calculate width and height of system tray - systray_width = screen_geometry.width() - desktop_geometry.width() - systray_height = screen_geometry.height() - desktop_geometry.height() + systray_width = window_geometry.width() - desktop_geometry.width() + systray_height = window_geometry.height() - desktop_geometry.height() padding = 10 From 300a4435101e8ae6608ef4024f002606f9f867d5 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 11:08:10 +0100 Subject: [PATCH 827/912] Use screen of window instead of primary screen Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- openpype/widgets/popup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/widgets/popup.py b/openpype/widgets/popup.py index 28bbd45072..225c5e18a1 100644 --- a/openpype/widgets/popup.py +++ b/openpype/widgets/popup.py @@ -99,7 +99,7 @@ class Popup(QtWidgets.QDialog): height = max(height, window.sizeHint().height()) try: - screen = QtWidgets.QApplication.primaryScreen() + screen = window.screen() desktop_geometry = screen.availableGeometry() except AttributeError: # Backwards compatibility for older Qt versions From ecfea3dee2be05318ec9cfb88802f357fdb2c0e9 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 7 Mar 2023 20:42:49 +0100 Subject: [PATCH 828/912] Explicitly set the `handleStart` and `handleEnd` otherwise other global plug-ins will force in other data like asset data. --- .../hosts/fusion/plugins/publish/collect_comp_frame_range.py | 2 ++ openpype/hosts/fusion/plugins/publish/collect_instances.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py b/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py index c6d7a73a04..fbd7606cd7 100644 --- a/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py +++ b/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py @@ -39,3 +39,5 @@ class CollectFusionCompFrameRanges(pyblish.api.ContextPlugin): context.data["frameEnd"] = int(end) context.data["frameStartHandle"] = int(global_start) context.data["frameEndHandle"] = int(global_end) + context.data["handleStart"] = int(start) - int(global_start) + context.data["handleEnd"] = int(global_end) - int(end) diff --git a/openpype/hosts/fusion/plugins/publish/collect_instances.py b/openpype/hosts/fusion/plugins/publish/collect_instances.py index 1e6d095cc2..af227f03db 100644 --- a/openpype/hosts/fusion/plugins/publish/collect_instances.py +++ b/openpype/hosts/fusion/plugins/publish/collect_instances.py @@ -39,6 +39,8 @@ class CollectInstanceData(pyblish.api.InstancePlugin): "frameEnd": context.data["frameEnd"], "frameStartHandle": context.data["frameStartHandle"], "frameEndHandle": context.data["frameStartHandle"], + "handleStart": context.data["handleStart"], + "handleEnd": context.data["handleEnd"], "fps": context.data["fps"], }) From 962984d29614a7ba7d86f391ba61013a871947f9 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Wed, 8 Mar 2023 02:04:54 +0300 Subject: [PATCH 829/912] add separate fusion profile hook --- openpype/hosts/fusion/__init__.py | 2 + openpype/hosts/fusion/addon.py | 9 ++ .../fusion/hooks/pre_fusion_profile_hook.py | 109 ++++++++++++++++++ .../hosts/fusion/hooks/pre_fusion_setup.py | 105 +---------------- 4 files changed, 125 insertions(+), 100 deletions(-) create mode 100644 openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py diff --git a/openpype/hosts/fusion/__init__.py b/openpype/hosts/fusion/__init__.py index ddae01890b..baaaa9d6fc 100644 --- a/openpype/hosts/fusion/__init__.py +++ b/openpype/hosts/fusion/__init__.py @@ -1,10 +1,12 @@ from .addon import ( FusionAddon, FUSION_HOST_DIR, + FUSION_PROFILE_VERSION ) __all__ = ( "FusionAddon", "FUSION_HOST_DIR", + "FUSION_PROFILE_VERSION" ) diff --git a/openpype/hosts/fusion/addon.py b/openpype/hosts/fusion/addon.py index d1bd1566b7..777c38629a 100644 --- a/openpype/hosts/fusion/addon.py +++ b/openpype/hosts/fusion/addon.py @@ -3,6 +3,15 @@ from openpype.modules import OpenPypeModule, IHostAddon FUSION_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) +FUSION_PROFILE_VERSION = 16 + +# FUSION_PROFILE_VERSION variable is used by the pre-launch hooks. +# Since Fusion v16, the profile folder became project-specific, +# but then it was abandoned by BlackmagicDesign devs, and now, despite it is +# already Fusion version 18, still FUSION16_PROFILE_DIR is used. +# The variable is added in case the version number will be +# updated or deleted so we could easily change the version or disable it. + class FusionAddon(OpenPypeModule, IHostAddon): name = "fusion" diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py new file mode 100644 index 0000000000..4af67c1c0d --- /dev/null +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -0,0 +1,109 @@ +import os +import shutil +import platform +from pathlib import Path +from openpype.lib import PreLaunchHook, ApplicationLaunchFailed +from openpype.hosts.fusion import FUSION_PROFILE_VERSION as VERSION + + +class FusionCopyPrefsPrelaunch(PreLaunchHook): + """Prepares local Fusion profile directory, copies existing Fusion profile + """ + + app_groups = ["fusion"] + + def get_fusion_profile_name(self) -> str: + """usually set to 'Default', unless FUSION16_PROFILE is set""" + return os.getenv(f"FUSION{VERSION}_PROFILE", "Default") + + def get_profile_source(self) -> Path: + """Get the Fusion preferences (profile) location. + Check Per-User_Preferences_and_Paths on VFXpedia for reference. + """ + fusion_profile = self.get_fusion_profile_name() + fusion_var_prefs_dir = os.getenv(f"FUSION{VERSION}_PROFILE_DIR") + + # if FUSION16_PROFILE_DIR variable exists + if fusion_var_prefs_dir and Path(fusion_var_prefs_dir).is_dir(): + fusion_prefs_dir = Path(fusion_var_prefs_dir, fusion_profile) + self.log.info( + f"Local Fusion prefs environment is set to {fusion_prefs_dir}" + ) + return fusion_prefs_dir + # otherwise get the profile folder from default location + fusion_prefs_dir = f"Blackmagic Design/Fusion/Profiles/{fusion_profile}" # noqa + if platform.system() == "Windows": + prefs_source = Path(os.getenv("AppData"), fusion_prefs_dir) + elif platform.system() == "Darwin": + prefs_source = Path( + "~/Library/Application Support/", fusion_prefs_dir + ).expanduser() + elif platform.system() == "Linux": + prefs_source = Path("~/.fusion", fusion_prefs_dir).expanduser() + self.log.info(f"Got Fusion prefs file: {prefs_source}") + return prefs_source + + def get_copy_fusion_prefs_settings(self): + """Get copy preferences options from the global application settings""" + copy_fusion_settings = self.data["project_settings"]["fusion"].get( + "copy_fusion_settings", {} + ) + if not copy_fusion_settings: + self.log.error("Copy prefs settings not found") + copy_status = copy_fusion_settings.get("copy_status", False) + force_sync = copy_fusion_settings.get("force_sync", False) + copy_path = copy_fusion_settings.get("copy_path") or None + if copy_path: + copy_path = Path(copy_path).expanduser() + return copy_status, copy_path, force_sync + + def copy_existing_prefs( + self, copy_from: Path, copy_to: Path, force_sync: bool + ) -> None: + """On the first Fusion launch copy the contents of Fusion profile + directory to the working predefined location. If the Openpype profile + folder exists, skip copying, unless re-sync is checked. + If the prefs were not copied on the first launch, + clean Fusion profile will be created in fusion_profile_dir. + """ + if copy_to.exists() and not force_sync: + self.log.info( + "Local Fusion preferences folder exists, skipping profile copy" + ) + return + self.log.info(f"Starting copying Fusion preferences") + self.log.info(f"force_sync option is set to {force_sync}") + dest_folder = copy_to / self.get_fusion_profile_name() + try: + dest_folder.mkdir(exist_ok=True, parents=True) + except Exception: + self.log.warn(f"Could not create folder at {dest_folder}") + return + if not copy_from.exists(): + self.log.warning(f"Fusion preferences not found in {copy_from}") + return + for file in copy_from.iterdir(): + if file.suffix in (".prefs", ".def", ".blocklist", ".fu"): + # convert Path to str to be compatible with Python 3.6+ + shutil.copy(str(file), str(dest_folder)) + self.log.info( + f"successfully copied preferences:\n {copy_from} to {dest_folder}" + ) + + def execute(self): + ( + copy_status, + fusion_profile_dir, + force_sync, + ) = self.get_copy_fusion_prefs_settings() + + # do a copy of Fusion profile if copy_status toggle is enabled + if copy_status and fusion_profile_dir is not None: + prefs_source = self.get_profile_source() + self.copy_existing_prefs(prefs_source, fusion_profile_dir, force_sync) # noqa + + # Add temporary profile directory variables to customize Fusion + # to define where it can read custom scripts and tools from + fusion_profile_dir_variable = f"FUSION{VERSION}_PROFILE_DIR" + self.log.info(f"Setting {fusion_profile_dir_variable}: {fusion_profile_dir}") # noqa + self.launch_context.env[fusion_profile_dir_variable] = str(fusion_profile_dir) # noqa \ No newline at end of file diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index 129aadf1a5..bce221d357 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -4,6 +4,7 @@ import platform from pathlib import Path from openpype.lib import PreLaunchHook, ApplicationLaunchFailed from openpype.hosts.fusion import FUSION_HOST_DIR +from openpype.hosts.fusion import FUSION_PROFILE_VERSION as VERSION class FusionPrelaunch(PreLaunchHook): @@ -16,94 +17,9 @@ class FusionPrelaunch(PreLaunchHook): This also sets FUSION16_MasterPrefs to apply the fusion master prefs as set in openpype/hosts/fusion/deploy/fusion_shared.prefs to enable the OpenPype menu and force Python 3 over Python 2. - - VERSION variable is used because from the Fusion v16 the profile folder - is project-specific, but then it was abandoned by devs, - and despite it is already Fusion version 18, still FUSION16_PROFILE_DIR - is used. The variable is added in case the version number will be - updated or deleted so we could easily change the version or disable it. """ app_groups = ["fusion"] - VERSION = 16 - - def get_fusion_profile_name(self) -> str: - """usually set to 'Default', unless FUSION16_PROFILE is set""" - return os.getenv(f"FUSION{self.VERSION}_PROFILE", "Default") - - def get_profile_source(self) -> Path: - """Get the Fusion preferences (profile) location. - Check Per-User_Preferences_and_Paths on VFXpedia for reference. - """ - fusion_profile = self.get_fusion_profile_name() - fusion_var_prefs_dir = os.getenv(f"FUSION{self.VERSION}_PROFILE_DIR") - - # if FUSION16_PROFILE_DIR variable exists - if fusion_var_prefs_dir and Path(fusion_var_prefs_dir).is_dir(): - fusion_prefs_dir = Path(fusion_var_prefs_dir, fusion_profile) - self.log.info( - f"Local Fusion prefs environment is set to {fusion_prefs_dir}" - ) - return fusion_prefs_dir - # otherwise get the profile folder from default location - fusion_prefs_dir = f"Blackmagic Design/Fusion/Profiles/{fusion_profile}" # noqa - if platform.system() == "Windows": - prefs_source = Path(os.getenv("AppData"), fusion_prefs_dir) - elif platform.system() == "Darwin": - prefs_source = Path( - "~/Library/Application Support/", fusion_prefs_dir - ).expanduser() - elif platform.system() == "Linux": - prefs_source = Path("~/.fusion", fusion_prefs_dir).expanduser() - self.log.info(f"Got Fusion prefs file: {prefs_source}") - return prefs_source - - def get_copy_fusion_prefs_settings(self): - """Get copy preferences options from the global application settings""" - copy_fusion_settings = self.data["project_settings"]["fusion"].get( - "copy_fusion_settings", {} - ) - if not copy_fusion_settings: - self.log.error("Copy prefs settings not found") - copy_status = copy_fusion_settings.get("copy_status", False) - force_sync = copy_fusion_settings.get("force_sync", False) - copy_path = copy_fusion_settings.get("copy_path") or None - if copy_path: - copy_path = Path(copy_path).expanduser() - return copy_status, copy_path, force_sync - - def copy_existing_prefs( - self, copy_from: Path, copy_to: Path, force_sync: bool - ) -> None: - """On the first Fusion launch copy the contents of Fusion profile - directory to the working predefined location. If the Openpype profile - folder exists, skip copying, unless re-sync is checked. - If the prefs were not copied on the first launch, - clean Fusion profile will be created in fusion_profile_dir. - """ - if copy_to.exists() and not force_sync: - self.log.info( - "Local Fusion preferences folder exists, skipping profile copy" - ) - return - self.log.info(f"Starting copying Fusion preferences") - self.log.info(f"force_sync option is set to {force_sync}") - dest_folder = copy_to / self.get_fusion_profile_name() - try: - dest_folder.mkdir(exist_ok=True, parents=True) - except Exception: - self.log.warn(f"Could not create folder at {dest_folder}") - return - if not copy_from.exists(): - self.log.warning(f"Fusion preferences not found in {copy_from}") - return - for file in copy_from.iterdir(): - if file.suffix in (".prefs", ".def", ".blocklist", ".fu"): - # convert Path to str to be compatible with Python 3.6+ - shutil.copy(str(file), str(dest_folder)) - self.log.info( - f"successfully copied preferences:\n {copy_from} to {dest_folder}" - ) def execute(self): # making sure python 3 is installed at provided path @@ -138,26 +54,15 @@ class FusionPrelaunch(PreLaunchHook): # Fusion 16 and 17 use FUSION16_PYTHON36_HOME instead of # FUSION_PYTHON3_HOME and will only work with a Python 3.6 version # TODO: Detect Fusion version to only set for specific Fusion build - self.launch_context.env[f"FUSION{self.VERSION}_PYTHON36_HOME"] = py3_dir # noqa + self.launch_context.env[f"FUSION{VERSION}_PYTHON36_HOME"] = py3_dir # noqa # Add custom Fusion Master Prefs and the temporary # profile directory variables to customize Fusion # to define where it can read custom scripts and tools from self.log.info(f"Setting OPENPYPE_FUSION: {FUSION_HOST_DIR}") self.launch_context.env["OPENPYPE_FUSION"] = FUSION_HOST_DIR - ( - copy_status, - fusion_profile_dir, - force_sync, - ) = self.get_copy_fusion_prefs_settings() - if copy_status and fusion_profile_dir is not None: - prefs_source = self.get_profile_source() - self.copy_existing_prefs(prefs_source, fusion_profile_dir, force_sync) # noqa - else: - fusion_profile_dir_variable = f"FUSION{self.VERSION}_PROFILE_DIR" - self.log.info(f"Setting {fusion_profile_dir_variable}: {fusion_profile_dir}") # noqa - self.launch_context.env[fusion_profile_dir_variable] = str(fusion_profile_dir) # noqa - master_prefs_variable = f"FUSION{self.VERSION}_MasterPrefs" + + master_prefs_variable = f"FUSION{VERSION}_MasterPrefs" master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") self.log.info(f"Setting {master_prefs_variable}: {master_prefs}") - self.launch_context.env[master_prefs_variable] = str(master_prefs) + self.launch_context.env[master_prefs_variable] = str(master_prefs) \ No newline at end of file From e1950a175fbb1a58a1ffeea9ad7620e1a2d05d02 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Wed, 8 Mar 2023 02:11:57 +0300 Subject: [PATCH 830/912] hound comments --- openpype/hosts/fusion/addon.py | 2 +- openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py | 4 ++-- openpype/hosts/fusion/hooks/pre_fusion_setup.py | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/fusion/addon.py b/openpype/hosts/fusion/addon.py index 777c38629a..6621f88056 100644 --- a/openpype/hosts/fusion/addon.py +++ b/openpype/hosts/fusion/addon.py @@ -5,7 +5,7 @@ FUSION_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) FUSION_PROFILE_VERSION = 16 -# FUSION_PROFILE_VERSION variable is used by the pre-launch hooks. +# FUSION_PROFILE_VERSION variable is used by the pre-launch hooks. # Since Fusion v16, the profile folder became project-specific, # but then it was abandoned by BlackmagicDesign devs, and now, despite it is # already Fusion version 18, still FUSION16_PROFILE_DIR is used. diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index 4af67c1c0d..b91c699cc3 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -2,7 +2,7 @@ import os import shutil import platform from pathlib import Path -from openpype.lib import PreLaunchHook, ApplicationLaunchFailed +from openpype.lib import PreLaunchHook from openpype.hosts.fusion import FUSION_PROFILE_VERSION as VERSION @@ -11,7 +11,7 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): """ app_groups = ["fusion"] - + def get_fusion_profile_name(self) -> str: """usually set to 'Default', unless FUSION16_PROFILE is set""" return os.getenv(f"FUSION{VERSION}_PROFILE", "Default") diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index bce221d357..e62c2d7ab7 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -1,6 +1,4 @@ import os -import shutil -import platform from pathlib import Path from openpype.lib import PreLaunchHook, ApplicationLaunchFailed from openpype.hosts.fusion import FUSION_HOST_DIR From 39e694374626544f7dce258c86c5ac2809a0cf19 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Wed, 8 Mar 2023 02:35:00 +0300 Subject: [PATCH 831/912] hound comments --- openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py | 3 ++- openpype/hosts/fusion/hooks/pre_fusion_setup.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index b91c699cc3..e3a00a3e66 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -106,4 +106,5 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): # to define where it can read custom scripts and tools from fusion_profile_dir_variable = f"FUSION{VERSION}_PROFILE_DIR" self.log.info(f"Setting {fusion_profile_dir_variable}: {fusion_profile_dir}") # noqa - self.launch_context.env[fusion_profile_dir_variable] = str(fusion_profile_dir) # noqa \ No newline at end of file + self.launch_context.env[fusion_profile_dir_variable] = str(fusion_profile_dir) # noqa + \ No newline at end of file diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index e62c2d7ab7..ccad28401d 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -63,4 +63,5 @@ class FusionPrelaunch(PreLaunchHook): master_prefs_variable = f"FUSION{VERSION}_MasterPrefs" master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") self.log.info(f"Setting {master_prefs_variable}: {master_prefs}") - self.launch_context.env[master_prefs_variable] = str(master_prefs) \ No newline at end of file + self.launch_context.env[master_prefs_variable] = str(master_prefs) + \ No newline at end of file From a5e0e057db3aa1de71da3d24f75c6833c5219aa0 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Wed, 8 Mar 2023 02:37:59 +0300 Subject: [PATCH 832/912] good boy --- openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py | 1 - openpype/hosts/fusion/hooks/pre_fusion_setup.py | 1 - 2 files changed, 2 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index e3a00a3e66..7172809252 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -107,4 +107,3 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): fusion_profile_dir_variable = f"FUSION{VERSION}_PROFILE_DIR" self.log.info(f"Setting {fusion_profile_dir_variable}: {fusion_profile_dir}") # noqa self.launch_context.env[fusion_profile_dir_variable] = str(fusion_profile_dir) # noqa - \ No newline at end of file diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index ccad28401d..c39b9cd150 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -64,4 +64,3 @@ class FusionPrelaunch(PreLaunchHook): master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") self.log.info(f"Setting {master_prefs_variable}: {master_prefs}") self.launch_context.env[master_prefs_variable] = str(master_prefs) - \ No newline at end of file From 5088edfdade4bcb8d096ef45502ba0cf235fb6a5 Mon Sep 17 00:00:00 2001 From: Ynbot Date: Wed, 8 Mar 2023 03:30:35 +0000 Subject: [PATCH 833/912] [Automated] Bump version --- openpype/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/version.py b/openpype/version.py index 2939ddbbac..c7a5e9bea5 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.15.2-nightly.4" +__version__ = "3.15.2-nightly.5" From fb0f39b3ccff52ac2df9e2dfe0cbb743bfb3ac92 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov <11698866+movalex@users.noreply.github.com> Date: Wed, 8 Mar 2023 12:38:23 +0300 Subject: [PATCH 834/912] add up to 3 decimals precision to the frame rate settings (#4571) * add up to 3 decimals to fps allows input 23.976 to the FPS settings both in Project Manager and the Project Anatomy. * set fps and pixel aspect precision steps default values --- .../schemas/schema_anatomy_attributes.json | 2 +- .../project_manager/project_manager/delegates.py | 5 ++++- .../tools/project_manager/project_manager/view.py | 14 ++++++++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_attributes.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_attributes.json index 3667c9d5d8..a728024376 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_attributes.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_attributes.json @@ -10,7 +10,7 @@ "type": "number", "key": "fps", "label": "Frame Rate", - "decimal": 2, + "decimal": 3, "minimum": 0 }, { diff --git a/openpype/tools/project_manager/project_manager/delegates.py b/openpype/tools/project_manager/project_manager/delegates.py index 79e9554b0f..023dd668ec 100644 --- a/openpype/tools/project_manager/project_manager/delegates.py +++ b/openpype/tools/project_manager/project_manager/delegates.py @@ -83,15 +83,18 @@ class NumberDelegate(QtWidgets.QStyledItemDelegate): decimals(int): How many decimal points can be used. Float will be used as value if is higher than 0. """ - def __init__(self, minimum, maximum, decimals, *args, **kwargs): + def __init__(self, minimum, maximum, decimals, step, *args, **kwargs): super(NumberDelegate, self).__init__(*args, **kwargs) self.minimum = minimum self.maximum = maximum self.decimals = decimals + self.step = step def createEditor(self, parent, option, index): if self.decimals > 0: editor = DoubleSpinBoxScrollFixed(parent) + editor.setSingleStep(self.step) + editor.setDecimals(self.decimals) else: editor = SpinBoxScrollFixed(parent) diff --git a/openpype/tools/project_manager/project_manager/view.py b/openpype/tools/project_manager/project_manager/view.py index fa08943ea5..b35491c5b2 100644 --- a/openpype/tools/project_manager/project_manager/view.py +++ b/openpype/tools/project_manager/project_manager/view.py @@ -26,10 +26,11 @@ class NameDef: class NumberDef: - def __init__(self, minimum=None, maximum=None, decimals=None): + def __init__(self, minimum=None, maximum=None, decimals=None, step=None): self.minimum = 0 if minimum is None else minimum self.maximum = 999999999 if maximum is None else maximum self.decimals = 0 if decimals is None else decimals + self.step = 1 if decimals is None else step class TypeDef: @@ -73,14 +74,14 @@ class HierarchyView(QtWidgets.QTreeView): "type": TypeDef(), "frameStart": NumberDef(1), "frameEnd": NumberDef(1), - "fps": NumberDef(1, decimals=2), + "fps": NumberDef(1, decimals=3, step=1), "resolutionWidth": NumberDef(0), "resolutionHeight": NumberDef(0), "handleStart": NumberDef(0), "handleEnd": NumberDef(0), "clipIn": NumberDef(1), "clipOut": NumberDef(1), - "pixelAspect": NumberDef(0, decimals=2), + "pixelAspect": NumberDef(0, decimals=2, step=0.01), "tools_env": ToolsDef() } @@ -96,6 +97,10 @@ class HierarchyView(QtWidgets.QTreeView): "stretch": QtWidgets.QHeaderView.Interactive, "width": 140 }, + "fps": { + "stretch": QtWidgets.QHeaderView.Interactive, + "width": 65 + }, "tools_env": { "stretch": QtWidgets.QHeaderView.Interactive, "width": 200 @@ -148,7 +153,8 @@ class HierarchyView(QtWidgets.QTreeView): delegate = NumberDelegate( item_type.minimum, item_type.maximum, - item_type.decimals + item_type.decimals, + item_type.step ) elif isinstance(item_type, TypeDef): From 0f45af2d36f5a29f550d412c0d346154d0f855c6 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 6 Mar 2023 15:10:37 +0100 Subject: [PATCH 835/912] use 'get_representations' instead of 'legacy_io' query --- .../hosts/unreal/plugins/load/load_layout.py | 50 ++++++++++++------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/openpype/hosts/unreal/plugins/load/load_layout.py b/openpype/hosts/unreal/plugins/load/load_layout.py index c1d66ddf2a..18653e81cb 100644 --- a/openpype/hosts/unreal/plugins/load/load_layout.py +++ b/openpype/hosts/unreal/plugins/load/load_layout.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- """Loader for layouts.""" import json +import collections from pathlib import Path import unreal @@ -12,9 +13,7 @@ from unreal import FBXImportType from unreal import MovieSceneLevelVisibilityTrack from unreal import MovieSceneSubTrack -from bson.objectid import ObjectId - -from openpype.client import get_asset_by_name, get_assets +from openpype.client import get_asset_by_name, get_assets, get_representations from openpype.pipeline import ( discover_loader_plugins, loaders_from_representation, @@ -410,6 +409,29 @@ class LayoutLoader(plugin.Loader): return sequence, (min_frame, max_frame) + def _get_repre_docs_by_version_id(self, project_name, data): + version_ids = { + element.get("version") + for element in data + if element.get("representation") + } + version_ids.discard(None) + + output = collections.defaultdict(list) + if not version_ids: + return output + + repre_docs = get_representations( + project_name, + representation_names=["fbx", "abc"], + version_ids=version_ids, + fields=["_id", "parent", "name"] + ) + for repre_doc in repre_docs: + version_id = str(repre_doc["parent"]) + output[version_id].append(repre_doc) + return output + def _process(self, lib_path, asset_dir, sequence, repr_loaded=None): ar = unreal.AssetRegistryHelpers.get_asset_registry() @@ -429,31 +451,21 @@ class LayoutLoader(plugin.Loader): loaded_assets = [] + repre_docs_by_version_id = self._get_repre_docs_by_version_id(data) for element in data: representation = None repr_format = None if element.get('representation'): - # representation = element.get('representation') - - self.log.info(element.get("version")) - - valid_formats = ['fbx', 'abc'] - - repr_data = legacy_io.find_one({ - "type": "representation", - "parent": ObjectId(element.get("version")), - "name": {"$in": valid_formats} - }) - repr_format = repr_data.get('name') - - if not repr_data: + repre_docs = repre_docs_by_version_id[element.get("version")] + if not repre_docs: self.log.error( f"No valid representation found for version " f"{element.get('version')}") continue + repre_doc = repre_docs[0] + representation = str(repre_doc["_id"]) + repr_format = repre_doc["name"] - representation = str(repr_data.get('_id')) - print(representation) # This is to keep compatibility with old versions of the # json format. elif element.get('reference_fbx'): From 47b1daf0f5ef0cf11b89026c8b342b18782e1956 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 8 Mar 2023 11:21:38 +0100 Subject: [PATCH 836/912] get project name other way --- openpype/hosts/unreal/plugins/load/load_layout.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/unreal/plugins/load/load_layout.py b/openpype/hosts/unreal/plugins/load/load_layout.py index 18653e81cb..63d415a52b 100644 --- a/openpype/hosts/unreal/plugins/load/load_layout.py +++ b/openpype/hosts/unreal/plugins/load/load_layout.py @@ -409,7 +409,7 @@ class LayoutLoader(plugin.Loader): return sequence, (min_frame, max_frame) - def _get_repre_docs_by_version_id(self, project_name, data): + def _get_repre_docs_by_version_id(self, data): version_ids = { element.get("version") for element in data @@ -421,6 +421,7 @@ class LayoutLoader(plugin.Loader): if not version_ids: return output + project_name = legacy_io.active_project() repre_docs = get_representations( project_name, representation_names=["fbx", "abc"], From b7ac37701bfc24c69bde5e5fd7a853766d4cc87d Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 9 Mar 2023 23:57:12 +0300 Subject: [PATCH 837/912] WIP get fusion host version (the wrong way) --- openpype/hosts/fusion/__init__.py | 4 +- openpype/hosts/fusion/addon.py | 33 +++++-- .../fusion/hooks/pre_fusion_profile_hook.py | 91 +++++++++++-------- .../hosts/fusion/hooks/pre_fusion_setup.py | 9 +- 4 files changed, 87 insertions(+), 50 deletions(-) diff --git a/openpype/hosts/fusion/__init__.py b/openpype/hosts/fusion/__init__.py index baaaa9d6fc..f0e7843fff 100644 --- a/openpype/hosts/fusion/__init__.py +++ b/openpype/hosts/fusion/__init__.py @@ -1,12 +1,12 @@ from .addon import ( + get_fusion_profile_number, FusionAddon, FUSION_HOST_DIR, - FUSION_PROFILE_VERSION ) __all__ = ( + "get_fusion_profile_number", "FusionAddon", "FUSION_HOST_DIR", - "FUSION_PROFILE_VERSION" ) diff --git a/openpype/hosts/fusion/addon.py b/openpype/hosts/fusion/addon.py index 6621f88056..4b0ce59aaf 100644 --- a/openpype/hosts/fusion/addon.py +++ b/openpype/hosts/fusion/addon.py @@ -1,16 +1,35 @@ import os +import re from openpype.modules import OpenPypeModule, IHostAddon +from openpype.lib import Logger FUSION_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) -FUSION_PROFILE_VERSION = 16 -# FUSION_PROFILE_VERSION variable is used by the pre-launch hooks. -# Since Fusion v16, the profile folder became project-specific, -# but then it was abandoned by BlackmagicDesign devs, and now, despite it is -# already Fusion version 18, still FUSION16_PROFILE_DIR is used. -# The variable is added in case the version number will be -# updated or deleted so we could easily change the version or disable it. +def get_fusion_profile_number(module: str, app_data: str) -> int: + """ + FUSION_PROFILE_VERSION variable is used by the pre-launch hooks. + Since Fusion v16, the profile folder variable became version-specific, + but then it was abandoned by BlackmagicDesign devs, and now, despite it is + already Fusion version 18, still FUSION16_PROFILE_DIR is used. + The variable is added in case the version number will be + updated or deleted so we could easily change the version or disable it. + """ + + log = Logger.get_logger(__name__) + + if not app_data: + return + fusion16_profile_versions = ("16", "17", "18") + try: + app_version = re.search(r"fusion/(\d+)", app_data).group(1) + log.info(f"{module} found Fusion profile version: {app_version}") + if app_version in fusion16_profile_versions: + return 16 + elif app_version == "9": + return 9 + except AttributeError: + log.info("Fusion version was not found in the app data") class FusionAddon(OpenPypeModule, IHostAddon): diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index 7172809252..356292c85b 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -2,8 +2,9 @@ import os import shutil import platform from pathlib import Path +from pprint import pprint from openpype.lib import PreLaunchHook -from openpype.hosts.fusion import FUSION_PROFILE_VERSION as VERSION +from openpype.hosts.fusion import get_fusion_profile_number class FusionCopyPrefsPrelaunch(PreLaunchHook): @@ -11,40 +12,49 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): """ app_groups = ["fusion"] + order = 2 + + def get_fusion_profile_name(self, app_version) -> str: + # Returns 'Default', unless FUSION16_PROFILE is set + return os.getenv(f"FUSION{app_version}_PROFILE", "Default") - def get_fusion_profile_name(self) -> str: - """usually set to 'Default', unless FUSION16_PROFILE is set""" - return os.getenv(f"FUSION{VERSION}_PROFILE", "Default") + def check_profile_variable(self, app_version) -> Path: + # Get FUSION_PROFILE_DIR variable + fusion_profile = self.get_fusion_profile_name(app_version) + fusion_var_prefs_dir = os.getenv(f"FUSION{app_version}_PROFILE_DIR") - def get_profile_source(self) -> Path: - """Get the Fusion preferences (profile) location. - Check Per-User_Preferences_and_Paths on VFXpedia for reference. - """ - fusion_profile = self.get_fusion_profile_name() - fusion_var_prefs_dir = os.getenv(f"FUSION{VERSION}_PROFILE_DIR") - - # if FUSION16_PROFILE_DIR variable exists + # Check if FUSION_PROFILE_DIR exists if fusion_var_prefs_dir and Path(fusion_var_prefs_dir).is_dir(): - fusion_prefs_dir = Path(fusion_var_prefs_dir, fusion_profile) + fu_prefs_dir = Path(fusion_var_prefs_dir, fusion_profile) self.log.info( - f"Local Fusion prefs environment is set to {fusion_prefs_dir}" + f"{fusion_var_prefs_dir} is set to {fu_prefs_dir}" ) - return fusion_prefs_dir - # otherwise get the profile folder from default location - fusion_prefs_dir = f"Blackmagic Design/Fusion/Profiles/{fusion_profile}" # noqa + return fu_prefs_dir + + def get_profile_source(self, app_version) -> Path: + """Get Fusion preferences profile location. + See Per-User_Preferences_and_Paths on VFXpedia for reference. + """ + fusion_profile = self.get_fusion_profile_name(app_version) + profile_source = self.check_profile_variable(app_version) + if profile_source: + return profile_source + # otherwise get default location of the profile folder + fu_prefs_dir = f"Blackmagic Design/Fusion/Profiles/{fusion_profile}" if platform.system() == "Windows": - prefs_source = Path(os.getenv("AppData"), fusion_prefs_dir) + profile_source = Path(os.getenv("AppData"), fu_prefs_dir) elif platform.system() == "Darwin": - prefs_source = Path( - "~/Library/Application Support/", fusion_prefs_dir + profile_source = Path( + "~/Library/Application Support/", fu_prefs_dir ).expanduser() elif platform.system() == "Linux": - prefs_source = Path("~/.fusion", fusion_prefs_dir).expanduser() - self.log.info(f"Got Fusion prefs file: {prefs_source}") - return prefs_source + profile_source = Path("~/.fusion", fu_prefs_dir).expanduser() + self.log.info(f"Got Fusion prefs file: {profile_source}") + return profile_source def get_copy_fusion_prefs_settings(self): - """Get copy preferences options from the global application settings""" + # Get copy preferences options from the global application settings + copy_fusion_settings = self.data["project_settings"]["fusion"].get( "copy_fusion_settings", {} ) @@ -57,14 +67,14 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): copy_path = Path(copy_path).expanduser() return copy_status, copy_path, force_sync - def copy_existing_prefs( + def copy_fusion_profile( self, copy_from: Path, copy_to: Path, force_sync: bool ) -> None: """On the first Fusion launch copy the contents of Fusion profile directory to the working predefined location. If the Openpype profile folder exists, skip copying, unless re-sync is checked. If the prefs were not copied on the first launch, - clean Fusion profile will be created in fusion_profile_dir. + clean Fusion profile will be created in fu_profile_dir. """ if copy_to.exists() and not force_sync: self.log.info( @@ -73,11 +83,10 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): return self.log.info(f"Starting copying Fusion preferences") self.log.info(f"force_sync option is set to {force_sync}") - dest_folder = copy_to / self.get_fusion_profile_name() try: - dest_folder.mkdir(exist_ok=True, parents=True) + copy_to.mkdir(exist_ok=True, parents=True) except Exception: - self.log.warn(f"Could not create folder at {dest_folder}") + self.log.warn(f"Could not create folder at {copy_to}") return if not copy_from.exists(): self.log.warning(f"Fusion preferences not found in {copy_from}") @@ -85,25 +94,31 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): for file in copy_from.iterdir(): if file.suffix in (".prefs", ".def", ".blocklist", ".fu"): # convert Path to str to be compatible with Python 3.6+ - shutil.copy(str(file), str(dest_folder)) + shutil.copy(str(file), str(copy_to)) self.log.info( - f"successfully copied preferences:\n {copy_from} to {dest_folder}" + f"successfully copied preferences:\n {copy_from} to {copy_to}" ) def execute(self): ( copy_status, - fusion_profile_dir, + fu_profile_dir, force_sync, ) = self.get_copy_fusion_prefs_settings() + # Get launched application context and return correct app version + app_data = self.launch_context.env.get("AVALON_APP_NAME", "fusion/18") + app_version = get_fusion_profile_number(__name__, app_data) + fu_profile = self.get_fusion_profile_name(app_version) + # do a copy of Fusion profile if copy_status toggle is enabled - if copy_status and fusion_profile_dir is not None: - prefs_source = self.get_profile_source() - self.copy_existing_prefs(prefs_source, fusion_profile_dir, force_sync) # noqa + if copy_status and fu_profile_dir is not None: + profile_source = self.get_profile_source(app_version) + dest_folder = Path(fu_profile_dir, fu_profile) + self.copy_fusion_profile(profile_source, dest_folder, force_sync) # Add temporary profile directory variables to customize Fusion # to define where it can read custom scripts and tools from - fusion_profile_dir_variable = f"FUSION{VERSION}_PROFILE_DIR" - self.log.info(f"Setting {fusion_profile_dir_variable}: {fusion_profile_dir}") # noqa - self.launch_context.env[fusion_profile_dir_variable] = str(fusion_profile_dir) # noqa + fu_profile_dir_variable = f"FUSION{app_version}_PROFILE_DIR" + self.log.info(f"Setting {fu_profile_dir_variable}: {fu_profile_dir}") + self.launch_context.env[fu_profile_dir_variable] = str(fu_profile_dir) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index c39b9cd150..7139252d2f 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -2,7 +2,7 @@ import os from pathlib import Path from openpype.lib import PreLaunchHook, ApplicationLaunchFailed from openpype.hosts.fusion import FUSION_HOST_DIR -from openpype.hosts.fusion import FUSION_PROFILE_VERSION as VERSION +from openpype.hosts.fusion import get_fusion_profile_number class FusionPrelaunch(PreLaunchHook): @@ -18,10 +18,13 @@ class FusionPrelaunch(PreLaunchHook): """ app_groups = ["fusion"] + order = 1 def execute(self): # making sure python 3 is installed at provided path # Py 3.3-3.10 for Fusion 18+ or Py 3.6 for Fu 16-17 + app_data = self.launch_context.env.get("AVALON_APP_NAME", "fusion/18") + app_version = get_fusion_profile_number(__name__, app_data) py3_var = "FUSION_PYTHON3_HOME" fusion_python3_home = self.launch_context.env.get(py3_var, "") @@ -52,7 +55,7 @@ class FusionPrelaunch(PreLaunchHook): # Fusion 16 and 17 use FUSION16_PYTHON36_HOME instead of # FUSION_PYTHON3_HOME and will only work with a Python 3.6 version # TODO: Detect Fusion version to only set for specific Fusion build - self.launch_context.env[f"FUSION{VERSION}_PYTHON36_HOME"] = py3_dir # noqa + self.launch_context.env[f"FUSION{app_version}_PYTHON36_HOME"] = py3_dir # Add custom Fusion Master Prefs and the temporary # profile directory variables to customize Fusion @@ -60,7 +63,7 @@ class FusionPrelaunch(PreLaunchHook): self.log.info(f"Setting OPENPYPE_FUSION: {FUSION_HOST_DIR}") self.launch_context.env["OPENPYPE_FUSION"] = FUSION_HOST_DIR - master_prefs_variable = f"FUSION{VERSION}_MasterPrefs" + master_prefs_variable = f"FUSION{app_version}_MasterPrefs" master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") self.log.info(f"Setting {master_prefs_variable}: {master_prefs}") self.launch_context.env[master_prefs_variable] = str(master_prefs) From d01114595645868da87baf337f8a8e84dabc682b Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 10 Mar 2023 00:02:26 +0300 Subject: [PATCH 838/912] hound --- .../hosts/fusion/hooks/pre_fusion_profile_hook.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index 356292c85b..4369935b49 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -2,7 +2,6 @@ import os import shutil import platform from pathlib import Path -from pprint import pprint from openpype.lib import PreLaunchHook from openpype.hosts.fusion import get_fusion_profile_number @@ -13,7 +12,7 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): app_groups = ["fusion"] order = 2 - + def get_fusion_profile_name(self, app_version) -> str: # Returns 'Default', unless FUSION16_PROFILE is set return os.getenv(f"FUSION{app_version}_PROFILE", "Default") @@ -39,8 +38,8 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): profile_source = self.check_profile_variable(app_version) if profile_source: return profile_source - # otherwise get default location of the profile folder - fu_prefs_dir = f"Blackmagic Design/Fusion/Profiles/{fusion_profile}" + # otherwise get default location of the profile folder + fu_prefs_dir = f"Blackmagic Design/Fusion/Profiles/{fusion_profile}" if platform.system() == "Windows": profile_source = Path(os.getenv("AppData"), fu_prefs_dir) elif platform.system() == "Darwin": @@ -110,12 +109,12 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): app_data = self.launch_context.env.get("AVALON_APP_NAME", "fusion/18") app_version = get_fusion_profile_number(__name__, app_data) fu_profile = self.get_fusion_profile_name(app_version) - + # do a copy of Fusion profile if copy_status toggle is enabled if copy_status and fu_profile_dir is not None: profile_source = self.get_profile_source(app_version) dest_folder = Path(fu_profile_dir, fu_profile) - self.copy_fusion_profile(profile_source, dest_folder, force_sync) + self.copy_fusion_profile(profile_source, dest_folder, force_sync) # Add temporary profile directory variables to customize Fusion # to define where it can read custom scripts and tools from From a04f44dcf9e97ef3fd7d8a028c8334d15ffd850d Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 10 Mar 2023 00:26:05 +0300 Subject: [PATCH 839/912] use FUSION_PYTHON36_HOME for Fusion 9 --- openpype/hosts/fusion/hooks/pre_fusion_setup.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index 7139252d2f..4c73a0eee3 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -55,15 +55,13 @@ class FusionPrelaunch(PreLaunchHook): # Fusion 16 and 17 use FUSION16_PYTHON36_HOME instead of # FUSION_PYTHON3_HOME and will only work with a Python 3.6 version # TODO: Detect Fusion version to only set for specific Fusion build - self.launch_context.env[f"FUSION{app_version}_PYTHON36_HOME"] = py3_dir + if app_version == 9: + self.launch_context.env[f"FUSION_PYTHON36_HOME"] = py3_dir + elif app_version == 16: + self.launch_context.env[f"FUSION{app_version}_PYTHON36_HOME"] = py3_dir # Add custom Fusion Master Prefs and the temporary # profile directory variables to customize Fusion # to define where it can read custom scripts and tools from self.log.info(f"Setting OPENPYPE_FUSION: {FUSION_HOST_DIR}") self.launch_context.env["OPENPYPE_FUSION"] = FUSION_HOST_DIR - - master_prefs_variable = f"FUSION{app_version}_MasterPrefs" - master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") - self.log.info(f"Setting {master_prefs_variable}: {master_prefs}") - self.launch_context.env[master_prefs_variable] = str(master_prefs) From d586231aa11ec76fbde4c9357369d2ed0ffa40c5 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 10 Mar 2023 00:28:41 +0300 Subject: [PATCH 840/912] move masterprefs setup to the correct hook --- openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index 4369935b49..543e90cc75 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -3,7 +3,7 @@ import shutil import platform from pathlib import Path from openpype.lib import PreLaunchHook -from openpype.hosts.fusion import get_fusion_profile_number +from openpype.hosts.fusion import FUSION_HOST_DIR, get_fusion_profile_number class FusionCopyPrefsPrelaunch(PreLaunchHook): @@ -121,3 +121,8 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): fu_profile_dir_variable = f"FUSION{app_version}_PROFILE_DIR" self.log.info(f"Setting {fu_profile_dir_variable}: {fu_profile_dir}") self.launch_context.env[fu_profile_dir_variable] = str(fu_profile_dir) + + master_prefs_variable = f"FUSION{app_version}_MasterPrefs" + master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") + self.log.info(f"Setting {master_prefs_variable}: {master_prefs}") + self.launch_context.env[master_prefs_variable] = str(master_prefs) From 71e8af5a22007678257412ab2052b2034727729d Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 10 Mar 2023 00:29:49 +0300 Subject: [PATCH 841/912] noqa line --- openpype/hosts/fusion/hooks/pre_fusion_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index 4c73a0eee3..e30d241096 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -58,7 +58,7 @@ class FusionPrelaunch(PreLaunchHook): if app_version == 9: self.launch_context.env[f"FUSION_PYTHON36_HOME"] = py3_dir elif app_version == 16: - self.launch_context.env[f"FUSION{app_version}_PYTHON36_HOME"] = py3_dir + self.launch_context.env[f"FUSION{app_version}_PYTHON36_HOME"] = py3_dir # noqa # Add custom Fusion Master Prefs and the temporary # profile directory variables to customize Fusion From 8a00c8ae33a910c40eee4bfcacad352119d3975d Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 10 Mar 2023 00:31:47 +0300 Subject: [PATCH 842/912] remove unused import --- openpype/hosts/fusion/hooks/pre_fusion_setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index e30d241096..38627b40c1 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -1,5 +1,4 @@ import os -from pathlib import Path from openpype.lib import PreLaunchHook, ApplicationLaunchFailed from openpype.hosts.fusion import FUSION_HOST_DIR from openpype.hosts.fusion import get_fusion_profile_number From c58778194f31b37235b201d9f0132cf97909aa77 Mon Sep 17 00:00:00 2001 From: Joseff Date: Wed, 8 Mar 2023 16:30:30 +0100 Subject: [PATCH 843/912] Implementation of a new splash screen --- .../unreal/hooks/pre_workfile_preparation.py | 90 ++++- .../OpenPype/Private/AssetContainer.cpp | 6 +- openpype/hosts/unreal/lib.py | 22 +- openpype/hosts/unreal/ue_workers.py | 338 ++++++++++++++++++ openpype/widgets/README.md | 102 ++++++ openpype/widgets/splash_screen.py | 253 +++++++++++++ 6 files changed, 793 insertions(+), 18 deletions(-) create mode 100644 openpype/hosts/unreal/ue_workers.py create mode 100644 openpype/widgets/README.md create mode 100644 openpype/widgets/splash_screen.py diff --git a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py index 4c9f8258f5..8ede80f7fd 100644 --- a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py +++ b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py @@ -3,7 +3,11 @@ import os import copy from pathlib import Path +from openpype.widgets.splash_screen import SplashScreen +from qtpy import QtCore +from openpype.hosts.unreal.ue_workers import UEProjectGenerationWorker, UEPluginInstallWorker +from openpype import resources from openpype.lib import ( PreLaunchHook, ApplicationLaunchFailed, @@ -22,6 +26,7 @@ class UnrealPrelaunchHook(PreLaunchHook): shell script. """ + def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -58,6 +63,70 @@ class UnrealPrelaunchHook(PreLaunchHook): # Return filename return filled_anatomy[workfile_template_key]["file"] + def exec_plugin_install(self, engine_path: Path, env: dict = None): + # set up the QThread and worker with necessary signals + env = env or os.environ + q_thread = QtCore.QThread() + ue_plugin_worker = UEPluginInstallWorker() + + q_thread.started.connect(ue_plugin_worker.run) + ue_plugin_worker.setup(engine_path, env) + ue_plugin_worker.moveToThread(q_thread) + + splash_screen = SplashScreen("Installing plugin", + resources.get_resource("app_icons", "ue4.png")) + + # set up the splash screen with necessary triggers + ue_plugin_worker.installing.connect(splash_screen.update_top_label_text) + ue_plugin_worker.progress.connect(splash_screen.update_progress) + ue_plugin_worker.log.connect(splash_screen.append_log) + ue_plugin_worker.finished.connect(splash_screen.quit_and_close) + ue_plugin_worker.failed.connect(splash_screen.fail) + + splash_screen.start_thread(q_thread) + splash_screen.show_ui() + + if not splash_screen.was_proc_successful(): + raise ApplicationLaunchFailed("Couldn't run the application! " + "Plugin failed to install!") + + def exec_ue_project_gen(self, + engine_version: str, + unreal_project_name: str, + engine_path: Path, + project_dir: Path): + self.log.info(( + f"{self.signature} Creating unreal " + f"project [ {unreal_project_name} ]" + )) + + q_thread = QtCore.QThread() + ue_project_worker = UEProjectGenerationWorker() + ue_project_worker.setup( + engine_version, + unreal_project_name, + engine_path, + project_dir + ) + ue_project_worker.moveToThread(q_thread) + q_thread.started.connect(ue_project_worker.run) + + splash_screen = SplashScreen("Initializing UE project", + resources.get_resource("app_icons", "ue4.png")) + + ue_project_worker.stage_begin.connect(splash_screen.update_top_label_text) + ue_project_worker.progress.connect(splash_screen.update_progress) + ue_project_worker.log.connect(splash_screen.append_log) + ue_project_worker.finished.connect(splash_screen.quit_and_close) + ue_project_worker.failed.connect(splash_screen.fail) + + splash_screen.start_thread(q_thread) + splash_screen.show_ui() + + if not splash_screen.was_proc_successful(): + raise ApplicationLaunchFailed("Couldn't run the application! " + "Failed to generate the project!") + def execute(self): """Hook entry method.""" workdir = self.launch_context.env["AVALON_WORKDIR"] @@ -137,23 +206,18 @@ class UnrealPrelaunchHook(PreLaunchHook): if self.launch_context.env.get(env_key): os.environ[env_key] = self.launch_context.env[env_key] - engine_path = detected[engine_version] + engine_path: Path = Path(detected[engine_version]) - unreal_lib.try_installing_plugin(Path(engine_path), os.environ) + if not unreal_lib.check_plugin_existence(engine_path): + self.exec_plugin_install(engine_path) project_file = project_path / unreal_project_filename - if not project_file.is_file(): - self.log.info(( - f"{self.signature} creating unreal " - f"project [ {unreal_project_name} ]" - )) - unreal_lib.create_unreal_project( - unreal_project_name, - engine_version, - project_path, - engine_path=Path(engine_path) - ) + if not project_file.is_file(): + self.exec_ue_project_gen(engine_version, + unreal_project_name, + engine_path, + project_path) self.launch_context.env["OPENPYPE_UNREAL_VERSION"] = engine_version # Append project file to launch arguments diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/AssetContainer.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/AssetContainer.cpp index 0bea9e3d78..06dcd67808 100644 --- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/AssetContainer.cpp +++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/AssetContainer.cpp @@ -30,7 +30,7 @@ void UAssetContainer::OnAssetAdded(const FAssetData& AssetData) // get asset path and class FString assetPath = AssetData.GetFullName(); - FString assetFName = AssetData.AssetClassPath.ToString(); + FString assetFName = AssetData.ObjectPath.ToString(); UE_LOG(LogTemp, Log, TEXT("asset name %s"), *assetFName); // split path assetPath.ParseIntoArray(split, TEXT(" "), true); @@ -60,7 +60,7 @@ void UAssetContainer::OnAssetRemoved(const FAssetData& AssetData) // get asset path and class FString assetPath = AssetData.GetFullName(); - FString assetFName = AssetData.AssetClassPath.ToString(); + FString assetFName = AssetData.ObjectPath.ToString(); // split path assetPath.ParseIntoArray(split, TEXT(" "), true); @@ -93,7 +93,7 @@ void UAssetContainer::OnAssetRenamed(const FAssetData& AssetData, const FString& // get asset path and class FString assetPath = AssetData.GetFullName(); - FString assetFName = AssetData.AssetClassPath.ToString(); + FString assetFName = AssetData.ObjectPath.ToString(); // split path assetPath.ParseIntoArray(split, TEXT(" "), true); diff --git a/openpype/hosts/unreal/lib.py b/openpype/hosts/unreal/lib.py index 28a5106042..08cc57a6cd 100644 --- a/openpype/hosts/unreal/lib.py +++ b/openpype/hosts/unreal/lib.py @@ -365,6 +365,26 @@ def _get_build_id(engine_path: Path, ue_version: str) -> str: return "{" + loaded_modules.get("BuildId") + "}" +def check_plugin_existence(engine_path: Path, env: dict = None) -> bool: + env = env or os.environ + integration_plugin_path: Path = Path(env.get("OPENPYPE_UNREAL_PLUGIN", "")) + + if not os.path.isdir(integration_plugin_path): + raise RuntimeError("Path to the integration plugin is null!") + + # Create a path to the plugin in the engine + op_plugin_path: Path = engine_path / "Engine/Plugins/Marketplace/OpenPype" + + if not op_plugin_path.is_dir(): + return False + + if not (op_plugin_path / "Binaries").is_dir() \ + or not (op_plugin_path / "Intermediate").is_dir(): + return False + + return True + + def try_installing_plugin(engine_path: Path, env: dict = None) -> None: env = env or os.environ @@ -377,7 +397,6 @@ def try_installing_plugin(engine_path: Path, env: dict = None) -> None: op_plugin_path: Path = engine_path / "Engine/Plugins/Marketplace/OpenPype" if not op_plugin_path.is_dir(): - print("--- OpenPype Plugin is not present. Installing ...") op_plugin_path.mkdir(parents=True, exist_ok=True) engine_plugin_config_path: Path = op_plugin_path / "Config" @@ -387,7 +406,6 @@ def try_installing_plugin(engine_path: Path, env: dict = None) -> None: if not (op_plugin_path / "Binaries").is_dir() \ or not (op_plugin_path / "Intermediate").is_dir(): - print("--- Binaries are not present. Building the plugin ...") _build_and_move_plugin(engine_path, op_plugin_path, env) diff --git a/openpype/hosts/unreal/ue_workers.py b/openpype/hosts/unreal/ue_workers.py new file mode 100644 index 0000000000..35735fcaa1 --- /dev/null +++ b/openpype/hosts/unreal/ue_workers.py @@ -0,0 +1,338 @@ +import json +import os +import platform +import re +import subprocess +from distutils import dir_util +from pathlib import Path +from typing import List + +import openpype.hosts.unreal.lib as ue_lib + +from qtpy import QtCore + + +def parse_comp_progress(line: str, progress_signal: QtCore.Signal(int)) -> int: + match = re.search('\[[1-9]+/[0-9]+\]', line) + if match is not None: + split: list[str] = match.group().split('/') + curr: float = float(split[0][1:]) + total: float = float(split[1][:-1]) + progress_signal.emit(int((curr / total) * 100.0)) + + +def parse_prj_progress(line: str, progress_signal: QtCore.Signal(int)) -> int: + match = re.search('@progress', line) + if match is not None: + percent_match = re.search('\d{1,3}', line) + progress_signal.emit(int(percent_match.group())) + + +class UEProjectGenerationWorker(QtCore.QObject): + finished = QtCore.Signal(str) + failed = QtCore.Signal(str) + progress = QtCore.Signal(int) + log = QtCore.Signal(str) + stage_begin = QtCore.Signal(str) + + ue_version: str = None + project_name: str = None + env = None + engine_path: Path = None + project_dir: Path = None + dev_mode = False + + def setup(self, ue_version: str, + project_name, + engine_path: Path, + project_dir: Path, + dev_mode: bool = False, + env: dict = None): + + self.ue_version = ue_version + self.project_dir = project_dir + self.env = env or os.environ + + preset = ue_lib.get_project_settings( + project_name + )["unreal"]["project_setup"] + + if dev_mode or preset["dev_mode"]: + self.dev_mode = True + + self.project_name = project_name + self.engine_path = engine_path + + def run(self): + + + ue_id = ".".join(self.ue_version.split(".")[:2]) + # get unreal engine identifier + # ------------------------------------------------------------------------- + # FIXME (antirotor): As of 4.26 this is problem with UE4 built from + # sources. In that case Engine ID is calculated per machine/user and not + # from Engine files as this code then reads. This then prevents UE4 + # to directly open project as it will complain about project being + # created in different UE4 version. When user convert such project + # to his UE4 version, Engine ID is replaced in uproject file. If some + # other user tries to open it, it will present him with similar error. + + # engine_path should be the location of UE_X.X folder + + ue_editor_exe = ue_lib.get_editor_exe_path(self.engine_path, + self.ue_version) + cmdlet_project = ue_lib.get_path_to_cmdlet_project(self.ue_version) + project_file = self.project_dir / f"{self.project_name}.uproject" + + print("--- Generating a new project ...") + # 1st stage + stage_count = 2 + if self.dev_mode: + stage_count = 4 + + self.stage_begin.emit(f'Generating a new UE project ... 1 out of ' + f'{stage_count}') + + commandlet_cmd = [f'{ue_editor_exe.as_posix()}', + f'{cmdlet_project.as_posix()}', + f'-run=OPGenerateProject', + f'{project_file.resolve().as_posix()}'] + + if self.dev_mode: + commandlet_cmd.append('-GenerateCode') + + gen_process = subprocess.Popen(commandlet_cmd, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + + for line in gen_process.stdout: + decoded_line = line.decode(errors="replace") + print(decoded_line, end='') + self.log.emit(decoded_line) + gen_process.stdout.close() + return_code = gen_process.wait() + + if return_code and return_code != 0: + msg = 'Failed to generate ' + self.project_name \ + + f' project! Exited with return code {return_code}' + self.failed.emit(msg, return_code) + raise RuntimeError(msg) + + print("--- Project has been generated successfully.") + self.stage_begin.emit(f'Writing the Engine ID of the build UE ... 1 out' + f' of {stage_count}') + + with open(project_file.as_posix(), mode="r+") as pf: + pf_json = json.load(pf) + pf_json["EngineAssociation"] = ue_lib.get_build_id(self.engine_path, + self.ue_version) + pf.seek(0) + json.dump(pf_json, pf, indent=4) + pf.truncate() + print(f'--- Engine ID has been written into the project file') + + self.progress.emit(90) + if self.dev_mode: + # 2nd stage + self.stage_begin.emit(f'Generating project files ... 2 out of ' + f'{stage_count}') + + self.progress.emit(0) + ubt_path = ue_lib.get_path_to_ubt(self.engine_path, self.ue_version) + + arch = "Win64" + if platform.system().lower() == "windows": + arch = "Win64" + elif platform.system().lower() == "linux": + arch = "Linux" + elif platform.system().lower() == "darwin": + # we need to test this out + arch = "Mac" + + gen_prj_files_cmd = [ubt_path.as_posix(), + "-projectfiles", + f"-project={project_file}", + "-progress"] + gen_proc = subprocess.Popen(gen_prj_files_cmd, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + for line in gen_proc.stdout: + decoded_line: str = line.decode(errors='replace') + print(decoded_line, end='') + self.log.emit(decoded_line) + parse_prj_progress(decoded_line, self.progress) + + gen_proc.stdout.close() + return_code = gen_proc.wait() + + if return_code and return_code != 0: + msg = 'Failed to generate project files! ' \ + f'Exited with return code {return_code}' + self.failed.emit(msg, return_code) + raise RuntimeError(msg) + + self.stage_begin.emit(f'Building the project ... 3 out of ' + f'{stage_count}') + self.progress.emit(0) + # 3rd stage + build_prj_cmd = [ubt_path.as_posix(), + f"-ModuleWithSuffix={self.project_name},3555", + arch, + "Development", + "-TargetType=Editor", + f'-Project={project_file}', + f'{project_file}', + "-IgnoreJunk"] + + build_prj_proc = subprocess.Popen(build_prj_cmd, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + for line in build_prj_proc.stdout: + decoded_line: str = line.decode(errors='replace') + print(decoded_line, end='') + self.log.emit(decoded_line) + parse_comp_progress(decoded_line, self.progress) + + build_prj_proc.stdout.close() + return_code = build_prj_proc.wait() + + if return_code and return_code != 0: + msg = 'Failed to build project! ' \ + f'Exited with return code {return_code}' + self.failed.emit(msg, return_code) + raise RuntimeError(msg) + + # ensure we have PySide2 installed in engine + + self.progress.emit(0) + self.stage_begin.emit(f'Checking PySide2 installation... {stage_count} ' + f'out of {stage_count}') + python_path = None + if platform.system().lower() == "windows": + python_path = self.engine_path / ("Engine/Binaries/ThirdParty/" + "Python3/Win64/python.exe") + + if platform.system().lower() == "linux": + python_path = self.engine_path / ("Engine/Binaries/ThirdParty/" + "Python3/Linux/bin/python3") + + if platform.system().lower() == "darwin": + python_path = self.engine_path / ("Engine/Binaries/ThirdParty/" + "Python3/Mac/bin/python3") + + if not python_path: + msg = "Unsupported platform" + self.failed.emit(msg, 1) + raise NotImplementedError(msg) + if not python_path.exists(): + msg = f"Unreal Python not found at {python_path}" + self.failed.emit(msg, 1) + raise RuntimeError(msg) + subprocess.check_call( + [python_path.as_posix(), "-m", "pip", "install", "pyside2"] + ) + self.progress.emit(100) + self.finished.emit("Project successfully built!") + + +class UEPluginInstallWorker(QtCore.QObject): + finished = QtCore.Signal(str) + installing = QtCore.Signal(str) + failed = QtCore.Signal(str, int) + progress = QtCore.Signal(int) + log = QtCore.Signal(str) + + engine_path: Path = None + env = None + + def setup(self, engine_path: Path, env: dict = None, ): + self.engine_path = engine_path + self.env = env or os.environ + + def _build_and_move_plugin(self, plugin_build_path: Path): + uat_path: Path = ue_lib.get_path_to_uat(self.engine_path) + src_plugin_dir = Path(self.env.get("OPENPYPE_UNREAL_PLUGIN", "")) + + if not os.path.isdir(src_plugin_dir): + msg = "Path to the integration plugin is null!" + self.failed.emit(msg, 1) + raise RuntimeError(msg) + + if not uat_path.is_file(): + msg = "Building failed! Path to UAT is invalid!" + self.failed.emit(msg, 1) + raise RuntimeError(msg) + + temp_dir: Path = src_plugin_dir.parent / "Temp" + temp_dir.mkdir(exist_ok=True) + uplugin_path: Path = src_plugin_dir / "OpenPype.uplugin" + + # in order to successfully build the plugin, + # It must be built outside the Engine directory and then moved + build_plugin_cmd: List[str] = [f'{uat_path.as_posix()}', + 'BuildPlugin', + f'-Plugin={uplugin_path.as_posix()}', + f'-Package={temp_dir.as_posix()}'] + + build_proc = subprocess.Popen(build_plugin_cmd, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + for line in build_proc.stdout: + decoded_line: str = line.decode(errors='replace') + print(decoded_line, end='') + self.log.emit(decoded_line) + parse_comp_progress(decoded_line, self.progress) + + build_proc.stdout.close() + return_code = build_proc.wait() + + if return_code and return_code != 0: + msg = 'Failed to build plugin' \ + f' project! Exited with return code {return_code}' + self.failed.emit(msg, return_code) + raise RuntimeError(msg) + + # Copy the contents of the 'Temp' dir into the + # 'OpenPype' directory in the engine + dir_util.copy_tree(temp_dir.as_posix(), + plugin_build_path.as_posix()) + + # We need to also copy the config folder. + # The UAT doesn't include the Config folder in the build + plugin_install_config_path: Path = plugin_build_path / "Config" + src_plugin_config_path = src_plugin_dir / "Config" + + dir_util.copy_tree(src_plugin_config_path.as_posix(), + plugin_install_config_path.as_posix()) + + dir_util.remove_tree(temp_dir.as_posix()) + + def run(self): + src_plugin_dir = Path(self.env.get("OPENPYPE_UNREAL_PLUGIN", "")) + + if not os.path.isdir(src_plugin_dir): + msg = "Path to the integration plugin is null!" + self.failed.emit(msg, 1) + raise RuntimeError(msg) + + # Create a path to the plugin in the engine + op_plugin_path = self.engine_path / \ + "Engine/Plugins/Marketplace/OpenPype" + + if not op_plugin_path.is_dir(): + self.installing.emit("Installing and building the plugin ...") + op_plugin_path.mkdir(parents=True, exist_ok=True) + + engine_plugin_config_path = op_plugin_path / "Config" + engine_plugin_config_path.mkdir(exist_ok=True) + + dir_util._path_created = {} + + if not (op_plugin_path / "Binaries").is_dir() \ + or not (op_plugin_path / "Intermediate").is_dir(): + self.installing.emit("Building the plugin ...") + print("--- Building the plugin...") + + self._build_and_move_plugin(op_plugin_path) + + self.finished.emit("Plugin successfully installed") diff --git a/openpype/widgets/README.md b/openpype/widgets/README.md new file mode 100644 index 0000000000..cda83a95d3 --- /dev/null +++ b/openpype/widgets/README.md @@ -0,0 +1,102 @@ +# Widgets + +## Splash Screen + +This widget is used for executing a monitoring progress of a process which has been executed on a different thread. + +To properly use this widget certain preparation has to be done in order to correctly execute the process and show the +splash screen. + +### Prerequisites + +In order to run a function or an operation on another thread, a `QtCore.QObject` class needs to be created with the +desired code. The class has to have a method as an entry point for the thread to execute the code. + +For utilizing the functionalities of the splash screen, certain signals need to be declared to let it know what is +happening in the thread and how is it progressing. It is also recommended to have a function to set up certain variables +which are needed in the worker's code + +For example: +```python +from qtpy import QtCore + +class ExampleWorker(QtCore.QObject): + + finished = QtCore.Signal() + failed = QtCore.Signal(str) + progress = QtCore.Signal(int) + log = QtCore.Signal(str) + stage_begin = QtCore.Signal(str) + + foo = None + bar = None + + def run(self): + # The code goes here + print("Hello world!") + self.finished.emit() + + def setup(self, + foo: str, + bar: str,): + self.foo = foo + self.bar = bar +``` + +### Creating the splash screen + +```python +import os +from qtpy import QtCore +from pathlib import Path +from openpype.widgets.splash_screen import SplashScreen +from openpype import resources + + +def exec_plugin_install( engine_path: Path, env: dict = None): + env = env or os.environ + q_thread = QtCore.QThread() + example_worker = ExampleWorker() + + q_thread.started.connect(example_worker.run) + example_worker.setup(engine_path, env) + example_worker.moveToThread(q_thread) + + splash_screen = SplashScreen("Executing process ...", + resources.get_openpype_icon_filepath()) + + # set up the splash screen with necessary events + example_worker.installing.connect(splash_screen.update_top_label_text) + example_worker.progress.connect(splash_screen.update_progress) + example_worker.log.connect(splash_screen.append_log) + example_worker.finished.connect(splash_screen.quit_and_close) + example_worker.failed.connect(splash_screen.fail) + + splash_screen.start_thread(q_thread) + splash_screen.show_ui() +``` + +In this example code, before executing the process the worker needs to be instantiated and moved onto a newly created +`QtCore.QThread` object. After this, needed signals have to be connected to the desired slots to make full use of +the splash screen. Finally, the `start_thread` and `show_ui` is called. + +**Note that when the `show_ui` function is called the thread is blocked until the splash screen quits automatically, or +it is closed by the user in case the process fails! The `start_thread` method in that case must be called before +showing the UI!** + +The most important signals are +```python +q_thread.started.connect(example_worker.run) +``` + and +```python +example_worker.finished.connect(splash_screen.quit_and_close) +``` + +These ensure that when the `start_thread` method is called (which takes as a parameter the `QtCore.QThread` object and +saves it as a reference), the `QThread` object starts and signals the worker to +start executing its own code. Once the worker is done and emits a signal that it has finished with the `quit_and_close` +slot, the splash screen quits the `QtCore.QThread` and closes itself. + +It is highly recommended to also use the `fail` slot in case an exception or other error occurs during the execution of +the worker's code (You would use in this case the `failed` signal in the `ExampleWorker`). diff --git a/openpype/widgets/splash_screen.py b/openpype/widgets/splash_screen.py new file mode 100644 index 0000000000..4a7598180d --- /dev/null +++ b/openpype/widgets/splash_screen.py @@ -0,0 +1,253 @@ +from qtpy import QtWidgets, QtCore, QtGui +from openpype import style, resources +from igniter.nice_progress_bar import NiceProgressBar + + +class SplashScreen(QtWidgets.QDialog): + """Splash screen for executing a process on another thread. It is able + to inform about the progress of the process and log given information. + """ + + splash_icon = None + top_label = None + show_log_btn: QtWidgets.QLabel = None + progress_bar = None + log_text: QtWidgets.QLabel = None + scroll_area: QtWidgets.QScrollArea = None + close_btn: QtWidgets.QPushButton = None + scroll_bar: QtWidgets.QScrollBar = None + + is_log_visible = False + is_scroll_auto = True + + thread_return_code = None + q_thread: QtCore.QThread = None + + def __init__(self, + window_title: str, + splash_icon=None, + window_icon=None): + """ + Args: + window_title (str): String which sets the window title + splash_icon (str | bytes | None): A resource (pic) which is used for + the splash icon + window_icon (str | bytes | None: A resource (pic) which is used for + the window's icon + """ + super(SplashScreen, self).__init__() + + if splash_icon is None: + splash_icon = resources.get_openpype_icon_filepath() + + if window_icon is None: + window_icon = resources.get_openpype_icon_filepath() + + self.splash_icon = splash_icon + self.setWindowIcon(QtGui.QIcon(window_icon)) + self.setWindowTitle(window_title) + self.init_ui() + + def was_proc_successful(self) -> bool: + if self.thread_return_code == 0: + return True + return False + + def start_thread(self, q_thread: QtCore.QThread): + """Saves the reference to this thread and starts it. + + Args: + q_thread (QtCore.QThread): A QThread containing a given worker + (QtCore.QObject) + + Returns: + None + """ + if not q_thread: + raise RuntimeError("Failed to run a worker thread! The thread is null!") + + self.q_thread = q_thread + self.q_thread.start() + + @QtCore.Slot() + def quit_and_close(self): + """Quits the thread and closes the splash screen. Note that this means + the thread has exited with the return code 0! + + Returns: + None + """ + self.thread_return_code = 0 + self.q_thread.quit() + self.close() + + @QtCore.Slot() + def toggle_log(self): + if self.is_log_visible: + self.scroll_area.hide() + width = self.width() + self.adjustSize() + self.resize(width, self.height()) + else: + self.scroll_area.show() + self.scroll_bar.setValue(self.scroll_bar.maximum()) + self.resize(self.width(), 300) + + self.is_log_visible = not self.is_log_visible + + def show_ui(self): + """Shows the splash screen. BEWARE THAT THIS FUNCTION IS BLOCKING + (The execution of code can not proceed further beyond this function + until the splash screen is closed!) + + Returns: + None + """ + self.show() + self.exec_() + + def init_ui(self): + self.resize(450, 100) + self.setMinimumWidth(250) + self.setStyleSheet(style.load_stylesheet()) + + # Top Section + self.top_label = QtWidgets.QLabel(self); + self.top_label.setText("Starting process ...") + self.top_label.setWordWrap(True) + + icon = QtWidgets.QLabel(self) + icon.setPixmap(QtGui.QPixmap(self.splash_icon)) + icon.setFixedHeight(45) + icon.setFixedWidth(45) + icon.setScaledContents(True) + + self.close_btn = QtWidgets.QPushButton(self) + self.close_btn.setText("Quit") + self.close_btn.clicked.connect(self.close) + self.close_btn.setFixedWidth(80) + self.close_btn.hide() + + self.show_log_btn = QtWidgets.QPushButton(self) + self.show_log_btn.setText("Show log") + self.show_log_btn.setFixedWidth(80) + self.show_log_btn.clicked.connect(self.toggle_log) + + button_layout = QtWidgets.QVBoxLayout() + button_layout.addWidget(self.show_log_btn) + button_layout.addWidget(self.close_btn) + + # Progress Bar + self.progress_bar = NiceProgressBar() + self.progress_bar.setValue(0) + self.progress_bar.setAlignment(QtCore.Qt.AlignTop) + + # Log Content + self.scroll_area = QtWidgets.QScrollArea(self) + self.scroll_area.hide() + log_widget = QtWidgets.QWidget(self.scroll_area) + self.scroll_area.setWidgetResizable(True) + self.scroll_area.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) + self.scroll_area.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) + self.scroll_area.setWidget(log_widget) + + self.scroll_bar = self.scroll_area.verticalScrollBar() + self.scroll_bar.sliderMoved.connect(self.on_scroll) + + self.log_text = QtWidgets.QLabel(self) + self.log_text.setText('') + self.log_text.setAlignment(QtCore.Qt.AlignTop) + + log_layout = QtWidgets.QVBoxLayout(log_widget) + log_layout.addWidget(self.log_text) + + top_layout = QtWidgets.QHBoxLayout() + top_layout.setAlignment(QtCore.Qt.AlignTop) + top_layout.addWidget(icon) + top_layout.addSpacing(10) + top_layout.addWidget(self.top_label) + top_layout.addSpacing(10) + top_layout.addLayout(button_layout) + + main_layout = QtWidgets.QVBoxLayout(self) + main_layout.addLayout(top_layout) + main_layout.addSpacing(10) + main_layout.addWidget(self.progress_bar) + main_layout.addSpacing(10) + main_layout.addWidget(self.scroll_area) + + self.setWindowFlags( + QtCore.Qt.Window + | QtCore.Qt.CustomizeWindowHint + | QtCore.Qt.WindowTitleHint + | QtCore.Qt.WindowMinimizeButtonHint + ) + + desktop_rect = QtWidgets.QApplication.desktop().availableGeometry(self) + center = desktop_rect.center() + self.move( + center.x() - (self.width() * 0.5), + center.y() - (self.height() * 0.5) + ) + + @QtCore.Slot(int) + def update_progress(self, value: int): + self.progress_bar.setValue(value) + + @QtCore.Slot(str) + def update_top_label_text(self, text: str): + self.top_label.setText(text) + + @QtCore.Slot(str, str) + def append_log(self, text: str, end: str = ''): + """A slot used for receiving log info and appending it to scroll area's + content. + Args: + text (str): A log text that will append to the current one in the scroll + area. + end (str): end string which can be appended to the end of the given + line (for ex. a line break). + + Returns: + None + """ + self.log_text.setText(self.log_text.text() + text + end) + if self.is_scroll_auto: + self.scroll_bar.setValue(self.scroll_bar.maximum()) + + @QtCore.Slot(int) + def on_scroll(self, position: int): + """ + A slot for the vertical scroll bar's movement. This ensures the + auto-scrolling feature of the scroll area when the scroll bar is at its + maximum value. + + Args: + position (int): Position value of the scroll bar. + + Returns: + None + """ + if self.scroll_bar.maximum() == position: + self.is_scroll_auto = True + return + + self.is_scroll_auto = False + + @QtCore.Slot(str, int) + def fail(self, text: str, return_code: int = 1): + """ + A slot used for signals which can emit when a worker (process) has + failed. at this moment the splash screen doesn't close by itself. + it has to be closed by the user. + + Args: + text (str): A text which can be set to the top label. + + Returns: + return_code (int): Return code of the thread's code + """ + self.top_label.setText(text) + self.close_btn.show() + self.thread_return_code = return_code + self.q_thread.exit(return_code) From 57faf21309a5271cc6845e674311abb7a2eff06d Mon Sep 17 00:00:00 2001 From: Joseff Date: Wed, 8 Mar 2023 17:18:54 +0100 Subject: [PATCH 844/912] Cleaned up the code, fixed the hanging thread --- .../unreal/hooks/pre_workfile_preparation.py | 21 +++++++++++++------ openpype/hosts/unreal/lib.py | 4 ++-- openpype/hosts/unreal/ue_workers.py | 20 +++++++----------- openpype/widgets/splash_screen.py | 15 ++++++++----- 4 files changed, 34 insertions(+), 26 deletions(-) diff --git a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py index 8ede80f7fd..c3f9ea7e72 100644 --- a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py +++ b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py @@ -5,7 +5,10 @@ import copy from pathlib import Path from openpype.widgets.splash_screen import SplashScreen from qtpy import QtCore -from openpype.hosts.unreal.ue_workers import UEProjectGenerationWorker, UEPluginInstallWorker +from openpype.hosts.unreal.ue_workers import ( + UEProjectGenerationWorker, + UEPluginInstallWorker +) from openpype import resources from openpype.lib import ( @@ -73,8 +76,10 @@ class UnrealPrelaunchHook(PreLaunchHook): ue_plugin_worker.setup(engine_path, env) ue_plugin_worker.moveToThread(q_thread) - splash_screen = SplashScreen("Installing plugin", - resources.get_resource("app_icons", "ue4.png")) + splash_screen = SplashScreen( + "Installing plugin", + resources.get_resource("app_icons", "ue4.png") + ) # set up the splash screen with necessary triggers ue_plugin_worker.installing.connect(splash_screen.update_top_label_text) @@ -111,10 +116,14 @@ class UnrealPrelaunchHook(PreLaunchHook): ue_project_worker.moveToThread(q_thread) q_thread.started.connect(ue_project_worker.run) - splash_screen = SplashScreen("Initializing UE project", - resources.get_resource("app_icons", "ue4.png")) + splash_screen = SplashScreen( + "Initializing UE project", + resources.get_resource("app_icons", "ue4.png") + ) - ue_project_worker.stage_begin.connect(splash_screen.update_top_label_text) + ue_project_worker.stage_begin.connect( + splash_screen.update_top_label_text + ) ue_project_worker.progress.connect(splash_screen.update_progress) ue_project_worker.log.connect(splash_screen.append_log) ue_project_worker.finished.connect(splash_screen.quit_and_close) diff --git a/openpype/hosts/unreal/lib.py b/openpype/hosts/unreal/lib.py index 08cc57a6cd..86ce0bb033 100644 --- a/openpype/hosts/unreal/lib.py +++ b/openpype/hosts/unreal/lib.py @@ -252,7 +252,7 @@ def create_unreal_project(project_name: str, with open(project_file.as_posix(), mode="r+") as pf: pf_json = json.load(pf) - pf_json["EngineAssociation"] = _get_build_id(engine_path, ue_version) + pf_json["EngineAssociation"] = get_build_id(engine_path, ue_version) pf.seek(0) json.dump(pf_json, pf, indent=4) pf.truncate() @@ -338,7 +338,7 @@ def get_path_to_ubt(engine_path: Path, ue_version: str) -> Path: return Path(u_build_tool_path) -def _get_build_id(engine_path: Path, ue_version: str) -> str: +def get_build_id(engine_path: Path, ue_version: str) -> str: ue_modules = Path() if platform.system().lower() == "windows": ue_modules_path = engine_path / "Engine/Binaries/Win64" diff --git a/openpype/hosts/unreal/ue_workers.py b/openpype/hosts/unreal/ue_workers.py index 35735fcaa1..7dd08144e6 100644 --- a/openpype/hosts/unreal/ue_workers.py +++ b/openpype/hosts/unreal/ue_workers.py @@ -64,19 +64,6 @@ class UEProjectGenerationWorker(QtCore.QObject): self.engine_path = engine_path def run(self): - - - ue_id = ".".join(self.ue_version.split(".")[:2]) - # get unreal engine identifier - # ------------------------------------------------------------------------- - # FIXME (antirotor): As of 4.26 this is problem with UE4 built from - # sources. In that case Engine ID is calculated per machine/user and not - # from Engine files as this code then reads. This then prevents UE4 - # to directly open project as it will complain about project being - # created in different UE4 version. When user convert such project - # to his UE4 version, Engine ID is replaced in uproject file. If some - # other user tries to open it, it will present him with similar error. - # engine_path should be the location of UE_X.X folder ue_editor_exe = ue_lib.get_editor_exe_path(self.engine_path, @@ -122,10 +109,17 @@ class UEProjectGenerationWorker(QtCore.QObject): self.stage_begin.emit(f'Writing the Engine ID of the build UE ... 1 out' f' of {stage_count}') + if not project_file.is_file(): + msg = "Failed to write the Engine ID into .uproject file! Can " \ + "not read!" + self.failed.emit(msg) + raise RuntimeError(msg) + with open(project_file.as_posix(), mode="r+") as pf: pf_json = json.load(pf) pf_json["EngineAssociation"] = ue_lib.get_build_id(self.engine_path, self.ue_version) + print(pf_json["EngineAssociation"]) pf.seek(0) json.dump(pf_json, pf, indent=4) pf.truncate() diff --git a/openpype/widgets/splash_screen.py b/openpype/widgets/splash_screen.py index 4a7598180d..6af19e991c 100644 --- a/openpype/widgets/splash_screen.py +++ b/openpype/widgets/splash_screen.py @@ -64,7 +64,8 @@ class SplashScreen(QtWidgets.QDialog): None """ if not q_thread: - raise RuntimeError("Failed to run a worker thread! The thread is null!") + raise RuntimeError("Failed to run a worker thread! " + "The thread is null!") self.q_thread = q_thread self.q_thread.start() @@ -147,8 +148,12 @@ class SplashScreen(QtWidgets.QDialog): self.scroll_area.hide() log_widget = QtWidgets.QWidget(self.scroll_area) self.scroll_area.setWidgetResizable(True) - self.scroll_area.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) - self.scroll_area.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) + self.scroll_area.setHorizontalScrollBarPolicy( + QtCore.Qt.ScrollBarAlwaysOn + ) + self.scroll_area.setVerticalScrollBarPolicy( + QtCore.Qt.ScrollBarAlwaysOn + ) self.scroll_area.setWidget(log_widget) self.scroll_bar = self.scroll_area.verticalScrollBar() @@ -203,8 +208,8 @@ class SplashScreen(QtWidgets.QDialog): """A slot used for receiving log info and appending it to scroll area's content. Args: - text (str): A log text that will append to the current one in the scroll - area. + text (str): A log text that will append to the current one in the + scroll area. end (str): end string which can be appended to the end of the given line (for ex. a line break). From 78d737e4b30e1a890ff0ca6d085050d88bdedc6b Mon Sep 17 00:00:00 2001 From: Joseff Date: Wed, 8 Mar 2023 17:20:50 +0100 Subject: [PATCH 845/912] Reformatted the file --- openpype/widgets/splash_screen.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/widgets/splash_screen.py b/openpype/widgets/splash_screen.py index 6af19e991c..fffe143ea5 100644 --- a/openpype/widgets/splash_screen.py +++ b/openpype/widgets/splash_screen.py @@ -30,8 +30,8 @@ class SplashScreen(QtWidgets.QDialog): """ Args: window_title (str): String which sets the window title - splash_icon (str | bytes | None): A resource (pic) which is used for - the splash icon + splash_icon (str | bytes | None): A resource (pic) which is used + for the splash icon window_icon (str | bytes | None: A resource (pic) which is used for the window's icon """ @@ -113,7 +113,7 @@ class SplashScreen(QtWidgets.QDialog): self.setStyleSheet(style.load_stylesheet()) # Top Section - self.top_label = QtWidgets.QLabel(self); + self.top_label = QtWidgets.QLabel(self) self.top_label.setText("Starting process ...") self.top_label.setWordWrap(True) From fc67c5a2c0b4d5a3bd4abae3ab860cc9f81a3762 Mon Sep 17 00:00:00 2001 From: Joseff Date: Wed, 8 Mar 2023 17:23:37 +0100 Subject: [PATCH 846/912] Fixed the line indentation. --- openpype/hosts/unreal/ue_workers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/unreal/ue_workers.py b/openpype/hosts/unreal/ue_workers.py index 7dd08144e6..2162357912 100644 --- a/openpype/hosts/unreal/ue_workers.py +++ b/openpype/hosts/unreal/ue_workers.py @@ -310,8 +310,8 @@ class UEPluginInstallWorker(QtCore.QObject): raise RuntimeError(msg) # Create a path to the plugin in the engine - op_plugin_path = self.engine_path / \ - "Engine/Plugins/Marketplace/OpenPype" + op_plugin_path = self.engine_path / "Engine/Plugins/Marketplace" \ + "/OpenPype" if not op_plugin_path.is_dir(): self.installing.emit("Installing and building the plugin ...") From e5b7349dff710bc2577e1a9adba39cde9748e231 Mon Sep 17 00:00:00 2001 From: Joseff Date: Wed, 8 Mar 2023 17:26:27 +0100 Subject: [PATCH 847/912] Code cleanup --- openpype/hosts/unreal/ue_workers.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/openpype/hosts/unreal/ue_workers.py b/openpype/hosts/unreal/ue_workers.py index 2162357912..00f83a7d7a 100644 --- a/openpype/hosts/unreal/ue_workers.py +++ b/openpype/hosts/unreal/ue_workers.py @@ -106,8 +106,8 @@ class UEProjectGenerationWorker(QtCore.QObject): raise RuntimeError(msg) print("--- Project has been generated successfully.") - self.stage_begin.emit(f'Writing the Engine ID of the build UE ... 1 out' - f' of {stage_count}') + self.stage_begin.emit(f'Writing the Engine ID of the build UE ... 1' + f' out of {stage_count}') if not project_file.is_file(): msg = "Failed to write the Engine ID into .uproject file! Can " \ @@ -117,8 +117,10 @@ class UEProjectGenerationWorker(QtCore.QObject): with open(project_file.as_posix(), mode="r+") as pf: pf_json = json.load(pf) - pf_json["EngineAssociation"] = ue_lib.get_build_id(self.engine_path, - self.ue_version) + pf_json["EngineAssociation"] = ue_lib.get_build_id( + self.engine_path, + self.ue_version + ) print(pf_json["EngineAssociation"]) pf.seek(0) json.dump(pf_json, pf, indent=4) @@ -132,7 +134,8 @@ class UEProjectGenerationWorker(QtCore.QObject): f'{stage_count}') self.progress.emit(0) - ubt_path = ue_lib.get_path_to_ubt(self.engine_path, self.ue_version) + ubt_path = ue_lib.get_path_to_ubt(self.engine_path, + self.ue_version) arch = "Win64" if platform.system().lower() == "windows": @@ -199,8 +202,8 @@ class UEProjectGenerationWorker(QtCore.QObject): # ensure we have PySide2 installed in engine self.progress.emit(0) - self.stage_begin.emit(f'Checking PySide2 installation... {stage_count} ' - f'out of {stage_count}') + self.stage_begin.emit(f'Checking PySide2 installation... {stage_count}' + f' out of {stage_count}') python_path = None if platform.system().lower() == "windows": python_path = self.engine_path / ("Engine/Binaries/ThirdParty/" From 7941c73f82ce7d708e7387f0db4f39df54c58f67 Mon Sep 17 00:00:00 2001 From: Joseff Date: Wed, 8 Mar 2023 17:27:25 +0100 Subject: [PATCH 848/912] Code cleanup --- openpype/hosts/unreal/hooks/pre_workfile_preparation.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py index c3f9ea7e72..da12bc75de 100644 --- a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py +++ b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py @@ -82,7 +82,9 @@ class UnrealPrelaunchHook(PreLaunchHook): ) # set up the splash screen with necessary triggers - ue_plugin_worker.installing.connect(splash_screen.update_top_label_text) + ue_plugin_worker.installing.connect( + splash_screen.update_top_label_text + ) ue_plugin_worker.progress.connect(splash_screen.update_progress) ue_plugin_worker.log.connect(splash_screen.append_log) ue_plugin_worker.finished.connect(splash_screen.quit_and_close) From 3b64f515b25ebeccd4235a02722aa1e1eef26bc0 Mon Sep 17 00:00:00 2001 From: Ynbot Date: Sat, 11 Mar 2023 03:26:36 +0000 Subject: [PATCH 849/912] [Automated] Bump version --- openpype/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/version.py b/openpype/version.py index c7a5e9bea5..e8124f1466 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.15.2-nightly.5" +__version__ = "3.15.2-nightly.6" From c3becbffe0c5476fbac0a401bb710b9246e493e4 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sat, 11 Mar 2023 19:42:14 +0100 Subject: [PATCH 850/912] Fix #4429: Do not reset fps or playback timeline on applying or creating render settings --- openpype/hosts/maya/api/lib.py | 41 ++++++++++++------- openpype/hosts/maya/api/lib_rendersettings.py | 2 +- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index 954576f02e..61106c58cf 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -2099,29 +2099,40 @@ def get_frame_range(): } -def reset_frame_range(): - """Set frame range to current asset""" +def reset_frame_range(playback=True, render=True, fps=True): + """Set frame range to current asset - fps = convert_to_maya_fps( - float(legacy_io.Session.get("AVALON_FPS", 25)) - ) - set_scene_fps(fps) + Args: + playback (bool, Optional): Whether to set the maya timeline playback + frame range. Defaults to True. + render (bool, Optional): Whether to set the maya render frame range. + Defaults to True. + fps (bool, Optional): Whether to set scene FPS. Defaults to True. + """ + + if fps: + fps = convert_to_maya_fps( + float(legacy_io.Session.get("AVALON_FPS", 25)) + ) + set_scene_fps(fps) frame_range = get_frame_range() frame_start = frame_range["frameStart"] - int(frame_range["handleStart"]) frame_end = frame_range["frameEnd"] + int(frame_range["handleEnd"]) - cmds.playbackOptions(minTime=frame_start) - cmds.playbackOptions(maxTime=frame_end) - cmds.playbackOptions(animationStartTime=frame_start) - cmds.playbackOptions(animationEndTime=frame_end) - cmds.playbackOptions(minTime=frame_start) - cmds.playbackOptions(maxTime=frame_end) - cmds.currentTime(frame_start) + if playback: + cmds.playbackOptions(minTime=frame_start) + cmds.playbackOptions(maxTime=frame_end) + cmds.playbackOptions(animationStartTime=frame_start) + cmds.playbackOptions(animationEndTime=frame_end) + cmds.playbackOptions(minTime=frame_start) + cmds.playbackOptions(maxTime=frame_end) + cmds.currentTime(frame_start) - cmds.setAttr("defaultRenderGlobals.startFrame", frame_start) - cmds.setAttr("defaultRenderGlobals.endFrame", frame_end) + if render: + cmds.setAttr("defaultRenderGlobals.startFrame", frame_start) + cmds.setAttr("defaultRenderGlobals.endFrame", frame_end) def reset_scene_resolution(): diff --git a/openpype/hosts/maya/api/lib_rendersettings.py b/openpype/hosts/maya/api/lib_rendersettings.py index 7d44d4eaa6..eaa728a2f6 100644 --- a/openpype/hosts/maya/api/lib_rendersettings.py +++ b/openpype/hosts/maya/api/lib_rendersettings.py @@ -158,7 +158,7 @@ class RenderSettings(object): cmds.setAttr( "defaultArnoldDriver.mergeAOVs", multi_exr) self._additional_attribs_setter(additional_options) - reset_frame_range() + reset_frame_range(playback=False, fps=False, render=True) def _set_redshift_settings(self, width, height): """Sets settings for Redshift.""" From e2902e86232d738433a9de45f84eb3d3b0b296e1 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sat, 11 Mar 2023 20:49:26 +0100 Subject: [PATCH 851/912] Fix #4109: Unify menu labels for "Set Frame Range" and "Set Resolution" --- openpype/hosts/blender/api/ops.py | 4 ++-- openpype/hosts/houdini/startup/MainMenuCommon.xml | 2 +- openpype/hosts/maya/api/menu.py | 4 ++-- openpype/hosts/resolve/api/menu.py | 8 ++++---- website/docs/artist_hosts_maya.md | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/openpype/hosts/blender/api/ops.py b/openpype/hosts/blender/api/ops.py index 481c199db2..b1fa13acb9 100644 --- a/openpype/hosts/blender/api/ops.py +++ b/openpype/hosts/blender/api/ops.py @@ -382,8 +382,8 @@ class TOPBAR_MT_avalon(bpy.types.Menu): layout.operator(LaunchLibrary.bl_idname, text="Library...") layout.separator() layout.operator(LaunchWorkFiles.bl_idname, text="Work Files...") - # TODO (jasper): maybe add 'Reload Pipeline', 'Reset Frame Range' and - # 'Reset Resolution'? + # TODO (jasper): maybe add 'Reload Pipeline', 'Set Frame Range' and + # 'Set Resolution'? def draw_avalon_menu(self, context): diff --git a/openpype/hosts/houdini/startup/MainMenuCommon.xml b/openpype/hosts/houdini/startup/MainMenuCommon.xml index c08114b71b..e12000b855 100644 --- a/openpype/hosts/houdini/startup/MainMenuCommon.xml +++ b/openpype/hosts/houdini/startup/MainMenuCommon.xml @@ -67,7 +67,7 @@ host_tools.show_workfiles(parent) - + / ``` -Doing **OpenPype → Reset Resolution** will set correct resolution on camera. +Doing **OpenPype → Set Resolution** will set correct resolution on camera. Scene is now ready for submission and should publish without errors. From 7efb019ebc799905e4fc126883aaf9ffb86936ec Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sat, 11 Mar 2023 20:50:30 +0100 Subject: [PATCH 852/912] Match id with label --- openpype/hosts/houdini/startup/MainMenuCommon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/houdini/startup/MainMenuCommon.xml b/openpype/hosts/houdini/startup/MainMenuCommon.xml index e12000b855..47595ebd8c 100644 --- a/openpype/hosts/houdini/startup/MainMenuCommon.xml +++ b/openpype/hosts/houdini/startup/MainMenuCommon.xml @@ -66,7 +66,7 @@ host_tools.show_workfiles(parent) ]]> - + Date: Mon, 13 Mar 2023 10:32:19 +0100 Subject: [PATCH 853/912] SiteSync: host dirmap is not working properly (#4563) - only editable keys are returned from Site Sync module to Local Settings Cleaner approach even if LS UI is going away in Ayon. - use remote_site only if is local_drive provider - remove unwanted import - cache mapping, update logging Mapping was called multiple times for Nuke. Logging was too verbose. --- openpype/host/dirmap.py | 63 +++++++++---------- openpype/hosts/nuke/api/lib.py | 54 +++++++++------- .../modules/sync_server/sync_server_module.py | 20 +++++- .../local_settings/projects_widget.py | 2 +- 4 files changed, 81 insertions(+), 58 deletions(-) diff --git a/openpype/host/dirmap.py b/openpype/host/dirmap.py index 347c5fbf85..1d084cccad 100644 --- a/openpype/host/dirmap.py +++ b/openpype/host/dirmap.py @@ -39,7 +39,6 @@ class HostDirmap(object): self._project_settings = project_settings self._sync_module = sync_module # to limit reinit of Modules self._log = None - self._mapping = None # cache mapping @property def sync_module(self): @@ -70,29 +69,28 @@ class HostDirmap(object): """Run host dependent remapping from source_path to destination_path""" pass - def process_dirmap(self): + def process_dirmap(self, mapping=None): # type: (dict) -> None """Go through all paths in Settings and set them using `dirmap`. If artists has Site Sync enabled, take dirmap mapping directly from Local Settings when artist is syncing workfile locally. - Args: - project_settings (dict): Settings for current project. """ - if not self._mapping: - self._mapping = self.get_mappings(self.project_settings) - if not self._mapping: + if not mapping: + mapping = self.get_mappings() + if not mapping: return - self.log.info("Processing directory mapping ...") self.on_enable_dirmap() - self.log.info("mapping:: {}".format(self._mapping)) - for k, sp in enumerate(self._mapping["source-path"]): - dst = self._mapping["destination-path"][k] + for k, sp in enumerate(mapping["source-path"]): + dst = mapping["destination-path"][k] try: + # add trailing slash if missing + sp = os.path.join(sp, '') + dst = os.path.join(dst, '') print("{} -> {}".format(sp, dst)) self.dirmap_routine(sp, dst) except IndexError: @@ -110,28 +108,24 @@ class HostDirmap(object): ) continue - def get_mappings(self, project_settings): + def get_mappings(self): """Get translation from source-path to destination-path. It checks if Site Sync is enabled and user chose to use local site, in that case configuration in Local Settings takes precedence """ - local_mapping = self._get_local_sync_dirmap(project_settings) dirmap_label = "{}-dirmap".format(self.host_name) - if ( - not self.project_settings[self.host_name].get(dirmap_label) - and not local_mapping - ): - return {} - mapping_settings = self.project_settings[self.host_name][dirmap_label] - mapping_enabled = mapping_settings["enabled"] or bool(local_mapping) + mapping_sett = self.project_settings[self.host_name].get(dirmap_label, + {}) + local_mapping = self._get_local_sync_dirmap() + mapping_enabled = mapping_sett.get("enabled") or bool(local_mapping) if not mapping_enabled: return {} mapping = ( local_mapping - or mapping_settings["paths"] + or mapping_sett["paths"] or {} ) @@ -141,28 +135,27 @@ class HostDirmap(object): or not mapping.get("source-path") ): return {} + self.log.info("Processing directory mapping ...") + self.log.info("mapping:: {}".format(mapping)) return mapping - def _get_local_sync_dirmap(self, project_settings): + def _get_local_sync_dirmap(self): """ Returns dirmap if synch to local project is enabled. Only valid mapping is from roots of remote site to local site set in Local Settings. - Args: - project_settings (dict) Returns: dict : { "source-path": [XXX], "destination-path": [YYYY]} """ + project_name = os.getenv("AVALON_PROJECT") mapping = {} - - if not project_settings["global"]["sync_server"]["enabled"]: + if (not self.sync_module.enabled or + project_name not in self.sync_module.get_enabled_projects()): return mapping - project_name = os.getenv("AVALON_PROJECT") - active_site = self.sync_module.get_local_normalized_site( self.sync_module.get_active_site(project_name)) remote_site = self.sync_module.get_local_normalized_site( @@ -171,11 +164,7 @@ class HostDirmap(object): "active {} - remote {}".format(active_site, remote_site) ) - if ( - active_site == "local" - and project_name in self.sync_module.get_enabled_projects() - and active_site != remote_site - ): + if active_site == "local" and active_site != remote_site: sync_settings = self.sync_module.get_sync_project_setting( project_name, exclude_locals=False, @@ -188,7 +177,15 @@ class HostDirmap(object): self.log.debug("local overrides {}".format(active_overrides)) self.log.debug("remote overrides {}".format(remote_overrides)) + current_platform = platform.system().lower() + remote_provider = self.sync_module.get_provider_for_site( + project_name, remote_site + ) + # dirmap has sense only with regular disk provider, in the workfile + # wont be root on cloud or sftp provider + if remote_provider != "local_drive": + remote_site = "studio" for root_name, active_site_dir in active_overrides.items(): remote_site_dir = ( remote_overrides.get(root_name) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index a5a631cc70..2a14096f0e 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -2861,10 +2861,10 @@ class NukeDirmap(HostDirmap): pass def dirmap_routine(self, source_path, destination_path): - log.debug("{}: {}->{}".format(self.file_name, - source_path, destination_path)) source_path = source_path.lower().replace(os.sep, '/') destination_path = destination_path.lower().replace(os.sep, '/') + log.debug("Map: {} with: {}->{}".format(self.file_name, + source_path, destination_path)) if platform.system().lower() == "windows": self.file_name = self.file_name.lower().replace( source_path, destination_path) @@ -2878,6 +2878,7 @@ class DirmapCache: _project_name = None _project_settings = None _sync_module = None + _mapping = None @classmethod def project_name(cls): @@ -2897,6 +2898,36 @@ class DirmapCache: cls._sync_module = ModulesManager().modules_by_name["sync_server"] return cls._sync_module + @classmethod + def mapping(cls): + return cls._mapping + + @classmethod + def set_mapping(cls, mapping): + cls._mapping = mapping + + +def dirmap_file_name_filter(file_name): + """Nuke callback function with single full path argument. + + Checks project settings for potential mapping from source to dest. + """ + + dirmap_processor = NukeDirmap( + file_name, + "nuke", + DirmapCache.project_name(), + DirmapCache.project_settings(), + DirmapCache.sync_module(), + ) + if not DirmapCache.mapping(): + DirmapCache.set_mapping(dirmap_processor.get_mappings()) + + dirmap_processor.process_dirmap(DirmapCache.mapping()) + if os.path.exists(dirmap_processor.file_name): + return dirmap_processor.file_name + return file_name + @contextlib.contextmanager def node_tempfile(): @@ -2942,25 +2973,6 @@ def duplicate_node(node): return dupli_node -def dirmap_file_name_filter(file_name): - """Nuke callback function with single full path argument. - - Checks project settings for potential mapping from source to dest. - """ - - dirmap_processor = NukeDirmap( - file_name, - "nuke", - DirmapCache.project_name(), - DirmapCache.project_settings(), - DirmapCache.sync_module(), - ) - dirmap_processor.process_dirmap() - if os.path.exists(dirmap_processor.file_name): - return dirmap_processor.file_name - return file_name - - def get_group_io_nodes(nodes): """Get the input and the output of a group of nodes.""" diff --git a/openpype/modules/sync_server/sync_server_module.py b/openpype/modules/sync_server/sync_server_module.py index 28863c091a..5a4fa07e98 100644 --- a/openpype/modules/sync_server/sync_server_module.py +++ b/openpype/modules/sync_server/sync_server_module.py @@ -1472,13 +1472,15 @@ class SyncServerModule(OpenPypeModule, ITrayModule): return sync_settings - def get_all_site_configs(self, project_name=None): + def get_all_site_configs(self, project_name=None, + local_editable_only=False): """ Returns (dict) with all sites configured system wide. Args: project_name (str)(optional): if present, check if not disabled - + local_editable_only (bool)(opt): if True return only Local + Setting configurable (for LS UI) Returns: (dict): {'studio': {'provider':'local_drive'...}, 'MY_LOCAL': {'provider':....}} @@ -1499,9 +1501,21 @@ class SyncServerModule(OpenPypeModule, ITrayModule): if site_settings: detail.update(site_settings) system_sites[site] = detail - system_sites.update(self._get_default_site_configs(sync_enabled, project_name)) + if local_editable_only: + local_schema = SyncServerModule.get_local_settings_schema() + editable_keys = {} + for provider_code, editables in local_schema.items(): + editable_keys[provider_code] = ["enabled", "provider"] + for editable_item in editables: + editable_keys[provider_code].append(editable_item["key"]) + + for _, site in system_sites.items(): + provider = site["provider"] + for site_config_key in list(site.keys()): + if site_config_key not in editable_keys[provider]: + site.pop(site_config_key, None) return system_sites diff --git a/openpype/tools/settings/local_settings/projects_widget.py b/openpype/tools/settings/local_settings/projects_widget.py index bdf291524c..4a4148d7cd 100644 --- a/openpype/tools/settings/local_settings/projects_widget.py +++ b/openpype/tools/settings/local_settings/projects_widget.py @@ -272,7 +272,7 @@ class SitesWidget(QtWidgets.QWidget): ) site_configs = sync_server_module.get_all_site_configs( - self._project_name) + self._project_name, local_editable_only=True) roots_entity = ( self.project_settings[PROJECT_ANATOMY_KEY][LOCAL_ROOTS_KEY] From 86184a8ee0525c3f361850cae0b576aca051bdf4 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 13 Mar 2023 11:20:59 +0100 Subject: [PATCH 854/912] Tools: Fix recursive filtering (#4597) * check for 'filterRegExp' first * use recursive filtering option if is available --- openpype/tools/loader/widgets.py | 6 +++--- openpype/tools/sceneinventory/model.py | 6 +++--- openpype/tools/sceneinventory/window.py | 6 +++--- .../tools/settings/settings/search_dialog.py | 12 +++++------ .../model_filter_proxy_recursive_sort.py | 6 +++--- openpype/tools/utils/models.py | 20 ++++++++++++++----- 6 files changed, 33 insertions(+), 23 deletions(-) diff --git a/openpype/tools/loader/widgets.py b/openpype/tools/loader/widgets.py index 98ac9c871f..b3aa381d14 100644 --- a/openpype/tools/loader/widgets.py +++ b/openpype/tools/loader/widgets.py @@ -295,10 +295,10 @@ class SubsetWidget(QtWidgets.QWidget): self.model.set_grouping(state) def _subset_changed(self, text): - if hasattr(self.proxy, "setFilterRegularExpression"): - self.proxy.setFilterRegularExpression(text) - else: + if hasattr(self.proxy, "setFilterRegExp"): self.proxy.setFilterRegExp(text) + else: + self.proxy.setFilterRegularExpression(text) self.view.expandAll() def set_loading_state(self, loading, empty): diff --git a/openpype/tools/sceneinventory/model.py b/openpype/tools/sceneinventory/model.py index 3398743aec..680dfd5a51 100644 --- a/openpype/tools/sceneinventory/model.py +++ b/openpype/tools/sceneinventory/model.py @@ -482,10 +482,10 @@ class FilterProxyModel(QtCore.QSortFilterProxyModel): return True # Filter by regex - if hasattr(self, "filterRegularExpression"): - regex = self.filterRegularExpression() - else: + if hasattr(self, "filterRegExp"): regex = self.filterRegExp() + else: + regex = self.filterRegularExpression() pattern = regex.pattern() if pattern: pattern = re.escape(pattern) diff --git a/openpype/tools/sceneinventory/window.py b/openpype/tools/sceneinventory/window.py index 8a6e43f796..89424fd746 100644 --- a/openpype/tools/sceneinventory/window.py +++ b/openpype/tools/sceneinventory/window.py @@ -160,10 +160,10 @@ class SceneInventoryWindow(QtWidgets.QDialog): self._model.set_hierarchy_view(enabled) def _on_text_filter_change(self, text_filter): - if hasattr(self._proxy, "setFilterRegularExpression"): - self._proxy.setFilterRegularExpression(text_filter) - else: + if hasattr(self._proxy, "setFilterRegExp"): self._proxy.setFilterRegExp(text_filter) + else: + self._proxy.setFilterRegularExpression(text_filter) def _on_outdated_state_change(self): self._proxy.set_filter_outdated( diff --git a/openpype/tools/settings/settings/search_dialog.py b/openpype/tools/settings/settings/search_dialog.py index 33a4d16e98..59750c02e1 100644 --- a/openpype/tools/settings/settings/search_dialog.py +++ b/openpype/tools/settings/settings/search_dialog.py @@ -27,10 +27,10 @@ class RecursiveSortFilterProxyModel(QtCore.QSortFilterProxyModel): if not parent.isValid(): return False - if hasattr(self, "filterRegularExpression"): - regex = self.filterRegularExpression() - else: + if hasattr(self, "filterRegExp"): regex = self.filterRegExp() + else: + regex = self.filterRegularExpression() pattern = regex.pattern() if pattern and regex.isValid(): @@ -111,10 +111,10 @@ class SearchEntitiesDialog(QtWidgets.QDialog): def _on_filter_timer(self): text = self._filter_edit.text() - if hasattr(self._proxy, "setFilterRegularExpression"): - self._proxy.setFilterRegularExpression(text) - else: + if hasattr(self._proxy, "setFilterRegExp"): self._proxy.setFilterRegExp(text) + else: + self._proxy.setFilterRegularExpression(text) # WARNING This expanding and resizing is relatively slow. self._view.expandAll() diff --git a/openpype/tools/standalonepublish/widgets/model_filter_proxy_recursive_sort.py b/openpype/tools/standalonepublish/widgets/model_filter_proxy_recursive_sort.py index 5c72e2049b..602faaa489 100644 --- a/openpype/tools/standalonepublish/widgets/model_filter_proxy_recursive_sort.py +++ b/openpype/tools/standalonepublish/widgets/model_filter_proxy_recursive_sort.py @@ -5,10 +5,10 @@ from qtpy import QtCore class RecursiveSortFilterProxyModel(QtCore.QSortFilterProxyModel): """Filters to the regex if any of the children matches allow parent""" def filterAcceptsRow(self, row, parent): - if hasattr(self, "filterRegularExpression"): - regex = self.filterRegularExpression() - else: + if hasattr(self, "filterRegExp"): regex = self.filterRegExp() + else: + regex = self.filterRegularExpression() pattern = regex.pattern() if pattern: model = self.sourceModel() diff --git a/openpype/tools/utils/models.py b/openpype/tools/utils/models.py index 270e00b2ef..94645af110 100644 --- a/openpype/tools/utils/models.py +++ b/openpype/tools/utils/models.py @@ -202,11 +202,20 @@ class RecursiveSortFilterProxyModel(QtCore.QSortFilterProxyModel): Use case: Filtering by string - parent won't be filtered if does not match the filter string but first checks if any children does. """ + + def __init__(self, *args, **kwargs): + super(RecursiveSortFilterProxyModel, self).__init__(*args, **kwargs) + recursive_enabled = False + if hasattr(self, "setRecursiveFilteringEnabled"): + self.setRecursiveFilteringEnabled(True) + recursive_enabled = True + self._recursive_enabled = recursive_enabled + def filterAcceptsRow(self, row, parent_index): - if hasattr(self, "filterRegularExpression"): - regex = self.filterRegularExpression() - else: + if hasattr(self, "filterRegExp"): regex = self.filterRegExp() + else: + regex = self.filterRegularExpression() pattern = regex.pattern() if pattern: @@ -219,8 +228,9 @@ class RecursiveSortFilterProxyModel(QtCore.QSortFilterProxyModel): # Check current index itself value = model.data(source_index, self.filterRole()) - if re.search(pattern, value, re.IGNORECASE): - return True + matched = bool(re.search(pattern, value, re.IGNORECASE)) + if matched or self._recursive_enabled: + return matched rows = model.rowCount(source_index) for idx in range(rows): From d6555321ae38ba2bb2a41d46236415d1c8ec4cdf Mon Sep 17 00:00:00 2001 From: Ynbot Date: Mon, 13 Mar 2023 14:30:56 +0000 Subject: [PATCH 855/912] [Automated] Release --- CHANGELOG.md | 848 ++++++++++++++++++++++++++++++++++++++++++++ openpype/version.py | 2 +- pyproject.toml | 2 +- 3 files changed, 850 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7ecbc83bf..145c2e2c1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,854 @@ # Changelog +[Full Changelog](https://github.com/ynput/OpenPype/compare/3.15.1...3.15.2) + +### **🆕 New features** + + +
+maya gltf texture convertor and validator #4261 + +Continuity of the gltf extractor implementation + +Continuity of the gltf extractor https://github.com/pypeclub/OpenPype/pull/4192UPDATE:**Validator for GLSL Shader**: Validate whether the mesh uses GLSL Shader. If not it will error out. The user can choose to perform the repair action and it will help to assign glsl shader. If the mesh with Stringray PBS, the repair action will also check to see if there is any linked texture such as Color, Occulsion, and Normal Map. If yes, it will help to relink the related textures to the glsl shader.*****If the mesh uses the PBS Shader, + + +___ + +
+ + +
+Unreal: New Publisher #4370 + +Implementation of the new publisher for Unreal. + +The implementation of the new publisher for Unreal. This PR includes the changes for all the existing creators to be compatible with the new publisher.The basic creator has been split in two distinct creators: +- `UnrealAssetCreator`, works with assets in the Content Browser. +- `UnrealActorCreator` that works with actors in the scene. + + +___ + +
+ + +
+Implementation of a new splash screen #4592 + +Implemented a new splash screen widget to reflect a process running in the background. This widget can be used for other tasks than UE. **Also fixed the compilation error of the AssetContainer.cpp when trying to build the plugin in UE 5.0** + + +___ + +
+ + +
+Deadline for 3dsMax #4439 + +Setting up deadline for 3dsmax + +Setting up deadline for 3dsmax by setting render outputs and viewport camera + + +___ + +
+ + +
+Nuke: adding nukeassist #4494 + +Adding support for NukeAssist + +For support of NukeAssist we had to limit some Nuke features since NukeAssist itself Nuke with limitations. We do not support Creator and Publisher. User can only Load versions with version control. User can also set Framerange and Colorspace. + + +___ + +
+ +### **🚀 Enhancements** + + +
+Maya: OP-2630 acescg maya #4340 + +Resolves #2712 + + +___ + +
+ + +
+Default Ftrack Family on RenderLayer #4458 + +With default settings, renderlayers in Maya were not being tagged with the Ftrack family leading to confusion when doing reviews. + + +___ + +
+ + +
+Maya: Maya Playblast Options - OP-3783 #4487 + +Replacement PR for #3912. Adds more options for playblasts to preferences/settings. + +Adds the following as options in generating playblasts, matching viewport settings. +- Use default material +- Wireframe on shaded +- X-ray +- X-ray Joints +- X-ray active component + + +___ + +
+ + +
+Maya: Passing custom attributes to alembic - OP-4111 #4516 + +Passing custom attributes to alembic + +This PR makes it possible to pass all user defined attributes along to the alembic representation. + + +___ + +
+ + +
+Maya: Options for VrayProxy output - OP-2010 #4525 + +Options for output of VrayProxy. + +Client requested more granular control of output from VrayProxy instance. Exposed options on the instance and settings for vrmesh and alembic. + + +___ + +
+ + +
+Maya: Validate missing instance attributes #4559 + +Validate missing instance attributes. + +New attributes can be introduced as new features come in. Old instances will need to be updated with these attributes for the documentation to make sense, and users do not have to recreate the instances. + + +___ + +
+ + +
+Refactored Generation of UE Projects, installation of plugins moved to the engine #4369 + +Improved the way how OpenPype works with generation of UE projects. Also the installation of the plugin has been altered to install into the engine + +OpenPype now uses the appropriate tools to generate UE projects. Unreal Build Tool (UBT) and a "Commandlet Project" is needed to properly generate a BP project, or C++ code in case that `dev_mode = True`, folders, the .uproject file and many other resources.On the plugin's side, it is built seperately with the UnrealAutomationTool (UAT) and then it's contents are moved under the `Engine/Plugins/Marketplace/OpenPype` directory. + + +___ + +
+ + +
+Unreal: Use client functions in Layout loader #4578 + +Use 'get_representations' instead of 'legacy_io' query in layout loader. + +This is removing usage of `find_one` called on `legacy_io` and use rather client functions as preparation for AYON connection. Also all representations are queried at once instead of one by one. + + +___ + +
+ + +
+General: Support for extensions filtering in loaders #4492 + +Added extensions filtering support to loader plugins. + +To avoid possible backwards compatibility break is filtering exactly the same and filtering by extensions is enabled only if class attribute 'extensions' is set. + + +___ + +
+ + +
+Nuke: multiple reformat in baking review profiles #4514 + +Added support for multiple reformat nodes in baking profiles. + +Old settings for single reformat node is supported and prioritised just in case studios are using it and backward compatibility is needed. Warnings in Nuke terminal are notifying users to switch settings to new workflow. Settings are also explaining the migration way. + + +___ + +
+ + +
+Nuke: Add option to use new creating system in workfile template builder #4545 + +Nuke workfile template builder can use new creators instead of legacy creators. + +Modified workfile template builder to have option to say if legacy creators should be used or new creators. Legacy creators are disabled by default, so Maya has changed the value. + + +___ + +
+ + +
+Global, Nuke: Workfile first version with template processing #4579 + +Supporting new template workfile builder with toggle for creation of first version of workfile in case there is none yet. + + +___ + +
+ + +
+Fusion: New Publisher #4523 + +This is an updated PR for @BigRoy 's old PR (https://github.com/ynput/OpenPype/pull/3892).I have merged it with code from OP 3.15.1-nightly.6 and made sure it works as expected.This converts the old publishing system to the new one. It implements Fusion as a new host addon. + + +- Create button removed in OpenPype menu in favor of the new Publisher +- Draft refactor validations to raise PublishValidationError +- Implement Creator for New Publisher +- Implement Fusion as Host addon + + +___ + +
+ + +
+TVPaint: Use Publisher tool #4471 + +Use Publisher tool and new creation system in TVPaint integration. + +Using new creation system makes TVPaint integration a little bit easier to maintain for artists. Removed unneeded tools Creator and Subset Manager tools. Goal is to keep the integration work as close as possible to previous integration. Some changes were made but primarilly because they were not right using previous system.All creators create instance with final family instead of changing the family during extraction. Render passes are not related to group id but to render layer instance. Render layer is still related to group. Workfile, review and scene render instances are created using autocreators instead of auto-collection during publishing. Subset names are fully filled during publishing but instance labels are filled on refresh with the last known right value. Implemented basic of legacy convertor which should convert render layers and render passes. + + +___ + +
+ + +
+TVPaint: Auto-detect render creation #4496 + +Create plugin which will create Render Layer and Render Pass instances based on information in the scene. + +Added new creator that must be triggered by artist. The create plugin will first create Render Layer instances if were not created yet. For variant is used color group name. The creator has option to rename color groups by template defined in settings -> Template may use index of group by it's usage in scene (from bottom to top). After Render Layers will create Render Passes. Render Pass is created for each individual TVPaint layer in any group that had created Render Layer. It's name is used as variant (pass). + + +___ + +
+ + +
+TVPaint: Small enhancements #4501 + +Small enhancements in TVPaint integration which did not get to https://github.com/ynput/OpenPype/pull/4471. + +It was found out that `opacity` returned from `tv_layerinfo` is always empty and is dangerous to add it to layer information. Added information about "current" layer to layers information. Disable review of Render Layer and Render Pass instances by default. In most of productions is used only "scene review". Skip usage of `"enabled"` key from settings in automated layer/pass creation. + + +___ + +
+ + +
+Global: color v3 global oiio transcoder plugin #4291 + +Implements possibility to use `oiiotool` to transcode image sequences from one color space to another(s). + +Uses collected `colorspaceData` information about source color spaces, these information needs to be collected previously in each DCC interested in color management.Uses profiles configured in Settings to create single or multiple new representations (and file extensions) with different color spaces.New representations might replace existing one, each new representation might contain different tags and custom tags to control its integration step. + + +___ + +
+ + +
+Deadline: Added support for multiple install dirs in Deadline #4451 + +SearchDirectoryList returns FIRST existing so if you would have multiple OP install dirs, it won't search for appropriate version in later ones. + + +___ + +
+ + +
+Ftrack: Upload reviewables with original name #4483 + +Ftrack can integrate reviewables with original filenames. + +As ftrack have restrictions about names of components the only way how to achieve the result was to upload the same file twice, one with required name and one with origin name. + + +___ + +
+ + +
+TVPaint: Ignore transparency in Render Pass #4499 + +It is possible to ignore layers transparency during Render Pass extraction. + +Render pass extraction does not respect opacity of TVPaint layers set in scene during extraction. It can be enabled/disabled in settings. + + +___ + +
+ + +
+Anatomy: Preparation for different root overrides #4521 + +Prepare Anatomy to handle only 'studio' site override on it's own. + +Change how Anatomy fill root overrides based on requested site name. The logic which decide what is active site was moved to sync server addon and the same for receiving root overrides of local site. The Anatomy resolve only studio site overrides anything else is handled by sync server. BaseAnatomy only expect root overrides value and does not need site name. Validation of site name happens in sync server same as resolving if site name is local or not. + + +___ + +
+ + +
+Nuke | Global: colormanaged plugin in collection #4556 + +Colormanaged extractor had changed to Mixin class so it can be added to any stage of publishing rather then just to Exctracting.Nuke is no collecting colorspaceData to representation collected on already rendered images. + +Mixin class can no be used as secondary parent in publishing plugins. + + +___ + +
+ +### **🐛 Bug fixes** + + +
+look publishing and srgb colorspace in maya #4276 + +Check the OCIO color management is enabled before doing linearize colorspace for converting the texture maps into tx files. + +Check whether the OCIO color management is enabled before the condition of converting the texture to tx extension. + + +___ + +
+ + +
+Maya: extract Thumbnail "No active model panel found" - OP-3849 #4421 + +Error when extracting playblast with no model panel. + +If `project_settings/maya/publish/ExtractPlayblast/capture_preset/Viewport Options/override_viewport_options` were off and publishing without showing any model panel, the extraction would fail. + + +___ + +
+ + +
+Maya: Fix setting scene fps with float input #4488 + +Returned value of float fps on integer values would return float. + +This PR fixes the case when switching between integer fps values for example 24 > 25. Issue was when setting the scene fps, the original float value was used which makes it unpredictable whether the value is float or integer when mapping the fps values. + + +___ + +
+ + +
+Maya: Multipart fix #4497 + +Fix multipart logic in render products. + +Each renderer has a different way of defining whether output images is multipart, so we need to define it for each renderer. Also before the `multipart` class variable was defined multiple times in several places, which made it tricky to debug where `multipart` was defined. Now its created on initialization and referenced as `self.multipart` + + +___ + +
+ + +
+Maya: Set pool on tile assembly - OP-2012 #4520 + +Set pool on tile assembly + +Pool for publishing and tiling jobs, need to use the settings (`project_settings/deadline/publish/ProcessSubmittedJobOnFarm/deadline_pool`) else fallback on primary pool (`project_settings/deadline/publish/CollectDeadlinePools/primary_pool`) + + +___ + +
+ + +
+Maya: Extract review with handles #4527 + +Review was not extracting properly with/without handles. + +Review instance was not created properly resulting in the frame range on the instance including handles. + + +___ + +
+ + +
+Maya: Fix broken lib. #4529 + +Fix broken lib. + +This commit from this PR broke the Maya lib module. + + +___ + +
+ + +
+Maya: Validate model name - OP-4983 #4539 + +Validate model name issues. + +Couple of issues with validate model name; +- missing platform extraction from settings +- map function should be list comprehension +- code cosmetics + + +___ + +
+ + +
+Maya: SkeletalMesh family loadable as reference #4573 + +In Maya, fix the SkeletalMesh family not loadable as reference. + + +___ + +
+ + +
+Unreal: fix loaders because of missing AssetContainer #4536 + +Fixing Unreal loaders, where changes in OpenPype Unreal integration plugin deleted AssetContainer. + +`AssetContainer` and `AssetContainerFactory` are still used to mark loaded instances. Because of optimizations in Integration plugin we've accidentally removed them but that broke loader. + + +___ + +
+ + +
+3dsmax unable to delete loaded asset in the scene inventory #4507 + +Fix the bug of being unable to delete loaded asset in the Scene Inventory + +Fix the bug of being unable to delete loaded asset in the Scene Inventory + + +___ + +
+ + +
+Hiero/Nuke: originalBasename editorial publishing and loading #4453 + +Publishing and loading `originalBasename` is working as expected + +Frame-ranges on version document is now correctly defined to fit original media frame range which is published. It means loading is now correctly identifying frame start and end on clip loader in Nuke. + + +___ + +
+ + +
+Nuke: Fix workfile template placeholder creation #4512 + +Template placeholder creation was erroring out in Nuke due to the Workfile template builder not being able to find any of the plugins for the Nuke host. + +Move `get_workfile_build_placeholder_plugins` function to NukeHost class as workfile template builder expects. + + +___ + +
+ + +
+Nuke: creator farm attributes from deadline submit plugin settings #4519 + +Defaults in farm attributes are sourced from settings. + +Settings for deadline nuke submitter are now used during nuke render and prerender creator plugins. + + +___ + +
+ + +
+Nuke: fix clip sequence loading #4574 + +Nuke is loading correctly clip from image sequence created without "{originalBasename}" token in anatomy template. + + +___ + +
+ + +
+Fusion: Fix files collection and small bug-fixes #4423 + +Fixed Fusion review-representation and small bug-fixes + +This fixes the problem with review-file generation that stopped the publishing on second publish before the fix.The problem was that Fusion simply looked at all the files in the render-folder instead of only gathering the needed frames for the review.Also includes a fix to get the handle start/end that before throw an error if the data didn't exist (like from a kitsu sync). + + +___ + +
+ + +
+Fusion: Updated render_local.py to not only process the first instance #4522 + +Moved the `__hasRun` to `render_once()` so the check only happens with the rendering. Currently only the first render node gets the representations added.Critical PR + + +___ + +
+ + +
+Fusion: Load sequence fix filepath resolving from representation #4580 + +Resolves issue mentioned on discord by @movalex:The loader was incorrectly trying to find the file in the publish folder which resulted in just picking 'any first file'. + +This gets the filepath from representation instead of taking the first file from listing files from publish folder. + + +___ + +
+ + +
+Fusion: Fix review burnin start and end frame #4590 + +Fix the burnin start and end frame for reviews. Without this the asset document's start and end handle would've been added to the _burnin_ frame range even though that would've been incorrect since the handles are based on the comp saver's render range instead. + + +___ + +
+ + +
+Harmony: missing set of frame range when opening scene #4485 + +Frame range gets set from DB everytime scene is opened. + +Added also check for not up-to-date loaded containers. + + +___ + +
+ + +
+Photoshop: context is not changed in publisher #4570 + +When PS is already open and artists launch new task, it should keep only opened PS open, but change context. + +Problem were occurring in Workfile app where under new task files from old task were shown. This fixes this and adds opening of last workfile for new context if workfile exists. + + +___ + +
+ + +
+hiero: fix effect item node class #4543 + +Collected effect name after renaming is saving correct class name. + + +___ + +
+ + +
+Bugfix/OP-4616 vray multipart #4297 + +This fixes a bug where multipart vray renders would not make a review in Ftrack. + + +___ + +
+ + +
+Maya: Fix changed location of reset_frame_range #4491 + +Location in commands caused cyclic import + + +___ + +
+ + +
+global: source template fixed frame duplication #4503 + +Duplication is not happening. + +Template is using `originalBasename` which already assume all necessary elements are part of the file name so there was no need for additional optional name elements. + + +___ + +
+ + +
+Deadline: Hint to use Python 3 #4518 + +Added shebank to give deadline hint which python should be used. + +Deadline has issues with Python 2 (especially with `os.scandir`). When a shebank is added to file header deadline will use python 3 mode instead of python 2 which fix the issue. + + +___ + +
+ + +
+Publisher: Prevent access to create tab after publish start #4528 + +Prevent access to create tab after publish start. + +Disable create button in instance view on publish start and enable it again on reset. Even with that make sure that it is not possible to go to create tab if the tab is disabled. + + +___ + +
+ + +
+Color Transcoding: store target_colorspace as new colorspace #4544 + +When transcoding into new colorspace, representation must carry this information instead original color space. + + +___ + +
+ + +
+Deadline: fix submit_publish_job #4552 + +Fix submit_publish_job + +Resolves #4541 + + +___ + +
+ + +
+Kitsu: Fix task itteration in update-op-with-zou #4577 + +From the last PR (https://github.com/ynput/OpenPype/pull/4425) a comment-commit last second messed up the code and resulted in two lines being the same, crashing the script. This PR fixes that. +___ + +
+ + +
+AttrDefs: Fix type for PySide6 #4584 + +Use right type in signal emit for value change of attribute definitions. + +Changed `UUID` type to `str`. This is not an issue with PySide2 but it is with PySide6. + + +___ + +
+ +### **🔀 Refactored code** + + +
+Scene Inventory: Avoid using ObjectId #4524 + +Avoid using conversion to ObjectId type in scene inventory tool. + +Preparation for AYON compatibility where ObjectId won't be used for ids. Representation ids from loaded containers are not converted to ObjectId but kept as strings which also required some changes when working with representation documents. + + +___ + +
+ +### **Merged pull requests** + + +
+SiteSync: host dirmap is not working properly #4563 + +If artists uses SiteSync with real remote (gdrive, dropbox, sftp) drive, Local Settings were throwing error `string indices must be integers`. + +Logic was reworked to provide only `local_drive` values to be overrriden by Local Settings. If remote site is `gdrive` etc. mapping to `studio` is provided as it is expected that workfiles will have imported from `studio` location and not from `gdrive` folder.Also Nuke dirmap was reworked to be less verbose and much faster. + + +___ + +
+ + +
+General: Input representation ids are not ObjectIds #4576 + +Don't use `ObjectId` as representation ids during publishing. + +Representation ids are kept as strings during publishing instead of converting them to `ObjectId`. This change is pre-requirement for AYON connection.Inputs are used for integration of links and for farm publishing (or at least it looks like). + + +___ + +
+ + +
+Shotgrid: Fixes on Deadline submissions #4498 + +A few other bug fixes for getting Nuke submission to Deadline work smoothly using Shotgrid integration. + +Continuing on the work done on this other PR this fixes a few other bugs I came across with further tests. + + +___ + +
+ + +
+Fusion: New Publisher #3892 + +This converts the old publishing system to the new one. It implements Fusion as a new host addon. + + +- Create button removed in OpenPype menu in favor of the new Publisher +- Draft refactor validations to raise `PublishValidationError` +- Implement Creator for New Publisher +- Implement Fusion as Host addon + + +___ + +
+ + +
+Make Kitsu work with Tray Publisher, added kitsureview tag, fixed sync-problems. #4425 + +Make Kitsu work with Tray Publisher, added kitsureview tag, fixed sync-problems. + +This PR updates the way the module gather info for the current publish so it now works with Tray Publisher.It fixes the data that gets synced from Kitsu to OP so all needed data gets registered even if it doesn't exist on Kitsus side.It also adds the tag "Add review to Kitsu" and adds it to Burn In so previews gets generated by default to Kitsu. + + +___ + +
+ + +
+Maya: V-Ray Set Image Format from settings #4566 + +Resolves #4565 + +Set V-Ray Image Format using settings. + + +___ + +
+ + + + ## [3.15.1](https://github.com/ynput/OpenPype/tree/3.15.1) [Full Changelog](https://github.com/ynput/OpenPype/compare/3.15.0...3.15.1) diff --git a/openpype/version.py b/openpype/version.py index e8124f1466..6ab03c2121 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.15.2-nightly.6" +__version__ = "3.15.2" diff --git a/pyproject.toml b/pyproject.toml index 2fc4f6fe39..02370a4f10 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "OpenPype" -version = "3.15.1" # OpenPype +version = "3.15.2" # OpenPype description = "Open VFX and Animation pipeline with support." authors = ["OpenPype Team "] license = "MIT License" From ff19ae038519d1ccf85e4145c66e416609a94edf Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 13 Mar 2023 15:37:23 +0100 Subject: [PATCH 856/912] Added setup_only to tests (#4591) Allows to download test zip, unzip and restore DB in preparation for new test. --- openpype/cli.py | 8 ++++++-- openpype/pype_commands.py | 5 ++++- tests/conftest.py | 10 ++++++++++ tests/lib/testing_classes.py | 22 +++++++++++++++++++--- 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/openpype/cli.py b/openpype/cli.py index 5c47088a44..a650a9fdcc 100644 --- a/openpype/cli.py +++ b/openpype/cli.py @@ -367,11 +367,15 @@ def run(script): "--timeout", help="Provide specific timeout value for test case", default=None) +@click.option("-so", + "--setup_only", + help="Only create dbs, do not run tests", + default=None) def runtests(folder, mark, pyargs, test_data_folder, persist, app_variant, - timeout): + timeout, setup_only): """Run all automatic tests after proper initialization via start.py""" PypeCommands().run_tests(folder, mark, pyargs, test_data_folder, - persist, app_variant, timeout) + persist, app_variant, timeout, setup_only) @main.command() diff --git a/openpype/pype_commands.py b/openpype/pype_commands.py index 932fdc9be4..dc5b3d63c3 100644 --- a/openpype/pype_commands.py +++ b/openpype/pype_commands.py @@ -270,7 +270,7 @@ class PypeCommands: pass def run_tests(self, folder, mark, pyargs, - test_data_folder, persist, app_variant, timeout): + test_data_folder, persist, app_variant, timeout, setup_only): """ Runs tests from 'folder' @@ -311,6 +311,9 @@ class PypeCommands: if timeout: args.extend(["--timeout", timeout]) + if setup_only: + args.extend(["--setup_only", setup_only]) + print("run_tests args: {}".format(args)) import pytest pytest.main(args) diff --git a/tests/conftest.py b/tests/conftest.py index 7b58b0314d..4f7c17244b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -24,6 +24,11 @@ def pytest_addoption(parser): help="Overwrite default timeout" ) + parser.addoption( + "--setup_only", action="store", default=None, + help="True - only setup test, do not run any tests" + ) + @pytest.fixture(scope="module") def test_data_folder(request): @@ -45,6 +50,11 @@ def timeout(request): return request.config.getoption("--timeout") +@pytest.fixture(scope="module") +def setup_only(request): + return request.config.getoption("--setup_only") + + @pytest.hookimpl(tryfirst=True, hookwrapper=True) def pytest_runtest_makereport(item, call): # execute all other hooks to obtain the report object diff --git a/tests/lib/testing_classes.py b/tests/lib/testing_classes.py index 2bafa16971..300024dc98 100644 --- a/tests/lib/testing_classes.py +++ b/tests/lib/testing_classes.py @@ -243,6 +243,8 @@ class PublishTest(ModuleUnitTest): PERSIST = True # True - keep test_db, test_openpype, outputted test files TEST_DATA_FOLDER = None # use specific folder of unzipped test file + SETUP_ONLY = False + @pytest.fixture(scope="module") def app_name(self, app_variant): """Returns calculated value for ApplicationManager. Eg.(nuke/12-2)""" @@ -286,8 +288,13 @@ class PublishTest(ModuleUnitTest): @pytest.fixture(scope="module") def launched_app(self, dbcon, download_test_data, last_workfile_path, - startup_scripts, app_args, app_name, output_folder_url): + startup_scripts, app_args, app_name, output_folder_url, + setup_only): """Launch host app""" + if setup_only or self.SETUP_ONLY: + print("Creating only setup for test, not launching app") + yield + return # set schema - for integrate_new from openpype import PACKAGE_DIR # Path to OpenPype's schema @@ -316,8 +323,12 @@ class PublishTest(ModuleUnitTest): @pytest.fixture(scope="module") def publish_finished(self, dbcon, launched_app, download_test_data, - timeout): + timeout, setup_only): """Dummy fixture waiting for publish to finish""" + if setup_only or self.SETUP_ONLY: + print("Creating only setup for test, not launching app") + yield False + return import time time_start = time.time() timeout = timeout or self.TIMEOUT @@ -334,11 +345,16 @@ class PublishTest(ModuleUnitTest): def test_folder_structure_same(self, dbcon, publish_finished, download_test_data, output_folder_url, - skip_compare_folders): + skip_compare_folders, + setup_only): """Check if expected and published subfolders contain same files. Compares only presence, not size nor content! """ + if setup_only or self.SETUP_ONLY: + print("Creating only setup for test, not launching app") + return + published_dir_base = output_folder_url expected_dir_base = os.path.join(download_test_data, "expected") From 5d17ae2857b00bec100442957cdf1ae1164a39ca Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sat, 11 Mar 2023 07:32:44 +0100 Subject: [PATCH 857/912] Houdini: Create button open new publisher's "create" tab Also made publish button enforce going to the "publish" tab. --- openpype/hosts/houdini/startup/MainMenuCommon.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/houdini/startup/MainMenuCommon.xml b/openpype/hosts/houdini/startup/MainMenuCommon.xml index c08114b71b..8e24ce3b99 100644 --- a/openpype/hosts/houdini/startup/MainMenuCommon.xml +++ b/openpype/hosts/houdini/startup/MainMenuCommon.xml @@ -10,7 +10,7 @@ import hou from openpype.tools.utils import host_tools parent = hou.qt.mainWindow() -host_tools.show_creator(parent) +host_tools.show_publisher(parent, tab="create") ]]> @@ -30,7 +30,7 @@ host_tools.show_loader(parent=parent, use_context=True) import hou from openpype.tools.utils import host_tools parent = hou.qt.mainWindow() -host_tools.show_publisher(parent) +host_tools.show_publisher(parent, tab="publish") ]]> From ed7a4e424368a7503eb024ceea7b35be9f8bc6d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Mar 2023 14:32:06 +0000 Subject: [PATCH 858/912] Bump @sideway/formula from 3.0.0 to 3.0.1 in /website Bumps [@sideway/formula](https://github.com/sideway/formula) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/sideway/formula/releases) - [Commits](https://github.com/sideway/formula/compare/v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: "@sideway/formula" dependency-type: indirect ... Signed-off-by: dependabot[bot] --- website/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/yarn.lock b/website/yarn.lock index 559c58f931..d250e48b9d 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -1669,9 +1669,9 @@ "@hapi/hoek" "^9.0.0" "@sideway/formula@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" - integrity sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg== + version "3.0.1" + resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f" + integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg== "@sideway/pinpoint@^2.0.0": version "2.0.0" From ee7e2f1bcd4cc7d13935482b5f3ec1f1cf41347e Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 13 Mar 2023 23:00:03 +0100 Subject: [PATCH 859/912] Update tests and documentation for `ExtractorColormanaged` refactor to `ColormanagedPyblishPluginMixin` --- .../unit/openpype/pipeline/publish/test_publish_plugins.py | 6 +++--- website/docs/dev_colorspace.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit/openpype/pipeline/publish/test_publish_plugins.py b/tests/unit/openpype/pipeline/publish/test_publish_plugins.py index 5c2d7b367f..88e0095e34 100644 --- a/tests/unit/openpype/pipeline/publish/test_publish_plugins.py +++ b/tests/unit/openpype/pipeline/publish/test_publish_plugins.py @@ -135,7 +135,7 @@ class TestPipelinePublishPlugins(TestPipeline): } # load plugin function for testing - plugin = publish_plugins.ExtractorColormanaged() + plugin = publish_plugins.ColormanagedPyblishPluginMixin() plugin.log = log config_data, file_rules = plugin.get_colorspace_settings(context) @@ -175,14 +175,14 @@ class TestPipelinePublishPlugins(TestPipeline): } # load plugin function for testing - plugin = publish_plugins.ExtractorColormanaged() + plugin = publish_plugins.ColormanagedPyblishPluginMixin() plugin.log = log plugin.set_representation_colorspace( representation_nuke, context, colorspace_settings=(config_data_nuke, file_rules_nuke) ) # load plugin function for testing - plugin = publish_plugins.ExtractorColormanaged() + plugin = publish_plugins.ColormanagedPyblishPluginMixin() plugin.log = log plugin.set_representation_colorspace( representation_hiero, context, diff --git a/website/docs/dev_colorspace.md b/website/docs/dev_colorspace.md index fe9a0ec1e3..14f19f10db 100644 --- a/website/docs/dev_colorspace.md +++ b/website/docs/dev_colorspace.md @@ -63,7 +63,7 @@ It's up to the Loaders to read these values and apply the correct expected color - set the `OCIO` environment variable before launching the host via a prelaunch hook - or (if the host allows) to set the workfile OCIO config path using the host's API -3. Each Extractor exporting pixel data (e.g. image or video) has to use parent class `openpype.pipeline.publish.publish_plugins.ExtractorColormanaged` and use `self.set_representation_colorspace` on the representations to be integrated. +3. Each Extractor exporting pixel data (e.g. image or video) has to inherit from the mixin class `openpype.pipeline.publish.publish_plugins.ColormanagedPyblishPluginMixin` and use `self.set_representation_colorspace` on the representations to be integrated. The **set_representation_colorspace** method adds `colorspaceData` to the representation. If the `colorspace` passed is not `None` then it is added directly to the representation with resolved config path otherwise a color space is assumed using the configured file rules. If no file rule matches the `colorspaceData` is **not** added to the representation. From f55ac53c82e4b75b445bcfd99753a9ee56180ccf Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 13 Mar 2023 23:12:34 +0100 Subject: [PATCH 860/912] Fix typos --- openpype/settings/entities/schemas/README.md | 2 +- website/docs/admin_environment.md | 2 +- website/docs/admin_hosts_maya.md | 2 +- website/docs/admin_settings.md | 2 +- website/docs/admin_use.md | 2 +- website/docs/artist_hosts_3dsmax.md | 4 ++-- website/docs/artist_hosts_hiero.md | 6 +++--- website/docs/artist_hosts_photoshop.md | 2 +- website/docs/artist_tools_sync_queu.md | 2 +- website/docs/dev_colorspace.md | 4 ++-- website/docs/dev_host_implementation.md | 4 ++-- website/docs/dev_publishing.md | 2 +- website/docs/dev_settings.md | 6 +++--- website/docs/dev_testing.md | 2 +- website/docs/module_kitsu.md | 2 +- website/docs/module_site_sync.md | 2 +- website/docs/project_settings/settings_project_global.md | 6 +++--- website/docs/project_settings/settings_project_nuke.md | 2 +- .../docs/project_settings/settings_project_standalone.md | 2 +- 19 files changed, 28 insertions(+), 28 deletions(-) diff --git a/openpype/settings/entities/schemas/README.md b/openpype/settings/entities/schemas/README.md index b4c878fe0f..cff614a4bb 100644 --- a/openpype/settings/entities/schemas/README.md +++ b/openpype/settings/entities/schemas/README.md @@ -350,7 +350,7 @@ How output of the schema could look like on save: - number input, can be used for both integer and float - key `"decimal"` defines how many decimal places will be used, 0 is for integer input (Default: `0`) - key `"minimum"` as minimum allowed number to enter (Default: `-99999`) - - key `"maxium"` as maximum allowed number to enter (Default: `99999`) + - key `"maximum"` as maximum allowed number to enter (Default: `99999`) - key `"steps"` will change single step value of UI inputs (using arrows and wheel scroll) - for UI it is possible to show slider to enable this option set `show_slider` to `true` ``` diff --git a/website/docs/admin_environment.md b/website/docs/admin_environment.md index 1eb755b90b..29b70a6c47 100644 --- a/website/docs/admin_environment.md +++ b/website/docs/admin_environment.md @@ -27,4 +27,4 @@ import TabItem from '@theme/TabItem'; - for more details on how to use it go [here](admin_use#check-for-mongodb-database-connection) ## OPENPYPE_USERNAME -- if set it overides system created username +- if set it overrides system created username diff --git a/website/docs/admin_hosts_maya.md b/website/docs/admin_hosts_maya.md index 0e77f29fc2..ae0cf76f53 100644 --- a/website/docs/admin_hosts_maya.md +++ b/website/docs/admin_hosts_maya.md @@ -142,7 +142,7 @@ Fill in the necessary fields (the optional fields are regex filters) ![new place holder](assets/maya-placeholder_new.png) - - Builder type: Wether the the placeholder should load current asset representations or linked assets representations + - Builder type: Whether the the placeholder should load current asset representations or linked assets representations - Representation: Representation that will be loaded (ex: ma, abc, png, etc...) diff --git a/website/docs/admin_settings.md b/website/docs/admin_settings.md index 8626ef16ba..dcbe740d0c 100644 --- a/website/docs/admin_settings.md +++ b/website/docs/admin_settings.md @@ -76,7 +76,7 @@ You can also reset any settings to OpenPype default by doing `right click` and ` Many settings are useful to be adjusted on a per-project basis. To identify project overrides, they are marked with **orange edge** and **orange labels** in the settings GUI. -The process of settting project overrides is similar to setting the Studio defaults. The key difference is to select a particular project you want to be configure. Those projects can be found on the left hand side of the Project Settings tab. +The process of setting project overrides is similar to setting the Studio defaults. The key difference is to select a particular project you want to be configure. Those projects can be found on the left hand side of the Project Settings tab. In the image below you can see all three overrides at the same time. 1. Deadline has **no changes to the OpenPype defaults** at all — **grey** colour of left bar. diff --git a/website/docs/admin_use.md b/website/docs/admin_use.md index c92ac3a77a..c1d1de0e8c 100644 --- a/website/docs/admin_use.md +++ b/website/docs/admin_use.md @@ -68,7 +68,7 @@ Add `--headless` to run OpenPype without graphical UI (useful on server or on au `--verbose` `` - change log verbose level of OpenPype loggers. -Level value can be integer in range `0-50` or one of enum strings `"notset" (0)`, `"debug" (10)`, `"info" (20)`, `"warning" (30)`, `"error" (40)`, `"ciritcal" (50)`. Value is stored to `OPENPYPE_LOG_LEVEL` environment variable for next processes. +Level value can be integer in range `0-50` or one of enum strings `"notset" (0)`, `"debug" (10)`, `"info" (20)`, `"warning" (30)`, `"error" (40)`, `"critical" (50)`. Value is stored to `OPENPYPE_LOG_LEVEL` environment variable for next processes. ```shell openpype_console --verbose debug diff --git a/website/docs/artist_hosts_3dsmax.md b/website/docs/artist_hosts_3dsmax.md index 71ba8785dc..12c1f40181 100644 --- a/website/docs/artist_hosts_3dsmax.md +++ b/website/docs/artist_hosts_3dsmax.md @@ -47,7 +47,7 @@ This is the core functional area for you as a user. Most of your actions will ta ![Menu OpenPype](assets/3dsmax_menu_first_OP.png) :::note OpenPype Menu -User should use this menu exclusively for **Opening/Saving** when dealing with work files not standard ```File Menu``` even though user still being able perform file operations via this menu but prefferably just performing quick saves during work session not saving actual workfile versions. +User should use this menu exclusively for **Opening/Saving** when dealing with work files not standard ```File Menu``` even though user still being able perform file operations via this menu but preferably just performing quick saves during work session not saving actual workfile versions. ::: ## Working With Scene Files @@ -73,7 +73,7 @@ OpenPype correctly names it and add version to the workfile. This basically happ etc. -Basically meaning user is free of guessing what is the correct naming and other neccessities to keep everthing in order and managed. +Basically meaning user is free of guessing what is the correct naming and other necessities to keep everything in order and managed. > Note: user still has also other options for naming like ```Subversion```, ```Artist's Note``` but we won't dive into those now. diff --git a/website/docs/artist_hosts_hiero.md b/website/docs/artist_hosts_hiero.md index 136ed6ea9c..977c7a7baf 100644 --- a/website/docs/artist_hosts_hiero.md +++ b/website/docs/artist_hosts_hiero.md @@ -231,14 +231,14 @@ All published instances that will replace the place holder must contain unique i ![Create menu](assets/nuke_publishedinstance.png) -The informations about these objects are given by the user by filling the extra attributes of the Place Holder +The information about these objects are given by the user by filling the extra attributes of the Place Holder ![Create menu](assets/nuke_fillingExtraAttributes.png) ### Update Place Holder -This tool alows the user to change the information provided in the extra attributes of the selected Place Holder. +This tool allows the user to change the information provided in the extra attributes of the selected Place Holder. ![Create menu](assets/nuke_updatePlaceHolder.png) @@ -250,7 +250,7 @@ This tool imports the template used and replaces the existed PlaceHolders with t ![Create menu](assets/nuke_buildWorfileFromTemplate.png) #### Result -- Replace `PLACEHOLDER` node in the template with the published instance corresponding to the informations provided in extra attributes of the Place Holder +- Replace `PLACEHOLDER` node in the template with the published instance corresponding to the information provided in extra attributes of the Place Holder ![Create menu](assets/nuke_buildworkfile.png) diff --git a/website/docs/artist_hosts_photoshop.md b/website/docs/artist_hosts_photoshop.md index 88bfb1484d..12203a5c6e 100644 --- a/website/docs/artist_hosts_photoshop.md +++ b/website/docs/artist_hosts_photoshop.md @@ -75,7 +75,7 @@ enabled instances, you could see more information after clicking on `Details` ta ![Image instances creates](assets/photoshop_publish_validations.png) -In this dialog you could see publishable instances in left colummn, triggered plugins in the middle and logs in the right column. +In this dialog you could see publishable instances in left column, triggered plugins in the middle and logs in the right column. In left column you could see that `review` instance was created automatically. This instance flattens all publishable instances or all visible layers if no publishable instances were created into single image which could serve as a single reviewable element (for example in Ftrack). diff --git a/website/docs/artist_tools_sync_queu.md b/website/docs/artist_tools_sync_queu.md index 770c2f77ad..7dac8638f9 100644 --- a/website/docs/artist_tools_sync_queu.md +++ b/website/docs/artist_tools_sync_queu.md @@ -2,7 +2,7 @@ id: artist_tools_sync_queue title: Sync Queue sidebar_label: Sync Queue -description: Track sites syncronization progress. +description: Track sites synchronization progress. --- # Sync Queue diff --git a/website/docs/dev_colorspace.md b/website/docs/dev_colorspace.md index fe9a0ec1e3..b46d80e1a2 100644 --- a/website/docs/dev_colorspace.md +++ b/website/docs/dev_colorspace.md @@ -24,8 +24,8 @@ It's up to the Loaders to read these values and apply the correct expected color ### Keys - **colorspace** - string value used in other publish plugins and loaders - **config** - storing two versions of path. - - **path** - is formated and with baked platform root. It is used for posible need to find out where we were sourcing color config during publishing. - - **template** - unformated tempate resolved from settings. It is used for other plugins targeted to remote publish which could be processed at different platform. + - **path** - is formatted and with baked platform root. It is used for possible need to find out where we were sourcing color config during publishing. + - **template** - unformatted template resolved from settings. It is used for other plugins targeted to remote publish which could be processed at different platform. ### Example { diff --git a/website/docs/dev_host_implementation.md b/website/docs/dev_host_implementation.md index 3702483ad1..e62043723f 100644 --- a/website/docs/dev_host_implementation.md +++ b/website/docs/dev_host_implementation.md @@ -45,10 +45,10 @@ openpype/hosts/{host name} ``` ### Launch Hooks -Launch hooks are not directly connected to host implementation, but they can be used to modify launch of process which may be crutial for the implementation. Launch hook are plugins called when DCC is launched. They are processed in sequence before and after launch. Pre launch hooks can change how process of DCC is launched, e.g. change subprocess flags, modify environments or modify launch arguments. If prelaunch hook crashes the application is not launched at all. Postlaunch hooks are triggered after launch of subprocess. They can be used to change statuses in your project tracker, start timer, etc. Crashed postlaunch hooks have no effect on rest of postlaunch hooks or launched process. They can be filtered by platform, host and application and order is defined by integer value. Hooks inside host are automatically loaded (one reason why folder name should match host name) or can be defined from modules. Hooks execution share same launch context where can be stored data used across multiple hooks (please be very specific in stored keys e.g. 'project' vs. 'project_name'). For more detailed information look into `openpype/lib/applications.py`. +Launch hooks are not directly connected to host implementation, but they can be used to modify launch of process which may be crucial for the implementation. Launch hook are plugins called when DCC is launched. They are processed in sequence before and after launch. Pre launch hooks can change how process of DCC is launched, e.g. change subprocess flags, modify environments or modify launch arguments. If prelaunch hook crashes the application is not launched at all. Postlaunch hooks are triggered after launch of subprocess. They can be used to change statuses in your project tracker, start timer, etc. Crashed postlaunch hooks have no effect on rest of postlaunch hooks or launched process. They can be filtered by platform, host and application and order is defined by integer value. Hooks inside host are automatically loaded (one reason why folder name should match host name) or can be defined from modules. Hooks execution share same launch context where can be stored data used across multiple hooks (please be very specific in stored keys e.g. 'project' vs. 'project_name'). For more detailed information look into `openpype/lib/applications.py`. ### Public interface -Public face is at this moment related to launching of the DCC. At this moment there there is only option to modify environment variables before launch by implementing function `add_implementation_envs` (must be available in `openpype/hosts/{host name}/__init__.py`). The function is called after pre launch hooks, as last step before subprocess launch, to be able set environment variables crutial for proper integration. It is also good place for functions that are used in prelaunch hooks and in-DCC integration. Future plans are to be able get workfiles extensions from here. Right now workfiles extensions are hardcoded in `openpype/pipeline/constants.py` under `HOST_WORKFILE_EXTENSIONS`, we would like to handle hosts as addons similar to OpenPype modules, and more improvements which are now hardcoded. +Public face is at this moment related to launching of the DCC. At this moment there there is only option to modify environment variables before launch by implementing function `add_implementation_envs` (must be available in `openpype/hosts/{host name}/__init__.py`). The function is called after pre launch hooks, as last step before subprocess launch, to be able set environment variables crucial for proper integration. It is also good place for functions that are used in prelaunch hooks and in-DCC integration. Future plans are to be able get workfiles extensions from here. Right now workfiles extensions are hardcoded in `openpype/pipeline/constants.py` under `HOST_WORKFILE_EXTENSIONS`, we would like to handle hosts as addons similar to OpenPype modules, and more improvements which are now hardcoded. ### Integration We've prepared base class `HostBase` in `openpype/host/host.py` to define minimum requirements and provide some default method implementations. The minimum requirement for a host is `name` attribute, this host would not be able to do much but is valid. To extend functionality we've prepared interfaces that helps to identify what is host capable of and if is possible to use certain tools with it. For those cases we defined interfaces for each workflow. `IWorkfileHost` interface add requirement to implement workfiles related methods which makes host usable in combination with Workfiles tool. `ILoadHost` interface add requirements to be able load, update, switch or remove referenced representations which should add support to use Loader and Scene Inventory tools. `INewPublisher` interface is required to be able use host with new OpenPype publish workflow. This is what must or can be implemented to allow certain functionality. `HostBase` will have more responsibility which will be taken from global variables in future. This process won't happen at once, but will be slow to keep backwards compatibility for some time. diff --git a/website/docs/dev_publishing.md b/website/docs/dev_publishing.md index 135f6cd985..2c57537223 100644 --- a/website/docs/dev_publishing.md +++ b/website/docs/dev_publishing.md @@ -415,7 +415,7 @@ class CreateRender(Creator): # - 'asset' - asset name # - 'task' - task name # - 'variant' - variant - # - 'family' - instnace family + # - 'family' - instance family # Check if should use selection or not if pre_create_data.get("use_selection"): diff --git a/website/docs/dev_settings.md b/website/docs/dev_settings.md index 94590345e8..1010169a5f 100644 --- a/website/docs/dev_settings.md +++ b/website/docs/dev_settings.md @@ -355,7 +355,7 @@ These inputs wraps another inputs into {key: value} relation { "type": "text", "key": "command", - "label": "Comand" + "label": "Command" } ] }, @@ -420,7 +420,7 @@ How output of the schema could look like on save: - number input, can be used for both integer and float - key `"decimal"` defines how many decimal places will be used, 0 is for integer input (Default: `0`) - key `"minimum"` as minimum allowed number to enter (Default: `-99999`) - - key `"maxium"` as maximum allowed number to enter (Default: `99999`) + - key `"maximum"` as maximum allowed number to enter (Default: `99999`) - key `"steps"` will change single step value of UI inputs (using arrows and wheel scroll) - for UI it is possible to show slider to enable this option set `show_slider` to `true` ```javascript @@ -602,7 +602,7 @@ How output of the schema could look like on save: - there are 2 possible ways how to set the type: 1.) dictionary with item modifiers (`number` input has `minimum`, `maximum` and `decimals`) in that case item type must be set as value of `"type"` (example below) 2.) item type name as string without modifiers (e.g. [text](#text)) - 3.) enhancement of 1.) there is also support of `template` type but be carefull about endless loop of templates + 3.) enhancement of 1.) there is also support of `template` type but be careful about endless loop of templates - goal of using `template` is to easily change same item definitions in multiple lists 1.) with item modifiers diff --git a/website/docs/dev_testing.md b/website/docs/dev_testing.md index 7136ceb479..434c1ca9ff 100644 --- a/website/docs/dev_testing.md +++ b/website/docs/dev_testing.md @@ -57,7 +57,7 @@ Content: Contains end to end testing in a DCC. Currently it is setup to start DCC application with prepared worfkile, run publish process and compare results in DB and file system automatically. This approach is implemented as it should work in any DCC application and should cover most common use cases. Not all hosts allow "real headless" publishing, but all hosts should allow to trigger -publish process programatically when UI of host is actually running. +publish process programmatically when UI of host is actually running. There will be eventually also possibility to build workfile and publish it programmatically, this would work only in DCCs that support it (Maya, Nuke). diff --git a/website/docs/module_kitsu.md b/website/docs/module_kitsu.md index 7738ee1ce2..0424939786 100644 --- a/website/docs/module_kitsu.md +++ b/website/docs/module_kitsu.md @@ -41,4 +41,4 @@ openpype_console module kitsu push-to-zou -l me@domain.ext -p my_password ## Q&A ### Is it safe to rename an entity from Kitsu? Absolutely! Entities are linked by their unique IDs between the two databases. -But renaming from the OP's Project Manager won't apply the change to Kitsu, it'll be overriden during the next synchronization. +But renaming from the OP's Project Manager won't apply the change to Kitsu, it'll be overridden during the next synchronization. diff --git a/website/docs/module_site_sync.md b/website/docs/module_site_sync.md index 2e9cf01102..3e5794579c 100644 --- a/website/docs/module_site_sync.md +++ b/website/docs/module_site_sync.md @@ -89,7 +89,7 @@ all share the same provider). Handles files stored on disk storage. -Local drive provider is the most basic one that is used for accessing all standard hard disk storage scenarios. It will work with any storage that can be mounted on your system in a standard way. This could correspond to a physical external hard drive, network mounted storage, internal drive or even VPN connected network drive. It doesn't care about how te drive is mounted, but you must be able to point to it with a simple directory path. +Local drive provider is the most basic one that is used for accessing all standard hard disk storage scenarios. It will work with any storage that can be mounted on your system in a standard way. This could correspond to a physical external hard drive, network mounted storage, internal drive or even VPN connected network drive. It doesn't care about how the drive is mounted, but you must be able to point to it with a simple directory path. Default sites `local` and `studio` both use local drive provider. diff --git a/website/docs/project_settings/settings_project_global.md b/website/docs/project_settings/settings_project_global.md index b320b5502f..6c1a269b1f 100644 --- a/website/docs/project_settings/settings_project_global.md +++ b/website/docs/project_settings/settings_project_global.md @@ -10,7 +10,7 @@ import TabItem from '@theme/TabItem'; Project settings can have project specific values. Each new project is using studio values defined in **default** project but these values can be modified or overridden per project. :::warning Default studio values -Projects always use default project values unless they have [project override](../admin_settings#project-overrides) (orage colour). Any changes in default project may affect all existing projects. +Projects always use default project values unless they have [project override](../admin_settings#project-overrides) (orange colour). Any changes in default project may affect all existing projects. ::: ## Color Management (ImageIO) @@ -39,14 +39,14 @@ Procedure of resolving path (from above example) will look first into path 1st a ### Using File rules File rules are inspired by [OCIO v2 configuration]((https://opencolorio.readthedocs.io/en/latest/guides/authoring/rules.html)). Each rule has a unique name which can be overridden by host-specific _File rules_ (example: `project_settings/nuke/imageio/file_rules/rules`). -The _input pattern_ matching uses REGEX expression syntax (try [regexr.com](https://regexr.com/)). Matching rules procedure's intention is to be used during publishing or loading of representation. Since the publishing procedure is run before integrator formate publish template path, make sure the pattern is working or any work render path. +The _input pattern_ matching uses REGEX expression syntax (try [regexr.com](https://regexr.com/)). Matching rules procedure's intention is to be used during publishing or loading of representation. Since the publishing procedure is run before integrator format publish template path, make sure the pattern is working or any work render path. :::warning Colorspace name input The **colorspace name** value is a raw string input and no validation is run after saving project settings. We recommend to open the specified `config.ocio` file and copy pasting the exact colorspace names. ::: ### Extract OIIO Transcode -OIIOTools transcoder plugin with configurable output presets. Any incoming representation with `colorspaceData` is convertable to single or multiple representations with different target colorspaces or display and viewer names found in linked **config.ocio** file. +OIIOTools transcoder plugin with configurable output presets. Any incoming representation with `colorspaceData` is convertible to single or multiple representations with different target colorspaces or display and viewer names found in linked **config.ocio** file. `oiiotool` is used for transcoding, eg. `oiiotool` must be present in `vendor/bin/oiio` or environment variable `OPENPYPE_OIIO_PATHS` must be provided for custom oiio installation. diff --git a/website/docs/project_settings/settings_project_nuke.md b/website/docs/project_settings/settings_project_nuke.md index b3ee5f77a6..c9c3d12df9 100644 --- a/website/docs/project_settings/settings_project_nuke.md +++ b/website/docs/project_settings/settings_project_nuke.md @@ -10,7 +10,7 @@ import TabItem from '@theme/TabItem'; Project settings can have project specific values. Each new project is using studio values defined in **default** project but these values can be modified or overridden per project. :::warning Default studio values -Projects always use default project values unless they have [project override](../admin_settings#project-overrides) (orage colour). Any changes in default project may affect all existing projects. +Projects always use default project values unless they have [project override](../admin_settings#project-overrides) (orange colour). Any changes in default project may affect all existing projects. ::: ## Workfile Builder diff --git a/website/docs/project_settings/settings_project_standalone.md b/website/docs/project_settings/settings_project_standalone.md index 778aba2942..1383bd488e 100644 --- a/website/docs/project_settings/settings_project_standalone.md +++ b/website/docs/project_settings/settings_project_standalone.md @@ -10,7 +10,7 @@ import TabItem from '@theme/TabItem'; Project settings can have project specific values. Each new project is using studio values defined in **default** project but these values can be modified or overridden per project. :::warning Default studio values -Projects always use default project values unless they have [project override](../admin_settings#project-overrides) (orage colour). Any changes in default project may affect all existing projects. +Projects always use default project values unless they have [project override](../admin_settings#project-overrides) (orange colour). Any changes in default project may affect all existing projects. ::: ## Creator Plugins From 8f2112dd2642b02976a93cb0cabaffc1162b80ee Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 13 Mar 2023 23:13:50 +0100 Subject: [PATCH 861/912] Fix case of extension --- website/docs/artist_hosts_aftereffects.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/artist_hosts_aftereffects.md b/website/docs/artist_hosts_aftereffects.md index a9c9ca49fa..939ef4034c 100644 --- a/website/docs/artist_hosts_aftereffects.md +++ b/website/docs/artist_hosts_aftereffects.md @@ -34,7 +34,7 @@ a correct name. You should use it instead of standard file saving dialog. In AfterEffects you'll find the tools in the `OpenPype` extension: -![Extension](assets/photoshop_extension.PNG) +![Extension](assets/photoshop_extension.png) You can show the extension panel by going to `Window` > `Extensions` > `OpenPype`. @@ -104,7 +104,7 @@ There are currently 2 options of `render` item: When you want to load existing published work, you can use the `Loader` tool. You can reach it in the extension's panel. -![Loader](assets/photoshop_loader.PNG) +![Loader](assets/photoshop_loader.png) The supported families for loading into AfterEffects are: @@ -128,7 +128,7 @@ Now that we have some content loaded, you can manage which version is loaded. Th Loaded images have to stay as smart layers in order to be updated. If you rasterize the layer, you can no longer update it to a different version using OpenPype tools. ::: -![Loader](assets/photoshop_manage.PNG) +![Loader](assets/photoshop_manage.png) You can switch to a previous version of the image or update to the latest. From c262ac3255b39c1847720b6f1d51bf993a42d865 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 13 Mar 2023 23:14:11 +0100 Subject: [PATCH 862/912] Refactor case of extension to match surrounding files --- website/docs/artist_hosts_harmony.md | 2 +- .../{harmony_creator.PNG => harmony_creator.png} | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename website/docs/assets/{harmony_creator.PNG => harmony_creator.png} (100%) diff --git a/website/docs/artist_hosts_harmony.md b/website/docs/artist_hosts_harmony.md index aa9355e221..eaa6edc42a 100644 --- a/website/docs/artist_hosts_harmony.md +++ b/website/docs/artist_hosts_harmony.md @@ -44,7 +44,7 @@ Because the saving to the network location happens in the background, be careful `OpenPype > Create` -![Creator](assets/harmony_creator.PNG) +![Creator](assets/harmony_creator.png) These are the families supported in Harmony: diff --git a/website/docs/assets/harmony_creator.PNG b/website/docs/assets/harmony_creator.png similarity index 100% rename from website/docs/assets/harmony_creator.PNG rename to website/docs/assets/harmony_creator.png From fbe93aae39d7950639c5fbf99aca124b5ccd9ae3 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 13 Mar 2023 23:21:05 +0100 Subject: [PATCH 863/912] Grammar tweaks --- website/docs/admin_settings.md | 2 +- website/docs/manager_ftrack.md | 2 +- website/docs/module_ftrack.md | 2 +- website/docs/module_kitsu.md | 2 +- website/docs/pype2/admin_ftrack.md | 2 +- website/docs/system_introduction.md | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/website/docs/admin_settings.md b/website/docs/admin_settings.md index dcbe740d0c..51bfdf7c33 100644 --- a/website/docs/admin_settings.md +++ b/website/docs/admin_settings.md @@ -7,7 +7,7 @@ sidebar_label: Working with settings import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; -OpenPype stores all of it's settings and configuration in the mongo database. To make the configuration as easy as possible we provide a robust GUI where you can access and change everything that is configurable +OpenPype stores all of its settings and configuration in the mongo database. To make the configuration as easy as possible we provide a robust GUI where you can access and change everything that is configurable **Settings** GUI can be started from the tray menu *Admin -> Studio Settings*. diff --git a/website/docs/manager_ftrack.md b/website/docs/manager_ftrack.md index b5ca167838..836d84405e 100644 --- a/website/docs/manager_ftrack.md +++ b/website/docs/manager_ftrack.md @@ -4,7 +4,7 @@ title: Ftrack sidebar_label: Project Manager --- -Ftrack is currently the main project management option for OpenPype. This documentation assumes that you are familiar with Ftrack and it's basic principles. If you're new to Ftrack, we recommend having a thorough look at [Ftrack Official Documentation](https://help.ftrack.com/en/). +Ftrack is currently the main project management option for OpenPype. This documentation assumes that you are familiar with Ftrack and its basic principles. If you're new to Ftrack, we recommend having a thorough look at [Ftrack Official Documentation](https://help.ftrack.com/en/). ## Project management Setting project attributes is the key to properly working pipeline. diff --git a/website/docs/module_ftrack.md b/website/docs/module_ftrack.md index 6d5529b512..9111e4658c 100644 --- a/website/docs/module_ftrack.md +++ b/website/docs/module_ftrack.md @@ -8,7 +8,7 @@ import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; -Ftrack is currently the main project management option for OpenPype. This documentation assumes that you are familiar with Ftrack and it's basic principles. If you're new to Ftrack, we recommend having a thorough look at [Ftrack Official Documentation](http://ftrack.rtd.ftrack.com/en/stable/). +Ftrack is currently the main project management option for OpenPype. This documentation assumes that you are familiar with Ftrack and its basic principles. If you're new to Ftrack, we recommend having a thorough look at [Ftrack Official Documentation](http://ftrack.rtd.ftrack.com/en/stable/). ## Prepare Ftrack for OpenPype diff --git a/website/docs/module_kitsu.md b/website/docs/module_kitsu.md index 0424939786..7be2a42c45 100644 --- a/website/docs/module_kitsu.md +++ b/website/docs/module_kitsu.md @@ -7,7 +7,7 @@ sidebar_label: Kitsu import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; -Kitsu is a great open source production tracker and can be used for project management instead of Ftrack. This documentation assumes that you are familiar with Kitsu and it's basic principles. If you're new to Kitsu, we recommend having a thorough look at [Kitsu Official Documentation](https://kitsu.cg-wire.com/). +Kitsu is a great open source production tracker and can be used for project management instead of Ftrack. This documentation assumes that you are familiar with Kitsu and its basic principles. If you're new to Kitsu, we recommend having a thorough look at [Kitsu Official Documentation](https://kitsu.cg-wire.com/). ## Prepare Kitsu for OpenPype diff --git a/website/docs/pype2/admin_ftrack.md b/website/docs/pype2/admin_ftrack.md index a81147bece..4ebe1a7add 100644 --- a/website/docs/pype2/admin_ftrack.md +++ b/website/docs/pype2/admin_ftrack.md @@ -8,7 +8,7 @@ import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; -Ftrack is currently the main project management option for Pype. This documentation assumes that you are familiar with Ftrack and it's basic principles. If you're new to Ftrack, we recommend having a thorough look at [Ftrack Official Documentation](http://ftrack.rtd.ftrack.com/en/stable/). +Ftrack is currently the main project management option for Pype. This documentation assumes that you are familiar with Ftrack and its basic principles. If you're new to Ftrack, we recommend having a thorough look at [Ftrack Official Documentation](http://ftrack.rtd.ftrack.com/en/stable/). ## Prepare Ftrack for Pype diff --git a/website/docs/system_introduction.md b/website/docs/system_introduction.md index 05627b5359..d64b023704 100644 --- a/website/docs/system_introduction.md +++ b/website/docs/system_introduction.md @@ -15,9 +15,9 @@ various usage scenarios. ## Studio Preparation -You can find detailed breakdown of technical requirements [here](dev_requirements), but in general OpenPype should be able +You can find a detailed breakdown of technical requirements [here](dev_requirements), but in general OpenPype should be able to operate in most studios fairly quickly. The main obstacles are usually related to workflows and habits, that -might not be fully compatible with what OpenPype is expecting or enforcing. It is recommended to go through artists [key concepts](artist_concepts) to get idea about basics. +might not be fully compatible with what OpenPype is expecting or enforcing. It is recommended to go through artists [key concepts](artist_concepts) to get comfortable with the basics. Keep in mind that if you run into any workflows that are not supported, it's usually just because we haven't hit that particular case and it can most likely be added upon request. From 5aae66794b4c98d3ef2c6db7c049799f7f0d9a6b Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 13 Mar 2023 23:21:37 +0100 Subject: [PATCH 864/912] Highlight studio settings versus local settings more --- website/docs/admin_settings.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/website/docs/admin_settings.md b/website/docs/admin_settings.md index 51bfdf7c33..1128cc00c6 100644 --- a/website/docs/admin_settings.md +++ b/website/docs/admin_settings.md @@ -11,8 +11,11 @@ OpenPype stores all of its settings and configuration in the mongo database. To **Settings** GUI can be started from the tray menu *Admin -> Studio Settings*. -Please keep in mind that these settings are set-up for the full studio and not per-individual. If you're looking for individual artist settings, you can head to -[Local Settings](admin_settings_local.md) section in the artist documentation. +:::important Studio Settings versus Local Settings +Please keep in mind that these settings are set up for the full studio and not per-individual. If you're looking for individual artist settings, you can head to +[Local Settings](admin_settings_local.md) section in the documentation. +::: + ## Categories From 5b3cc605d8be1dafdc1114372ae7e9b7e80e3ff4 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Tue, 14 Mar 2023 04:18:48 +0300 Subject: [PATCH 865/912] add some comments --- openpype/hosts/fusion/addon.py | 12 ++++++------ .../hosts/fusion/hooks/pre_fusion_profile_hook.py | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/fusion/addon.py b/openpype/hosts/fusion/addon.py index 4b0ce59aaf..e3464f4be4 100644 --- a/openpype/hosts/fusion/addon.py +++ b/openpype/hosts/fusion/addon.py @@ -14,6 +14,10 @@ def get_fusion_profile_number(module: str, app_data: str) -> int: already Fusion version 18, still FUSION16_PROFILE_DIR is used. The variable is added in case the version number will be updated or deleted so we could easily change the version or disable it. + + app_data derives from `launch_context.env.get("AVALON_APP_NAME")`. + For the time being we will encourage user to set a version number + set in the system settings key for the Blackmagic Fusion. """ log = Logger.get_logger(__name__) @@ -42,15 +46,11 @@ class FusionAddon(OpenPypeModule, IHostAddon): def get_launch_hook_paths(self, app): if app.host_name != self.host_name: return [] - return [ - os.path.join(FUSION_HOST_DIR, "hooks") - ] + return [os.path.join(FUSION_HOST_DIR, "hooks")] def add_implementation_envs(self, env, _app): # Set default values if are not already set via settings - defaults = { - "OPENPYPE_LOG_NO_COLORS": "Yes" - } + defaults = {"OPENPYPE_LOG_NO_COLORS": "Yes"} for key, value in defaults.items(): if not env.get(key): env[key] = value diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index 543e90cc75..dc6a4bf85d 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -122,6 +122,8 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): self.log.info(f"Setting {fu_profile_dir_variable}: {fu_profile_dir}") self.launch_context.env[fu_profile_dir_variable] = str(fu_profile_dir) + # setup masterprefs file to partially alter existing or newly generated + # Fusion profile, to add OpenPype menu, scripts and and config files. master_prefs_variable = f"FUSION{app_version}_MasterPrefs" master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") self.log.info(f"Setting {master_prefs_variable}: {master_prefs}") From 3f9f9bc6d1dc13a500cbd1b7cc76f0567b0fd854 Mon Sep 17 00:00:00 2001 From: moonyuet Date: Tue, 14 Mar 2023 10:10:16 +0100 Subject: [PATCH 866/912] fix the bug of removing an instance --- openpype/hosts/max/api/plugin.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/max/api/plugin.py b/openpype/hosts/max/api/plugin.py index c16d9e61ec..c7b9b64d29 100644 --- a/openpype/hosts/max/api/plugin.py +++ b/openpype/hosts/max/api/plugin.py @@ -101,7 +101,12 @@ class MaxCreator(Creator, MaxCreatorBase): instance_node = rt.getNodeByName( instance.data.get("instance_node")) if instance_node: - rt.delete(rt.getNodeByName(instance_node)) + rt.select(instance_node) + unparent_cmd = f""" + for o in selection do for c in o.children do c.parent = undefined + """ + rt.execute(unparent_cmd) + rt.delete(instance_node) self._remove_instance_from_context(instance) From 8199faedc0880b21e39fd9a03c77965d5f34c436 Mon Sep 17 00:00:00 2001 From: moonyuet Date: Tue, 14 Mar 2023 10:15:46 +0100 Subject: [PATCH 867/912] cosmetic issue fix --- openpype/hosts/max/api/plugin.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/openpype/hosts/max/api/plugin.py b/openpype/hosts/max/api/plugin.py index c7b9b64d29..b54568b360 100644 --- a/openpype/hosts/max/api/plugin.py +++ b/openpype/hosts/max/api/plugin.py @@ -102,10 +102,7 @@ class MaxCreator(Creator, MaxCreatorBase): instance.data.get("instance_node")) if instance_node: rt.select(instance_node) - unparent_cmd = f""" - for o in selection do for c in o.children do c.parent = undefined - """ - rt.execute(unparent_cmd) + rt.execute(f'for o in selection do for c in o.children do c.parent = undefined') # noqa rt.delete(instance_node) self._remove_instance_from_context(instance) From 5b43ce940c990592d69e360cf880aa35ce6009d5 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 14 Mar 2023 10:02:23 +0100 Subject: [PATCH 868/912] Maya: Avoid error on right click in Loader if Arnold `mtoa` is not loaded --- openpype/hosts/maya/plugins/load/load_arnold_standin.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/load/load_arnold_standin.py b/openpype/hosts/maya/plugins/load/load_arnold_standin.py index ab69d62ef5..11a2bd1966 100644 --- a/openpype/hosts/maya/plugins/load/load_arnold_standin.py +++ b/openpype/hosts/maya/plugins/load/load_arnold_standin.py @@ -2,7 +2,6 @@ import os import clique import maya.cmds as cmds -import mtoa.ui.arnoldmenu from openpype.settings import get_project_settings from openpype.pipeline import ( @@ -36,6 +35,11 @@ class ArnoldStandinLoader(load.LoaderPlugin): color = "orange" def load(self, context, name, namespace, options): + + # Make sure to load arnold before importing `mtoa.ui.arnoldmenu` + cmds.loadPlugin("mtoa", quiet=True) + import mtoa.ui.arnoldmenu + version = context['version'] version_data = version.get("data", {}) From 182bc4b5e866a8a756f020bf79617e38e749743d Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sat, 11 Mar 2023 20:20:18 +0100 Subject: [PATCH 869/912] Fix #4357: Move Look Assigner tool to maya since it's Maya only --- openpype/hosts/maya/api/customize.py | 3 +- openpype/hosts/maya/api/menu.py | 3 +- openpype/hosts/maya/tools/__init__.py | 26 +++++++++++++++ .../maya}/tools/mayalookassigner/LICENSE | 0 .../maya}/tools/mayalookassigner/__init__.py | 0 .../maya}/tools/mayalookassigner/app.py | 0 .../maya}/tools/mayalookassigner/commands.py | 0 .../maya}/tools/mayalookassigner/models.py | 0 .../maya}/tools/mayalookassigner/views.py | 0 .../tools/mayalookassigner/vray_proxies.py | 0 .../maya}/tools/mayalookassigner/widgets.py | 0 openpype/tools/utils/host_tools.py | 32 ------------------- 12 files changed, 30 insertions(+), 34 deletions(-) create mode 100644 openpype/hosts/maya/tools/__init__.py rename openpype/{ => hosts/maya}/tools/mayalookassigner/LICENSE (100%) rename openpype/{ => hosts/maya}/tools/mayalookassigner/__init__.py (100%) rename openpype/{ => hosts/maya}/tools/mayalookassigner/app.py (100%) rename openpype/{ => hosts/maya}/tools/mayalookassigner/commands.py (100%) rename openpype/{ => hosts/maya}/tools/mayalookassigner/models.py (100%) rename openpype/{ => hosts/maya}/tools/mayalookassigner/views.py (100%) rename openpype/{ => hosts/maya}/tools/mayalookassigner/vray_proxies.py (100%) rename openpype/{ => hosts/maya}/tools/mayalookassigner/widgets.py (100%) diff --git a/openpype/hosts/maya/api/customize.py b/openpype/hosts/maya/api/customize.py index f66858dfb6..f4c4d6ed88 100644 --- a/openpype/hosts/maya/api/customize.py +++ b/openpype/hosts/maya/api/customize.py @@ -11,6 +11,7 @@ import maya.mel as mel from openpype import resources from openpype.tools.utils import host_tools from .lib import get_main_window +from ..tools import show_look_assigner log = logging.getLogger(__name__) @@ -112,7 +113,7 @@ def override_toolbox_ui(): annotation="Look Manager", label="Look Manager", image=os.path.join(icons, "lookmanager.png"), - command=host_tools.show_look_assigner, + command=show_look_assigner, width=icon_size, height=icon_size, parent=parent diff --git a/openpype/hosts/maya/api/menu.py b/openpype/hosts/maya/api/menu.py index 0f48a133a6..efd9d414b6 100644 --- a/openpype/hosts/maya/api/menu.py +++ b/openpype/hosts/maya/api/menu.py @@ -12,6 +12,7 @@ from openpype.pipeline.workfile import BuildWorkfile from openpype.tools.utils import host_tools from openpype.hosts.maya.api import lib, lib_rendersettings from .lib import get_main_window, IS_HEADLESS +from ..tools import show_look_assigner from .workfile_template_builder import ( create_placeholder, @@ -139,7 +140,7 @@ def install(): cmds.menuItem( "Look assigner...", - command=lambda *args: host_tools.show_look_assigner( + command=lambda *args: show_look_assigner( parent_widget ) ) diff --git a/openpype/hosts/maya/tools/__init__.py b/openpype/hosts/maya/tools/__init__.py new file mode 100644 index 0000000000..a83bb36310 --- /dev/null +++ b/openpype/hosts/maya/tools/__init__.py @@ -0,0 +1,26 @@ +from ....tools.utils.host_tools import HostToolsHelper, qt_app_context + +class MayaToolsSingleton: + _look_assigner = None + + +def get_look_assigner_tool(parent): + """Create, cache and return look assigner tool window.""" + if self._look_assigner is None: + from .mayalookassigner import MayaLookAssignerWindow + mayalookassigner_window = MayaLookAssignerWindow(parent) + MayaToolsSingleton._look_assigner = mayalookassigner_window + return MayaToolsSingleton._look_assigner + + +def show_look_assigner(parent=None): + """Look manager is Maya specific tool for look management.""" + + with qt_app_context(): + look_assigner_tool = get_look_assigner_tool(parent) + look_assigner_tool.show() + + # Pull window to the front. + look_assigner_tool.raise_() + look_assigner_tool.activateWindow() + look_assigner_tool.showNormal() \ No newline at end of file diff --git a/openpype/tools/mayalookassigner/LICENSE b/openpype/hosts/maya/tools/mayalookassigner/LICENSE similarity index 100% rename from openpype/tools/mayalookassigner/LICENSE rename to openpype/hosts/maya/tools/mayalookassigner/LICENSE diff --git a/openpype/tools/mayalookassigner/__init__.py b/openpype/hosts/maya/tools/mayalookassigner/__init__.py similarity index 100% rename from openpype/tools/mayalookassigner/__init__.py rename to openpype/hosts/maya/tools/mayalookassigner/__init__.py diff --git a/openpype/tools/mayalookassigner/app.py b/openpype/hosts/maya/tools/mayalookassigner/app.py similarity index 100% rename from openpype/tools/mayalookassigner/app.py rename to openpype/hosts/maya/tools/mayalookassigner/app.py diff --git a/openpype/tools/mayalookassigner/commands.py b/openpype/hosts/maya/tools/mayalookassigner/commands.py similarity index 100% rename from openpype/tools/mayalookassigner/commands.py rename to openpype/hosts/maya/tools/mayalookassigner/commands.py diff --git a/openpype/tools/mayalookassigner/models.py b/openpype/hosts/maya/tools/mayalookassigner/models.py similarity index 100% rename from openpype/tools/mayalookassigner/models.py rename to openpype/hosts/maya/tools/mayalookassigner/models.py diff --git a/openpype/tools/mayalookassigner/views.py b/openpype/hosts/maya/tools/mayalookassigner/views.py similarity index 100% rename from openpype/tools/mayalookassigner/views.py rename to openpype/hosts/maya/tools/mayalookassigner/views.py diff --git a/openpype/tools/mayalookassigner/vray_proxies.py b/openpype/hosts/maya/tools/mayalookassigner/vray_proxies.py similarity index 100% rename from openpype/tools/mayalookassigner/vray_proxies.py rename to openpype/hosts/maya/tools/mayalookassigner/vray_proxies.py diff --git a/openpype/tools/mayalookassigner/widgets.py b/openpype/hosts/maya/tools/mayalookassigner/widgets.py similarity index 100% rename from openpype/tools/mayalookassigner/widgets.py rename to openpype/hosts/maya/tools/mayalookassigner/widgets.py diff --git a/openpype/tools/utils/host_tools.py b/openpype/tools/utils/host_tools.py index e8593a8ae2..ac242d24d2 100644 --- a/openpype/tools/utils/host_tools.py +++ b/openpype/tools/utils/host_tools.py @@ -38,7 +38,6 @@ class HostToolsHelper: self._subset_manager_tool = None self._scene_inventory_tool = None self._library_loader_tool = None - self._look_assigner_tool = None self._experimental_tools_dialog = None @property @@ -219,27 +218,6 @@ class HostToolsHelper: raise ImportError("No Pyblish GUI found") - def get_look_assigner_tool(self, parent): - """Create, cache and return look assigner tool window.""" - if self._look_assigner_tool is None: - from openpype.tools.mayalookassigner import MayaLookAssignerWindow - - mayalookassigner_window = MayaLookAssignerWindow(parent) - self._look_assigner_tool = mayalookassigner_window - return self._look_assigner_tool - - def show_look_assigner(self, parent=None): - """Look manager is Maya specific tool for look management.""" - - with qt_app_context(): - look_assigner_tool = self.get_look_assigner_tool(parent) - look_assigner_tool.show() - - # Pull window to the front. - look_assigner_tool.raise_() - look_assigner_tool.activateWindow() - look_assigner_tool.showNormal() - def get_experimental_tools_dialog(self, parent=None): """Dialog of experimental tools. @@ -315,9 +293,6 @@ class HostToolsHelper: elif tool_name == "sceneinventory": return self.get_scene_inventory_tool(parent, *args, **kwargs) - elif tool_name == "lookassigner": - return self.get_look_assigner_tool(parent, *args, **kwargs) - elif tool_name == "publish": self.log.info("Can't return publish tool window.") @@ -356,9 +331,6 @@ class HostToolsHelper: elif tool_name == "sceneinventory": self.show_scene_inventory(parent, *args, **kwargs) - elif tool_name == "lookassigner": - self.show_look_assigner(parent, *args, **kwargs) - elif tool_name == "publish": self.show_publish(parent, *args, **kwargs) @@ -436,10 +408,6 @@ def show_scene_inventory(parent=None): _SingletonPoint.show_tool_by_name("sceneinventory", parent) -def show_look_assigner(parent=None): - _SingletonPoint.show_tool_by_name("lookassigner", parent) - - def show_publish(parent=None): _SingletonPoint.show_tool_by_name("publish", parent) From 1d62d15c206515669f6fb6acce6da3a98d4a9657 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sat, 11 Mar 2023 20:24:52 +0100 Subject: [PATCH 870/912] Shush hound --- openpype/hosts/maya/tools/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/maya/tools/__init__.py b/openpype/hosts/maya/tools/__init__.py index a83bb36310..ccb014a3b9 100644 --- a/openpype/hosts/maya/tools/__init__.py +++ b/openpype/hosts/maya/tools/__init__.py @@ -1,4 +1,4 @@ -from ....tools.utils.host_tools import HostToolsHelper, qt_app_context +from ....tools.utils.host_tools import qt_app_context class MayaToolsSingleton: _look_assigner = None @@ -6,7 +6,7 @@ class MayaToolsSingleton: def get_look_assigner_tool(parent): """Create, cache and return look assigner tool window.""" - if self._look_assigner is None: + if MayaToolsSingleton._look_assigner is None: from .mayalookassigner import MayaLookAssignerWindow mayalookassigner_window = MayaLookAssignerWindow(parent) MayaToolsSingleton._look_assigner = mayalookassigner_window @@ -23,4 +23,4 @@ def show_look_assigner(parent=None): # Pull window to the front. look_assigner_tool.raise_() look_assigner_tool.activateWindow() - look_assigner_tool.showNormal() \ No newline at end of file + look_assigner_tool.showNormal() From 888dbdb569d8c9b658be578c846a7bd0727dd8c7 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 13 Mar 2023 13:38:59 +0100 Subject: [PATCH 871/912] Relative import to absolute import Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- openpype/hosts/maya/tools/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/maya/tools/__init__.py b/openpype/hosts/maya/tools/__init__.py index ccb014a3b9..643c90bacd 100644 --- a/openpype/hosts/maya/tools/__init__.py +++ b/openpype/hosts/maya/tools/__init__.py @@ -1,4 +1,4 @@ -from ....tools.utils.host_tools import qt_app_context +from openpype.tools.utils.host_tools import qt_app_context class MayaToolsSingleton: _look_assigner = None From 11b1b98d25f9937c49b977e5e12c4b0491669ae8 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 14 Mar 2023 09:56:42 +0100 Subject: [PATCH 872/912] Shush hound --- openpype/hosts/maya/tools/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/maya/tools/__init__.py b/openpype/hosts/maya/tools/__init__.py index 643c90bacd..bd1e302cd2 100644 --- a/openpype/hosts/maya/tools/__init__.py +++ b/openpype/hosts/maya/tools/__init__.py @@ -1,5 +1,6 @@ from openpype.tools.utils.host_tools import qt_app_context + class MayaToolsSingleton: _look_assigner = None From ecfb57913d52325323d1c2fcb8b6519e03ff201b Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 14 Mar 2023 16:05:40 +0100 Subject: [PATCH 873/912] update yarn.lock --- website/yarn.lock | 10884 ++++++++++++++++++++++---------------------- 1 file changed, 5476 insertions(+), 5408 deletions(-) diff --git a/website/yarn.lock b/website/yarn.lock index d250e48b9d..2edf57abf4 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -3,56 +3,56 @@ "@algolia/autocomplete-core@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.5.2.tgz#ec0178e07b44fd74a057728ac157291b26cecf37" - integrity sha512-DY0bhyczFSS1b/CqJlTE/nQRtnTAHl6IemIkBy0nEWnhDzRDdtdx4p5Uuk3vwAFxwEEgi1WqKwgSSMx6DpNL4A== + "integrity" "sha512-DY0bhyczFSS1b/CqJlTE/nQRtnTAHl6IemIkBy0nEWnhDzRDdtdx4p5Uuk3vwAFxwEEgi1WqKwgSSMx6DpNL4A==" + "resolved" "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.5.2.tgz" + "version" "1.5.2" dependencies: "@algolia/autocomplete-shared" "1.5.2" "@algolia/autocomplete-preset-algolia@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.5.2.tgz#36c5638cc6dba6ea46a86e5a0314637ca40a77ca" - integrity sha512-3MRYnYQFJyovANzSX2CToS6/5cfVjbLLqFsZTKcvF3abhQzxbqwwaMBlJtt620uBUOeMzhdfasKhCc40+RHiZw== + "integrity" "sha512-3MRYnYQFJyovANzSX2CToS6/5cfVjbLLqFsZTKcvF3abhQzxbqwwaMBlJtt620uBUOeMzhdfasKhCc40+RHiZw==" + "resolved" "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.5.2.tgz" + "version" "1.5.2" dependencies: "@algolia/autocomplete-shared" "1.5.2" "@algolia/autocomplete-shared@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.5.2.tgz#e157f9ad624ab8fd940ff28bd2094cdf199cdd79" - integrity sha512-ylQAYv5H0YKMfHgVWX0j0NmL8XBcAeeeVQUmppnnMtzDbDnca6CzhKj3Q8eF9cHCgcdTDdb5K+3aKyGWA0obug== + "integrity" "sha512-ylQAYv5H0YKMfHgVWX0j0NmL8XBcAeeeVQUmppnnMtzDbDnca6CzhKj3Q8eF9cHCgcdTDdb5K+3aKyGWA0obug==" + "resolved" "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.5.2.tgz" + "version" "1.5.2" "@algolia/cache-browser-local-storage@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.12.1.tgz#23f4f219963b96918d0524acd09d4d646541d888" - integrity sha512-ERFFOnC9740xAkuO0iZTQqm2AzU7Dpz/s+g7o48GlZgx5p9GgNcsuK5eS0GoW/tAK+fnKlizCtlFHNuIWuvfsg== + "integrity" "sha512-ERFFOnC9740xAkuO0iZTQqm2AzU7Dpz/s+g7o48GlZgx5p9GgNcsuK5eS0GoW/tAK+fnKlizCtlFHNuIWuvfsg==" + "resolved" "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/cache-common" "4.12.1" "@algolia/cache-common@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.12.1.tgz#d3f1676ca9c404adce0f78d68f6381bedb44cd9c" - integrity sha512-UugTER3V40jT+e19Dmph5PKMeliYKxycNPwrPNADin0RcWNfT2QksK9Ff2N2W7UKraqMOzoeDb4LAJtxcK1a8Q== + "integrity" "sha512-UugTER3V40jT+e19Dmph5PKMeliYKxycNPwrPNADin0RcWNfT2QksK9Ff2N2W7UKraqMOzoeDb4LAJtxcK1a8Q==" + "resolved" "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.12.1.tgz" + "version" "4.12.1" "@algolia/cache-in-memory@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.12.1.tgz#0ef6aac2f8feab5b46fc130beb682bbd21b55244" - integrity sha512-U6iaunaxK1lHsAf02UWF58foKFEcrVLsHwN56UkCtwn32nlP9rz52WOcHsgk6TJrL8NDcO5swMjtOQ5XHESFLw== + "integrity" "sha512-U6iaunaxK1lHsAf02UWF58foKFEcrVLsHwN56UkCtwn32nlP9rz52WOcHsgk6TJrL8NDcO5swMjtOQ5XHESFLw==" + "resolved" "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/cache-common" "4.12.1" "@algolia/client-account@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.12.1.tgz#e838c9283db2fab32a425dd13c77da321d48fd8b" - integrity sha512-jGo4ConJNoMdTCR2zouO0jO/JcJmzOK6crFxMMLvdnB1JhmMbuIKluOTJVlBWeivnmcsqb7r0v7qTCPW5PAyxQ== + "integrity" "sha512-jGo4ConJNoMdTCR2zouO0jO/JcJmzOK6crFxMMLvdnB1JhmMbuIKluOTJVlBWeivnmcsqb7r0v7qTCPW5PAyxQ==" + "resolved" "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/client-common" "4.12.1" "@algolia/client-search" "4.12.1" "@algolia/transporter" "4.12.1" "@algolia/client-analytics@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.12.1.tgz#2976d658655a1590cf84cfb596aa75a204f6dec4" - integrity sha512-h1It7KXzIthlhuhfBk7LteYq72tym9maQDUsyRW0Gft8b6ZQahnRak9gcCvKwhcJ1vJoP7T7JrNYGiYSicTD9g== + "integrity" "sha512-h1It7KXzIthlhuhfBk7LteYq72tym9maQDUsyRW0Gft8b6ZQahnRak9gcCvKwhcJ1vJoP7T7JrNYGiYSicTD9g==" + "resolved" "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/client-common" "4.12.1" "@algolia/client-search" "4.12.1" @@ -60,99 +60,121 @@ "@algolia/transporter" "4.12.1" "@algolia/client-common@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.12.1.tgz#104ccefe96bda3ff926bc70c31ff6d17c41b6107" - integrity sha512-obnJ8eSbv+h94Grk83DTGQ3bqhViSWureV6oK1s21/KMGWbb3DkduHm+lcwFrMFkjSUSzosLBHV9EQUIBvueTw== + "integrity" "sha512-obnJ8eSbv+h94Grk83DTGQ3bqhViSWureV6oK1s21/KMGWbb3DkduHm+lcwFrMFkjSUSzosLBHV9EQUIBvueTw==" + "resolved" "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/requester-common" "4.12.1" "@algolia/transporter" "4.12.1" "@algolia/client-personalization@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.12.1.tgz#f63d1890f95de850e1c8e41c1d57adda521d9e7f" - integrity sha512-sMSnjjPjRgByGHYygV+5L/E8a6RgU7l2GbpJukSzJ9GRY37tHmBHuvahv8JjdCGJ2p7QDYLnQy5bN5Z02qjc7Q== + "integrity" "sha512-sMSnjjPjRgByGHYygV+5L/E8a6RgU7l2GbpJukSzJ9GRY37tHmBHuvahv8JjdCGJ2p7QDYLnQy5bN5Z02qjc7Q==" + "resolved" "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/client-common" "4.12.1" "@algolia/requester-common" "4.12.1" "@algolia/transporter" "4.12.1" -"@algolia/client-search@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.12.1.tgz#fcd7a974be5d39d5c336d7f2e89577ffa66aefdd" - integrity sha512-MwwKKprfY6X2nJ5Ki/ccXM2GDEePvVjZnnoOB2io3dLKW4fTqeSRlC5DRXeFD7UM0vOPPHr4ItV2aj19APKNVQ== +"@algolia/client-search@^4.9.1", "@algolia/client-search@4.12.1": + "integrity" "sha512-MwwKKprfY6X2nJ5Ki/ccXM2GDEePvVjZnnoOB2io3dLKW4fTqeSRlC5DRXeFD7UM0vOPPHr4ItV2aj19APKNVQ==" + "resolved" "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/client-common" "4.12.1" "@algolia/requester-common" "4.12.1" "@algolia/transporter" "4.12.1" "@algolia/events@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@algolia/events/-/events-4.0.1.tgz#fd39e7477e7bc703d7f893b556f676c032af3950" - integrity sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ== + "integrity" "sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ==" + "resolved" "https://registry.npmjs.org/@algolia/events/-/events-4.0.1.tgz" + "version" "4.0.1" "@algolia/logger-common@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.12.1.tgz#d6501b4d9d242956257ba8e10f6b4bbf6863baa4" - integrity sha512-fCgrzlXGATNqdFTxwx0GsyPXK+Uqrx1SZ3iuY2VGPPqdt1a20clAG2n2OcLHJpvaa6vMFPlJyWvbqAgzxdxBlQ== + "integrity" "sha512-fCgrzlXGATNqdFTxwx0GsyPXK+Uqrx1SZ3iuY2VGPPqdt1a20clAG2n2OcLHJpvaa6vMFPlJyWvbqAgzxdxBlQ==" + "resolved" "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.12.1.tgz" + "version" "4.12.1" "@algolia/logger-console@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.12.1.tgz#841edd39dd5c5530a69fc66084bfee3254dd0807" - integrity sha512-0owaEnq/davngQMYqxLA4KrhWHiXujQ1CU3FFnyUcMyBR7rGHI48zSOUpqnsAXrMBdSH6rH5BDkSUUFwsh8RkQ== + "integrity" "sha512-0owaEnq/davngQMYqxLA4KrhWHiXujQ1CU3FFnyUcMyBR7rGHI48zSOUpqnsAXrMBdSH6rH5BDkSUUFwsh8RkQ==" + "resolved" "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/logger-common" "4.12.1" "@algolia/requester-browser-xhr@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.12.1.tgz#2d0c18ee188d7cae0e4a930e5e89989e3c4a816b" - integrity sha512-OaMxDyG0TZG0oqz1lQh9e3woantAG1bLnuwq3fmypsrQxra4IQZiyn1x+kEb69D2TcXApI5gOgrD4oWhtEVMtw== + "integrity" "sha512-OaMxDyG0TZG0oqz1lQh9e3woantAG1bLnuwq3fmypsrQxra4IQZiyn1x+kEb69D2TcXApI5gOgrD4oWhtEVMtw==" + "resolved" "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/requester-common" "4.12.1" "@algolia/requester-common@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.12.1.tgz#95bb6539da7199da3e205341cea8f27267f7af29" - integrity sha512-XWIrWQNJ1vIrSuL/bUk3ZwNMNxl+aWz6dNboRW6+lGTcMIwc3NBFE90ogbZKhNrFRff8zI4qCF15tjW+Fyhpow== + "integrity" "sha512-XWIrWQNJ1vIrSuL/bUk3ZwNMNxl+aWz6dNboRW6+lGTcMIwc3NBFE90ogbZKhNrFRff8zI4qCF15tjW+Fyhpow==" + "resolved" "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.12.1.tgz" + "version" "4.12.1" "@algolia/requester-node-http@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.12.1.tgz#c9df97ff1daa7e58c5c2b1f28cf7163005edccb0" - integrity sha512-awBtwaD+s0hxkA1aehYn8F0t9wqGoBVWgY4JPHBmp1ChO3pK7RKnnvnv7QQa9vTlllX29oPt/BBVgMo1Z3n1Qg== + "integrity" "sha512-awBtwaD+s0hxkA1aehYn8F0t9wqGoBVWgY4JPHBmp1ChO3pK7RKnnvnv7QQa9vTlllX29oPt/BBVgMo1Z3n1Qg==" + "resolved" "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/requester-common" "4.12.1" "@algolia/transporter@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.12.1.tgz#61b9829916c474f42e2d4a6eada0d6c138379945" - integrity sha512-BGeNgdEHc6dXIk2g8kdlOoQ6fQ6OIaKQcplEj7HPoi+XZUeAvRi3Pff3QWd7YmybWkjzd9AnTzieTASDWhL+sQ== + "integrity" "sha512-BGeNgdEHc6dXIk2g8kdlOoQ6fQ6OIaKQcplEj7HPoi+XZUeAvRi3Pff3QWd7YmybWkjzd9AnTzieTASDWhL+sQ==" + "resolved" "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/cache-common" "4.12.1" "@algolia/logger-common" "4.12.1" "@algolia/requester-common" "4.12.1" -"@ampproject/remapping@^2.1.0": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34" - integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg== +"@ampproject/remapping@^2.2.0": + "integrity" "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==" + "resolved" "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz" + "version" "2.2.0" dependencies: - "@jridgewell/trace-mapping" "^0.3.0" + "@jridgewell/gen-mapping" "^0.1.0" + "@jridgewell/trace-mapping" "^0.3.9" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" - integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.8.3": + "integrity" "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==" + "resolved" "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz" + "version" "7.18.6" dependencies: - "@babel/highlight" "^7.16.7" + "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34" - integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng== +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.20.5": + "integrity" "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==" + "resolved" "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz" + "version" "7.21.0" -"@babel/core@7.12.9": - version "7.12.9" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8" - integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ== +"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.12.0", "@babel/core@^7.13.0", "@babel/core@^7.15.5", "@babel/core@^7.16.0", "@babel/core@^7.4.0-0": + "integrity" "sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw==" + "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.21.3.tgz" + "version" "7.21.3" + dependencies: + "@ampproject/remapping" "^2.2.0" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.21.3" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-module-transforms" "^7.21.2" + "@babel/helpers" "^7.21.0" + "@babel/parser" "^7.21.3" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.3" + "@babel/types" "^7.21.3" + "convert-source-map" "^1.7.0" + "debug" "^4.1.0" + "gensync" "^1.0.0-beta.2" + "json5" "^2.2.2" + "semver" "^6.3.0" + +"@babel/core@^7.11.6", "@babel/core@7.12.9": + "integrity" "sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==" + "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz" + "version" "7.12.9" dependencies: "@babel/code-frame" "^7.10.4" "@babel/generator" "^7.12.5" @@ -162,74 +184,55 @@ "@babel/template" "^7.12.7" "@babel/traverse" "^7.12.9" "@babel/types" "^7.12.7" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.1" - json5 "^2.1.2" - lodash "^4.17.19" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" + "convert-source-map" "^1.7.0" + "debug" "^4.1.0" + "gensync" "^1.0.0-beta.1" + "json5" "^2.1.2" + "lodash" "^4.17.19" + "resolve" "^1.3.2" + "semver" "^5.4.1" + "source-map" "^0.5.0" -"@babel/core@^7.15.5", "@babel/core@^7.16.0": - version "7.17.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.5.tgz#6cd2e836058c28f06a4ca8ee7ed955bbf37c8225" - integrity sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA== +"@babel/generator@^7.12.5", "@babel/generator@^7.16.0", "@babel/generator@^7.21.3": + "integrity" "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==" + "resolved" "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz" + "version" "7.21.3" dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.3" - "@babel/helper-compilation-targets" "^7.16.7" - "@babel/helper-module-transforms" "^7.16.7" - "@babel/helpers" "^7.17.2" - "@babel/parser" "^7.17.3" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.3" - "@babel/types" "^7.17.0" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.1.2" - semver "^6.3.0" - -"@babel/generator@^7.12.5", "@babel/generator@^7.16.0", "@babel/generator@^7.17.3": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200" - integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg== - dependencies: - "@babel/types" "^7.17.0" - jsesc "^2.5.1" - source-map "^0.5.0" + "@babel/types" "^7.21.3" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + "jsesc" "^2.5.1" "@babel/helper-annotate-as-pure@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" - integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw== + "integrity" "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==" + "resolved" "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/types" "^7.16.7" "@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b" - integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA== + "integrity" "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==" + "resolved" "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-explode-assignable-expression" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b" - integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA== +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.20.7": + "integrity" "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==" + "resolved" "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz" + "version" "7.20.7" dependencies: - "@babel/compat-data" "^7.16.4" - "@babel/helper-validator-option" "^7.16.7" - browserslist "^4.17.5" - semver "^6.3.0" + "@babel/compat-data" "^7.20.5" + "@babel/helper-validator-option" "^7.18.6" + "browserslist" "^4.21.3" + "lru-cache" "^5.1.1" + "semver" "^6.3.0" "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7": - version "7.17.1" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz#9699f14a88833a7e055ce57dcd3ffdcd25186b21" - integrity sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ== + "integrity" "sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ==" + "resolved" "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz" + "version" "7.17.1" dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-environment-visitor" "^7.16.7" @@ -240,122 +243,112 @@ "@babel/helper-split-export-declaration" "^7.16.7" "@babel/helper-create-regexp-features-plugin@^7.16.7": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1" - integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA== + "integrity" "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==" + "resolved" "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz" + "version" "7.17.0" dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" - regexpu-core "^5.0.1" + "regexpu-core" "^5.0.1" "@babel/helper-define-polyfill-provider@^0.3.1": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665" - integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA== + "integrity" "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==" + "resolved" "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz" + "version" "0.3.1" dependencies: "@babel/helper-compilation-targets" "^7.13.0" "@babel/helper-module-imports" "^7.12.13" "@babel/helper-plugin-utils" "^7.13.0" "@babel/traverse" "^7.13.0" - debug "^4.1.1" - lodash.debounce "^4.0.8" - resolve "^1.14.2" - semver "^6.1.2" + "debug" "^4.1.1" + "lodash.debounce" "^4.0.8" + "resolve" "^1.14.2" + "semver" "^6.1.2" -"@babel/helper-environment-visitor@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" - integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== - dependencies: - "@babel/types" "^7.16.7" +"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.9": + "integrity" "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==" + "resolved" "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz" + "version" "7.18.9" "@babel/helper-explode-assignable-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a" - integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ== + "integrity" "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==" + "resolved" "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/types" "^7.16.7" -"@babel/helper-function-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" - integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA== +"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.21.0": + "integrity" "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==" + "resolved" "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz" + "version" "7.21.0" dependencies: - "@babel/helper-get-function-arity" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/types" "^7.16.7" + "@babel/template" "^7.20.7" + "@babel/types" "^7.21.0" -"@babel/helper-get-function-arity@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" - integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== +"@babel/helper-hoist-variables@^7.16.7", "@babel/helper-hoist-variables@^7.18.6": + "integrity" "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==" + "resolved" "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz" + "version" "7.18.6" dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-hoist-variables@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" - integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== - dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" "@babel/helper-member-expression-to-functions@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0" - integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q== + "integrity" "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==" + "resolved" "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/types" "^7.16.7" -"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" - integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== +"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6": + "integrity" "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==" + "resolved" "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz" + "version" "7.18.6" dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41" - integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng== +"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.21.2": + "integrity" "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==" + "resolved" "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz" + "version" "7.21.2" dependencies: - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-simple-access" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/helper-validator-identifier" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.16.7" - "@babel/types" "^7.16.7" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-simple-access" "^7.20.2" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.19.1" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.2" + "@babel/types" "^7.21.2" "@babel/helper-optimise-call-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2" - integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w== + "integrity" "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==" + "resolved" "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/types" "^7.16.7" -"@babel/helper-plugin-utils@7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" - integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== - "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" - integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== + "integrity" "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==" + "resolved" "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz" + "version" "7.16.7" + +"@babel/helper-plugin-utils@7.10.4": + "integrity" "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==" + "resolved" "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz" + "version" "7.10.4" "@babel/helper-remap-async-to-generator@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3" - integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw== + "integrity" "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==" + "resolved" "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz" + "version" "7.16.8" dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-wrap-function" "^7.16.8" "@babel/types" "^7.16.8" "@babel/helper-replace-supers@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1" - integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw== + "integrity" "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==" + "resolved" "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-environment-visitor" "^7.16.7" "@babel/helper-member-expression-to-functions" "^7.16.7" @@ -363,173 +356,169 @@ "@babel/traverse" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/helper-simple-access@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7" - integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g== +"@babel/helper-simple-access@^7.16.7", "@babel/helper-simple-access@^7.20.2": + "integrity" "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==" + "resolved" "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz" + "version" "7.20.2" dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.20.2" "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" - integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw== + "integrity" "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==" + "resolved" "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz" + "version" "7.16.0" dependencies: "@babel/types" "^7.16.0" -"@babel/helper-split-export-declaration@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" - integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== +"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.18.6": + "integrity" "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==" + "resolved" "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz" + "version" "7.18.6" dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" -"@babel/helper-validator-identifier@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" - integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== +"@babel/helper-string-parser@^7.19.4": + "integrity" "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==" + "resolved" "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz" + "version" "7.19.4" -"@babel/helper-validator-option@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" - integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== +"@babel/helper-validator-identifier@^7.16.7", "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": + "integrity" "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==" + "resolved" "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz" + "version" "7.19.1" + +"@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.18.6": + "integrity" "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==" + "resolved" "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz" + "version" "7.21.0" "@babel/helper-wrap-function@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200" - integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw== + "integrity" "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==" + "resolved" "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz" + "version" "7.16.8" dependencies: "@babel/helper-function-name" "^7.16.7" "@babel/template" "^7.16.7" "@babel/traverse" "^7.16.8" "@babel/types" "^7.16.8" -"@babel/helpers@^7.12.5", "@babel/helpers@^7.17.2": - version "7.17.2" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.2.tgz#23f0a0746c8e287773ccd27c14be428891f63417" - integrity sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ== +"@babel/helpers@^7.12.5", "@babel/helpers@^7.21.0": + "integrity" "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==" + "resolved" "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz" + "version" "7.21.0" dependencies: - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.0" - "@babel/types" "^7.17.0" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.0" + "@babel/types" "^7.21.0" -"@babel/highlight@^7.16.7": - version "7.16.10" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" - integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw== +"@babel/highlight@^7.18.6": + "integrity" "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==" + "resolved" "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz" + "version" "7.18.6" dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - chalk "^2.0.0" - js-tokens "^4.0.0" + "@babel/helper-validator-identifier" "^7.18.6" + "chalk" "^2.0.0" + "js-tokens" "^4.0.0" -"@babel/parser@^7.12.7", "@babel/parser@^7.16.4", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0" - integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA== +"@babel/parser@^7.12.7", "@babel/parser@^7.16.4", "@babel/parser@^7.20.7", "@babel/parser@^7.21.3": + "integrity" "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==" + "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz" + "version" "7.21.3" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050" - integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg== + "integrity" "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9" - integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw== + "integrity" "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-proposal-optional-chaining" "^7.16.7" "@babel/plugin-proposal-async-generator-functions@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8" - integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ== + "integrity" "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz" + "version" "7.16.8" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-remap-async-to-generator" "^7.16.8" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-proposal-class-properties@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0" - integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww== + "integrity" "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-create-class-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-proposal-class-static-block@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz#712357570b612106ef5426d13dc433ce0f200c2a" - integrity sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw== + "integrity" "sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-create-class-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-proposal-dynamic-import@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2" - integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg== + "integrity" "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-proposal-export-namespace-from@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163" - integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA== + "integrity" "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" "@babel/plugin-proposal-json-strings@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8" - integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ== + "integrity" "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-json-strings" "^7.8.3" "@babel/plugin-proposal-logical-assignment-operators@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea" - integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg== + "integrity" "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99" - integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ== + "integrity" "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" "@babel/plugin-proposal-numeric-separator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9" - integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw== + "integrity" "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069" - integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-transform-parameters" "^7.12.1" - "@babel/plugin-proposal-object-rest-spread@^7.16.7": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390" - integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw== + "integrity" "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz" + "version" "7.17.3" dependencies: "@babel/compat-data" "^7.17.0" "@babel/helper-compilation-targets" "^7.16.7" @@ -537,35 +526,44 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-transform-parameters" "^7.16.7" +"@babel/plugin-proposal-object-rest-spread@7.12.1": + "integrity" "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz" + "version" "7.12.1" + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + "@babel/plugin-transform-parameters" "^7.12.1" + "@babel/plugin-proposal-optional-catch-binding@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf" - integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA== + "integrity" "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-proposal-optional-chaining@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a" - integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA== + "integrity" "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-proposal-private-methods@^7.16.11": - version "7.16.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50" - integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw== + "integrity" "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz" + "version" "7.16.11" dependencies: "@babel/helper-create-class-features-plugin" "^7.16.10" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-proposal-private-property-in-object@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce" - integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ== + "integrity" "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-create-class-features-plugin" "^7.16.7" @@ -573,166 +571,166 @@ "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2" - integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg== + "integrity" "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-async-generators@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" - integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== + "integrity" "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz" + "version" "7.8.4" dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-class-properties@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" - integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== + "integrity" "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz" + "version" "7.12.13" dependencies: "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-class-static-block@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" - integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw== + "integrity" "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz" + "version" "7.14.5" dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-dynamic-import@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" - integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== + "integrity" "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz" + "version" "7.8.3" dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-export-namespace-from@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" - integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== + "integrity" "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz" + "version" "7.8.3" dependencies: "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-json-strings@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" - integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== + "integrity" "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz" + "version" "7.8.3" dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926" - integrity sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-jsx@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz#50b6571d13f764266a113d77c82b4a6508bbe665" - integrity sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q== + "integrity" "sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-syntax-jsx@7.12.1": + "integrity" "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz" + "version" "7.12.1" + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-logical-assignment-operators@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" - integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== + "integrity" "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz" + "version" "7.10.4" dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" - integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== + "integrity" "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz" + "version" "7.8.3" dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-numeric-separator@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" - integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== + "integrity" "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz" + "version" "7.10.4" dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-object-rest-spread@7.8.3", "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" - integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== +"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3", "@babel/plugin-syntax-object-rest-spread@7.8.3": + "integrity" "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz" + "version" "7.8.3" dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-optional-catch-binding@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" - integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== + "integrity" "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz" + "version" "7.8.3" dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" - integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== + "integrity" "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz" + "version" "7.8.3" dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-private-property-in-object@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" - integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== + "integrity" "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz" + "version" "7.14.5" dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-top-level-await@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" - integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== + "integrity" "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz" + "version" "7.14.5" dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8" - integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A== + "integrity" "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-arrow-functions@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154" - integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ== + "integrity" "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-async-to-generator@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808" - integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg== + "integrity" "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz" + "version" "7.16.8" dependencies: "@babel/helper-module-imports" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-remap-async-to-generator" "^7.16.8" "@babel/plugin-transform-block-scoped-functions@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620" - integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg== + "integrity" "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-block-scoping@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87" - integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ== + "integrity" "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-classes@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00" - integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ== + "integrity" "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-environment-visitor" "^7.16.7" @@ -741,174 +739,174 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-replace-supers" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" - globals "^11.1.0" + "globals" "^11.1.0" "@babel/plugin-transform-computed-properties@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470" - integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw== + "integrity" "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-destructuring@^7.16.7": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz#c445f75819641788a27a0a3a759d9df911df6abc" - integrity sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg== + "integrity" "sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz" + "version" "7.17.3" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241" - integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ== + "integrity" "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-duplicate-keys@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9" - integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw== + "integrity" "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-exponentiation-operator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b" - integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA== + "integrity" "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-for-of@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c" - integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg== + "integrity" "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-function-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf" - integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA== + "integrity" "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-compilation-targets" "^7.16.7" "@babel/helper-function-name" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1" - integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ== + "integrity" "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-member-expression-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384" - integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw== + "integrity" "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-modules-amd@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186" - integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g== + "integrity" "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-module-transforms" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" - babel-plugin-dynamic-import-node "^2.3.3" + "babel-plugin-dynamic-import-node" "^2.3.3" "@babel/plugin-transform-modules-commonjs@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe" - integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA== + "integrity" "sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz" + "version" "7.16.8" dependencies: "@babel/helper-module-transforms" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-simple-access" "^7.16.7" - babel-plugin-dynamic-import-node "^2.3.3" + "babel-plugin-dynamic-import-node" "^2.3.3" "@babel/plugin-transform-modules-systemjs@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7" - integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw== + "integrity" "sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-hoist-variables" "^7.16.7" "@babel/helper-module-transforms" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-validator-identifier" "^7.16.7" - babel-plugin-dynamic-import-node "^2.3.3" + "babel-plugin-dynamic-import-node" "^2.3.3" "@babel/plugin-transform-modules-umd@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618" - integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ== + "integrity" "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-module-transforms" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-named-capturing-groups-regex@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252" - integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw== + "integrity" "sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz" + "version" "7.16.8" dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/plugin-transform-new-target@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244" - integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg== + "integrity" "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-object-super@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94" - integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw== + "integrity" "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-replace-supers" "^7.16.7" "@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f" - integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw== + "integrity" "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-property-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55" - integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw== + "integrity" "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-react-constant-elements@^7.14.5": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.16.7.tgz#19e9e4c2df2f6c3e6b3aea11778297d81db8df62" - integrity sha512-lF+cfsyTgwWkcw715J88JhMYJ5GpysYNLhLP1PkvkhTRN7B3e74R/1KsDxFxhRpSn0UUD3IWM4GvdBR2PEbbQQ== + "integrity" "sha512-lF+cfsyTgwWkcw715J88JhMYJ5GpysYNLhLP1PkvkhTRN7B3e74R/1KsDxFxhRpSn0UUD3IWM4GvdBR2PEbbQQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-react-display-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz#7b6d40d232f4c0f550ea348593db3b21e2404340" - integrity sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg== + "integrity" "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-react-jsx-development@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz#43a00724a3ed2557ed3f276a01a929e6686ac7b8" - integrity sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A== + "integrity" "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/plugin-transform-react-jsx" "^7.16.7" "@babel/plugin-transform-react-jsx@^7.16.7": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz#eac1565da176ccb1a715dae0b4609858808008c1" - integrity sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ== + "integrity" "sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz" + "version" "7.17.3" dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-module-imports" "^7.16.7" @@ -917,103 +915,103 @@ "@babel/types" "^7.17.0" "@babel/plugin-transform-react-pure-annotations@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz#232bfd2f12eb551d6d7d01d13fe3f86b45eb9c67" - integrity sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA== + "integrity" "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-regenerator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb" - integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q== + "integrity" "sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz" + "version" "7.16.7" dependencies: - regenerator-transform "^0.14.2" + "regenerator-transform" "^0.14.2" "@babel/plugin-transform-reserved-words@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586" - integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg== + "integrity" "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-runtime@^7.16.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz#0a2e08b5e2b2d95c4b1d3b3371a2180617455b70" - integrity sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A== + "integrity" "sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz" + "version" "7.17.0" dependencies: "@babel/helper-module-imports" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" - babel-plugin-polyfill-corejs2 "^0.3.0" - babel-plugin-polyfill-corejs3 "^0.5.0" - babel-plugin-polyfill-regenerator "^0.3.0" - semver "^6.3.0" + "babel-plugin-polyfill-corejs2" "^0.3.0" + "babel-plugin-polyfill-corejs3" "^0.5.0" + "babel-plugin-polyfill-regenerator" "^0.3.0" + "semver" "^6.3.0" "@babel/plugin-transform-shorthand-properties@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a" - integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg== + "integrity" "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-spread@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44" - integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg== + "integrity" "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-transform-sticky-regex@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660" - integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw== + "integrity" "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-template-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab" - integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA== + "integrity" "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-typeof-symbol@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e" - integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ== + "integrity" "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-typescript@^7.16.7": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0" - integrity sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ== + "integrity" "sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz" + "version" "7.16.8" dependencies: "@babel/helper-create-class-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-typescript" "^7.16.7" "@babel/plugin-transform-unicode-escapes@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3" - integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q== + "integrity" "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-unicode-regex@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2" - integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q== + "integrity" "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/preset-env@^7.15.6", "@babel/preset-env@^7.16.4": - version "7.16.11" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982" - integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g== + "integrity" "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==" + "resolved" "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz" + "version" "7.16.11" dependencies: "@babel/compat-data" "^7.16.8" "@babel/helper-compilation-targets" "^7.16.7" @@ -1084,27 +1082,27 @@ "@babel/plugin-transform-unicode-regex" "^7.16.7" "@babel/preset-modules" "^0.1.5" "@babel/types" "^7.16.8" - babel-plugin-polyfill-corejs2 "^0.3.0" - babel-plugin-polyfill-corejs3 "^0.5.0" - babel-plugin-polyfill-regenerator "^0.3.0" - core-js-compat "^3.20.2" - semver "^6.3.0" + "babel-plugin-polyfill-corejs2" "^0.3.0" + "babel-plugin-polyfill-corejs3" "^0.5.0" + "babel-plugin-polyfill-regenerator" "^0.3.0" + "core-js-compat" "^3.20.2" + "semver" "^6.3.0" "@babel/preset-modules@^0.1.5": - version "0.1.5" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" - integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA== + "integrity" "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==" + "resolved" "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz" + "version" "0.1.5" dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" "@babel/plugin-transform-dotall-regex" "^7.4.4" "@babel/types" "^7.4.4" - esutils "^2.0.2" + "esutils" "^2.0.2" "@babel/preset-react@^7.14.5", "@babel/preset-react@^7.16.0": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.7.tgz#4c18150491edc69c183ff818f9f2aecbe5d93852" - integrity sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA== + "integrity" "sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==" + "resolved" "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-validator-option" "^7.16.7" @@ -1114,81 +1112,82 @@ "@babel/plugin-transform-react-pure-annotations" "^7.16.7" "@babel/preset-typescript@^7.15.0", "@babel/preset-typescript@^7.16.0": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz#ab114d68bb2020afc069cd51b37ff98a046a70b9" - integrity sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ== + "integrity" "sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ==" + "resolved" "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-validator-option" "^7.16.7" "@babel/plugin-transform-typescript" "^7.16.7" "@babel/runtime-corejs3@^7.16.3": - version "7.17.2" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.2.tgz#fdca2cd05fba63388babe85d349b6801b008fd13" - integrity sha512-NcKtr2epxfIrNM4VOmPKO46TvDMCBhgi2CrSHaEarrz+Plk2K5r9QemmOFTGpZaoKnWoGH5MO+CzeRsih/Fcgg== + "integrity" "sha512-NcKtr2epxfIrNM4VOmPKO46TvDMCBhgi2CrSHaEarrz+Plk2K5r9QemmOFTGpZaoKnWoGH5MO+CzeRsih/Fcgg==" + "resolved" "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.17.2.tgz" + "version" "7.17.2" dependencies: - core-js-pure "^3.20.2" - regenerator-runtime "^0.13.4" + "core-js-pure" "^3.20.2" + "regenerator-runtime" "^0.13.4" "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.16.3", "@babel/runtime@^7.8.4": - version "7.17.2" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941" - integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw== + "integrity" "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==" + "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz" + "version" "7.17.2" dependencies: - regenerator-runtime "^0.13.4" + "regenerator-runtime" "^0.13.4" -"@babel/template@^7.12.7", "@babel/template@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" - integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== +"@babel/template@^7.12.7", "@babel/template@^7.16.7", "@babel/template@^7.20.7": + "integrity" "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==" + "resolved" "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz" + "version" "7.20.7" dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/parser" "^7.16.7" - "@babel/types" "^7.16.7" + "@babel/code-frame" "^7.18.6" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" -"@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.3", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" - integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== +"@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.3", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.3": + "integrity" "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==" + "resolved" "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz" + "version" "7.21.3" dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.3" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.3" - "@babel/types" "^7.17.0" - debug "^4.1.0" - globals "^11.1.0" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.21.3" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.21.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.21.3" + "@babel/types" "^7.21.3" + "debug" "^4.1.0" + "globals" "^11.1.0" -"@babel/types@^7.12.7", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" - integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== +"@babel/types@^7.12.7", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.3", "@babel/types@^7.4.4": + "integrity" "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==" + "resolved" "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz" + "version" "7.21.3" dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - to-fast-properties "^2.0.0" + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" + "to-fast-properties" "^2.0.0" "@docsearch/css@3.0.0-alpha.50": - version "3.0.0-alpha.50" - resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.0.0-alpha.50.tgz#794c6a8d301840a49b55f5b331c7be84b9723643" - integrity sha512-QeWFCQOtS9D+Fi20liKsPXF2j/xWKh52e+P2Z1UATIdPMqmH6zoB2lcUz+cgv6PPVgWUtECeR6VSSUm71LT94w== + "integrity" "sha512-QeWFCQOtS9D+Fi20liKsPXF2j/xWKh52e+P2Z1UATIdPMqmH6zoB2lcUz+cgv6PPVgWUtECeR6VSSUm71LT94w==" + "resolved" "https://registry.npmjs.org/@docsearch/css/-/css-3.0.0-alpha.50.tgz" + "version" "3.0.0-alpha.50" "@docsearch/react@^3.0.0-alpha.39": - version "3.0.0-alpha.50" - resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.0.0-alpha.50.tgz#a7dc547836c2b221fd3aa8eb87bfb47a579ef141" - integrity sha512-oDGV1zZCRYv7MWsh6CyQVthYTRc3b4q+6kKwNYb1/g/Wf/4nJHutpxolFLHdEUDhrJ4Xi8wxwQG+lEwAVBTHPg== + "integrity" "sha512-oDGV1zZCRYv7MWsh6CyQVthYTRc3b4q+6kKwNYb1/g/Wf/4nJHutpxolFLHdEUDhrJ4Xi8wxwQG+lEwAVBTHPg==" + "resolved" "https://registry.npmjs.org/@docsearch/react/-/react-3.0.0-alpha.50.tgz" + "version" "3.0.0-alpha.50" dependencies: "@algolia/autocomplete-core" "1.5.2" "@algolia/autocomplete-preset-algolia" "1.5.2" "@docsearch/css" "3.0.0-alpha.50" - algoliasearch "^4.0.0" + "algoliasearch" "^4.0.0" "@docusaurus/core@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-2.0.0-beta.15.tgz#1a3f8361803767072e56c77d60332c87e59f1ad0" - integrity sha512-zXhhD0fApMSvq/9Pkm9DQxa//hGOXVCq9yMHiXOkI5D1tLec7PxtnaC5cLfGHljkN9cKIfRDYUVcG1gHymVfpA== + "integrity" "sha512-zXhhD0fApMSvq/9Pkm9DQxa//hGOXVCq9yMHiXOkI5D1tLec7PxtnaC5cLfGHljkN9cKIfRDYUVcG1gHymVfpA==" + "resolved" "https://registry.npmjs.org/@docusaurus/core/-/core-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@babel/core" "^7.16.0" "@babel/generator" "^7.16.0" @@ -1209,103 +1208,103 @@ "@docusaurus/utils-validation" "2.0.0-beta.15" "@slorber/static-site-generator-webpack-plugin" "^4.0.0" "@svgr/webpack" "^6.0.0" - autoprefixer "^10.3.5" - babel-loader "^8.2.2" - babel-plugin-dynamic-import-node "2.3.0" - boxen "^5.0.1" - chokidar "^3.5.2" - clean-css "^5.1.5" - commander "^5.1.0" - copy-webpack-plugin "^10.2.0" - core-js "^3.18.0" - css-loader "^6.5.1" - css-minimizer-webpack-plugin "^3.3.1" - cssnano "^5.0.8" - del "^6.0.0" - detect-port "^1.3.0" - escape-html "^1.0.3" - eta "^1.12.3" - file-loader "^6.2.0" - fs-extra "^10.0.0" - html-minifier-terser "^6.0.2" - html-tags "^3.1.0" - html-webpack-plugin "^5.4.0" - import-fresh "^3.3.0" - is-root "^2.1.0" - leven "^3.1.0" - lodash "^4.17.20" - mini-css-extract-plugin "^1.6.0" - nprogress "^0.2.0" - postcss "^8.3.7" - postcss-loader "^6.1.1" - prompts "^2.4.1" - react-dev-utils "^12.0.0" - react-helmet "^6.1.0" - react-loadable "npm:@docusaurus/react-loadable@5.5.2" - react-loadable-ssr-addon-v5-slorber "^1.0.1" - react-router "^5.2.0" - react-router-config "^5.1.1" - react-router-dom "^5.2.0" - remark-admonitions "^1.2.1" - rtl-detect "^1.0.4" - semver "^7.3.4" - serve-handler "^6.1.3" - shelljs "^0.8.4" - strip-ansi "^6.0.0" - terser-webpack-plugin "^5.2.4" - tslib "^2.3.1" - update-notifier "^5.1.0" - url-loader "^4.1.1" - wait-on "^6.0.0" - webpack "^5.61.0" - webpack-bundle-analyzer "^4.4.2" - webpack-dev-server "^4.7.1" - webpack-merge "^5.8.0" - webpackbar "^5.0.2" + "autoprefixer" "^10.3.5" + "babel-loader" "^8.2.2" + "babel-plugin-dynamic-import-node" "2.3.0" + "boxen" "^5.0.1" + "chokidar" "^3.5.2" + "clean-css" "^5.1.5" + "commander" "^5.1.0" + "copy-webpack-plugin" "^10.2.0" + "core-js" "^3.18.0" + "css-loader" "^6.5.1" + "css-minimizer-webpack-plugin" "^3.3.1" + "cssnano" "^5.0.8" + "del" "^6.0.0" + "detect-port" "^1.3.0" + "escape-html" "^1.0.3" + "eta" "^1.12.3" + "file-loader" "^6.2.0" + "fs-extra" "^10.0.0" + "html-minifier-terser" "^6.0.2" + "html-tags" "^3.1.0" + "html-webpack-plugin" "^5.4.0" + "import-fresh" "^3.3.0" + "is-root" "^2.1.0" + "leven" "^3.1.0" + "lodash" "^4.17.20" + "mini-css-extract-plugin" "^1.6.0" + "nprogress" "^0.2.0" + "postcss" "^8.3.7" + "postcss-loader" "^6.1.1" + "prompts" "^2.4.1" + "react-dev-utils" "^12.0.0" + "react-helmet" "^6.1.0" + "react-loadable" "npm:@docusaurus/react-loadable@5.5.2" + "react-loadable-ssr-addon-v5-slorber" "^1.0.1" + "react-router" "^5.2.0" + "react-router-config" "^5.1.1" + "react-router-dom" "^5.2.0" + "remark-admonitions" "^1.2.1" + "rtl-detect" "^1.0.4" + "semver" "^7.3.4" + "serve-handler" "^6.1.3" + "shelljs" "^0.8.4" + "strip-ansi" "^6.0.0" + "terser-webpack-plugin" "^5.2.4" + "tslib" "^2.3.1" + "update-notifier" "^5.1.0" + "url-loader" "^4.1.1" + "wait-on" "^6.0.0" + "webpack" "^5.61.0" + "webpack-bundle-analyzer" "^4.4.2" + "webpack-dev-server" "^4.7.1" + "webpack-merge" "^5.8.0" + "webpackbar" "^5.0.2" "@docusaurus/cssnano-preset@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.15.tgz#033c52815c428f0f66c87eaff93ea12554ea89df" - integrity sha512-55aYURbB5dqrx64lStNcZxDx5R6bKkAawlCB7mDKx3r+Qnp3ofGW7UExLQSCbTu3axT1vJCF5D7H6ljTRYJLtA== + "integrity" "sha512-55aYURbB5dqrx64lStNcZxDx5R6bKkAawlCB7mDKx3r+Qnp3ofGW7UExLQSCbTu3axT1vJCF5D7H6ljTRYJLtA==" + "resolved" "https://registry.npmjs.org/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: - cssnano-preset-advanced "^5.1.4" - postcss "^8.3.7" - postcss-sort-media-queries "^4.1.0" + "cssnano-preset-advanced" "^5.1.4" + "postcss" "^8.3.7" + "postcss-sort-media-queries" "^4.1.0" "@docusaurus/logger@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.0.0-beta.15.tgz#6d17a05fb292d15fdc43b5fa90fd2a49ad5d40ce" - integrity sha512-5bDSHCyLfMtz6QnFfICdL5mgxbGfC7DW1V+/Q17nRdpZSPZgsNKK/Esp0zdDi1oxAyEpXMXx64nLaHL7joJxIg== + "integrity" "sha512-5bDSHCyLfMtz6QnFfICdL5mgxbGfC7DW1V+/Q17nRdpZSPZgsNKK/Esp0zdDi1oxAyEpXMXx64nLaHL7joJxIg==" + "resolved" "https://registry.npmjs.org/@docusaurus/logger/-/logger-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: - chalk "^4.1.2" - tslib "^2.3.1" + "chalk" "^4.1.2" + "tslib" "^2.3.1" "@docusaurus/mdx-loader@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.15.tgz#da23745bc73c93338dd330dad6bbc9d9fe325553" - integrity sha512-MVpytjDDao7hmPF1QSs9B5zoTgevZjiqjnX3FM1yjqdCv+chyUo0gnmYHjeG/4Gqu7jucp+dDdp6yQpzs4g09A== + "integrity" "sha512-MVpytjDDao7hmPF1QSs9B5zoTgevZjiqjnX3FM1yjqdCv+chyUo0gnmYHjeG/4Gqu7jucp+dDdp6yQpzs4g09A==" + "resolved" "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@babel/parser" "^7.16.4" "@babel/traverse" "^7.16.3" "@docusaurus/logger" "2.0.0-beta.15" "@docusaurus/utils" "2.0.0-beta.15" "@mdx-js/mdx" "^1.6.21" - escape-html "^1.0.3" - file-loader "^6.2.0" - fs-extra "^10.0.0" - image-size "^1.0.1" - mdast-util-to-string "^2.0.0" - remark-emoji "^2.1.0" - stringify-object "^3.3.0" - tslib "^2.3.1" - unist-util-visit "^2.0.2" - url-loader "^4.1.1" - webpack "^5.61.0" + "escape-html" "^1.0.3" + "file-loader" "^6.2.0" + "fs-extra" "^10.0.0" + "image-size" "^1.0.1" + "mdast-util-to-string" "^2.0.0" + "remark-emoji" "^2.1.0" + "stringify-object" "^3.3.0" + "tslib" "^2.3.1" + "unist-util-visit" "^2.0.2" + "url-loader" "^4.1.1" + "webpack" "^5.61.0" "@docusaurus/plugin-content-blog@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-beta.15.tgz#6d4bf532ad3dedb4f9fd6398b0fbe481af5b77a9" - integrity sha512-VtEwkgkoNIS8JFPe+huBeBuJ8HG8Lq1JNYM/ItwQg/cwGAgP8EgwbEuKDn428oZKEI2PpgAuf5Gv4AzJWIes9A== + "integrity" "sha512-VtEwkgkoNIS8JFPe+huBeBuJ8HG8Lq1JNYM/ItwQg/cwGAgP8EgwbEuKDn428oZKEI2PpgAuf5Gv4AzJWIes9A==" + "resolved" "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/logger" "2.0.0-beta.15" @@ -1313,98 +1312,98 @@ "@docusaurus/utils" "2.0.0-beta.15" "@docusaurus/utils-common" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" - cheerio "^1.0.0-rc.10" - feed "^4.2.2" - fs-extra "^10.0.0" - lodash "^4.17.20" - reading-time "^1.5.0" - remark-admonitions "^1.2.1" - tslib "^2.3.1" - utility-types "^3.10.0" - webpack "^5.61.0" + "cheerio" "^1.0.0-rc.10" + "feed" "^4.2.2" + "fs-extra" "^10.0.0" + "lodash" "^4.17.20" + "reading-time" "^1.5.0" + "remark-admonitions" "^1.2.1" + "tslib" "^2.3.1" + "utility-types" "^3.10.0" + "webpack" "^5.61.0" "@docusaurus/plugin-content-docs@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-beta.15.tgz#9486bba8abd2a6284e749718bf56743d8e4446f1" - integrity sha512-HSwNZdUKz4rpJiGbFjl/OFhSleeZUSZ6E6lk98i4iL1A5u6fIm4CHsT53yp4UUOse+lFrePTFZsyqwMA4nZZYA== + "integrity" "sha512-HSwNZdUKz4rpJiGbFjl/OFhSleeZUSZ6E6lk98i4iL1A5u6fIm4CHsT53yp4UUOse+lFrePTFZsyqwMA4nZZYA==" + "resolved" "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/logger" "2.0.0-beta.15" "@docusaurus/mdx-loader" "2.0.0-beta.15" "@docusaurus/utils" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" - combine-promises "^1.1.0" - fs-extra "^10.0.0" - import-fresh "^3.2.2" - js-yaml "^4.0.0" - lodash "^4.17.20" - remark-admonitions "^1.2.1" - shelljs "^0.8.4" - tslib "^2.3.1" - utility-types "^3.10.0" - webpack "^5.61.0" + "combine-promises" "^1.1.0" + "fs-extra" "^10.0.0" + "import-fresh" "^3.2.2" + "js-yaml" "^4.0.0" + "lodash" "^4.17.20" + "remark-admonitions" "^1.2.1" + "shelljs" "^0.8.4" + "tslib" "^2.3.1" + "utility-types" "^3.10.0" + "webpack" "^5.61.0" "@docusaurus/plugin-content-pages@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-beta.15.tgz#e488f7dcdd45cd1d46e8c2c5ff5275327a6a3c65" - integrity sha512-N7YhW5RiOY6J228z4lOoP//qX0Q48cRtxDONZ/Ohd9C5OI2vS6TD8iQuDqOIYHxH+BshjNSsKvbJ+SMIQDwysg== + "integrity" "sha512-N7YhW5RiOY6J228z4lOoP//qX0Q48cRtxDONZ/Ohd9C5OI2vS6TD8iQuDqOIYHxH+BshjNSsKvbJ+SMIQDwysg==" + "resolved" "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/mdx-loader" "2.0.0-beta.15" "@docusaurus/utils" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" - fs-extra "^10.0.0" - globby "^11.0.2" - remark-admonitions "^1.2.1" - tslib "^2.3.1" - webpack "^5.61.0" + "fs-extra" "^10.0.0" + "globby" "^11.0.2" + "remark-admonitions" "^1.2.1" + "tslib" "^2.3.1" + "webpack" "^5.61.0" "@docusaurus/plugin-debug@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-beta.15.tgz#b75d706d4f9fc4146f84015097bd837d1afb7c6b" - integrity sha512-Jth11jB/rVqPwCGdkVKSUWeXZPAr/NyPn+yeknTBk2LgQKBJ3YU5dNG0uyt0Ay+UYT01TkousPJkXhLuy4Qrsw== + "integrity" "sha512-Jth11jB/rVqPwCGdkVKSUWeXZPAr/NyPn+yeknTBk2LgQKBJ3YU5dNG0uyt0Ay+UYT01TkousPJkXhLuy4Qrsw==" + "resolved" "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/utils" "2.0.0-beta.15" - fs-extra "^10.0.0" - react-json-view "^1.21.3" - tslib "^2.3.1" + "fs-extra" "^10.0.0" + "react-json-view" "^1.21.3" + "tslib" "^2.3.1" "@docusaurus/plugin-google-analytics@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-beta.15.tgz#6ffebe76d9caac5383cfb78d2baa5883c9c2df6c" - integrity sha512-ELAnxNYiC2i7gfu/ViurNIdm1/DdnbEfVDmpffS9niQhOREM1U3jpxkz/ff1GIC6heOLyHTtini/CZBDoroVGw== + "integrity" "sha512-ELAnxNYiC2i7gfu/ViurNIdm1/DdnbEfVDmpffS9niQhOREM1U3jpxkz/ff1GIC6heOLyHTtini/CZBDoroVGw==" + "resolved" "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" - tslib "^2.3.1" + "tslib" "^2.3.1" "@docusaurus/plugin-google-gtag@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-beta.15.tgz#4db3330d302653e8541dc3cb86a4dbfef0cc96f8" - integrity sha512-E5Rm3+dN7i3A9V5uq5sl9xTNA3aXsLwTZEA2SpOkY571dCpd+sfVvz1lR+KRY9Fy6ZHk8PqrNImgCWfIerRuZQ== + "integrity" "sha512-E5Rm3+dN7i3A9V5uq5sl9xTNA3aXsLwTZEA2SpOkY571dCpd+sfVvz1lR+KRY9Fy6ZHk8PqrNImgCWfIerRuZQ==" + "resolved" "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" - tslib "^2.3.1" + "tslib" "^2.3.1" "@docusaurus/plugin-sitemap@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-beta.15.tgz#0cc083d9e76041897e81b4b82bcd0ccbfa65d6e5" - integrity sha512-PBjeQb2Qpe4uPdRefWL/eXCeYjrgNB/UArExYeUuP4wiY1dpw2unGNCvFUxv4hzJGmARoTLsnRkeYkUim809LQ== + "integrity" "sha512-PBjeQb2Qpe4uPdRefWL/eXCeYjrgNB/UArExYeUuP4wiY1dpw2unGNCvFUxv4hzJGmARoTLsnRkeYkUim809LQ==" + "resolved" "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/utils" "2.0.0-beta.15" "@docusaurus/utils-common" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" - fs-extra "^10.0.0" - sitemap "^7.0.0" - tslib "^2.3.1" + "fs-extra" "^10.0.0" + "sitemap" "^7.0.0" + "tslib" "^2.3.1" "@docusaurus/preset-classic@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-2.0.0-beta.15.tgz#13d2f3c4fa7c055af35541ae5e93453450efb208" - integrity sha512-3NZIXWTAzk+kOgiB8uAbD+FZv3VFR1qkU6+TW24DRenjRnXof3CkRuldhI1QI0hILm1fuJ319QRkakV8FFtXyA== + "integrity" "sha512-3NZIXWTAzk+kOgiB8uAbD+FZv3VFR1qkU6+TW24DRenjRnXof3CkRuldhI1QI0hILm1fuJ319QRkakV8FFtXyA==" + "resolved" "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/plugin-content-blog" "2.0.0-beta.15" @@ -1418,18 +1417,18 @@ "@docusaurus/theme-common" "2.0.0-beta.15" "@docusaurus/theme-search-algolia" "2.0.0-beta.15" -"@docusaurus/react-loadable@5.5.2", "react-loadable@npm:@docusaurus/react-loadable@5.5.2": - version "5.5.2" - resolved "https://registry.yarnpkg.com/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz#81aae0db81ecafbdaee3651f12804580868fa6ce" - integrity sha512-A3dYjdBGuy0IGT+wyLIGIKLRE+sAk1iNk0f1HjNDysO7u8lhL4N3VEm+FAubmJbAztn94F7MxBTPmnixbiyFdQ== +"@docusaurus/react-loadable@5.5.2": + "integrity" "sha512-A3dYjdBGuy0IGT+wyLIGIKLRE+sAk1iNk0f1HjNDysO7u8lhL4N3VEm+FAubmJbAztn94F7MxBTPmnixbiyFdQ==" + "resolved" "https://registry.npmjs.org/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz" + "version" "5.5.2" dependencies: "@types/react" "*" - prop-types "^15.6.2" + "prop-types" "^15.6.2" "@docusaurus/theme-classic@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-2.0.0-beta.15.tgz#35d04232f2d5fcb2007675339b0e6d0e8681be95" - integrity sha512-WwNRcQvMtQ7KDhOEHFKFHxXCdoZwLg66hT3vhqNIFMfGQuPzOP91MX5LUSo1QWHhlrD3H3Og+r7Ik/fy2bf5lQ== + "integrity" "sha512-WwNRcQvMtQ7KDhOEHFKFHxXCdoZwLg66hT3vhqNIFMfGQuPzOP91MX5LUSo1QWHhlrD3H3Og+r7Ik/fy2bf5lQ==" + "resolved" "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/plugin-content-blog" "2.0.0-beta.15" @@ -1441,33 +1440,33 @@ "@docusaurus/utils-common" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" "@mdx-js/react" "^1.6.21" - clsx "^1.1.1" - copy-text-to-clipboard "^3.0.1" - infima "0.2.0-alpha.37" - lodash "^4.17.20" - postcss "^8.3.7" - prism-react-renderer "^1.2.1" - prismjs "^1.23.0" - react-router-dom "^5.2.0" - rtlcss "^3.3.0" + "clsx" "^1.1.1" + "copy-text-to-clipboard" "^3.0.1" + "infima" "0.2.0-alpha.37" + "lodash" "^4.17.20" + "postcss" "^8.3.7" + "prism-react-renderer" "^1.2.1" + "prismjs" "^1.23.0" + "react-router-dom" "^5.2.0" + "rtlcss" "^3.3.0" "@docusaurus/theme-common@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-2.0.0-beta.15.tgz#5bd338d483e2c19d6d74d133572988241518398a" - integrity sha512-+pvarmzcyECE4nWxw+dCMKRIoes0NegrRuM9+nRsUrS/E5ywsF539kpupKIEqaMjq6AuM0CJtDoHxHHPNe0KaQ== + "integrity" "sha512-+pvarmzcyECE4nWxw+dCMKRIoes0NegrRuM9+nRsUrS/E5ywsF539kpupKIEqaMjq6AuM0CJtDoHxHHPNe0KaQ==" + "resolved" "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/plugin-content-blog" "2.0.0-beta.15" "@docusaurus/plugin-content-docs" "2.0.0-beta.15" "@docusaurus/plugin-content-pages" "2.0.0-beta.15" - clsx "^1.1.1" - parse-numeric-range "^1.3.0" - tslib "^2.3.1" - utility-types "^3.10.0" + "clsx" "^1.1.1" + "parse-numeric-range" "^1.3.0" + "tslib" "^2.3.1" + "utility-types" "^3.10.0" "@docusaurus/theme-search-algolia@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-beta.15.tgz#c3ad7fd8e27fcb3e072990031c08768c602cb9a4" - integrity sha512-XrrQKyjOPzmEuOcdsaAn1tzNJkNMA3PC86PwPZUaah0cYPpBGptcJYDlIW4VHIrCBfkQvhvmg/B3qKF6bMMi8g== + "integrity" "sha512-XrrQKyjOPzmEuOcdsaAn1tzNJkNMA3PC86PwPZUaah0cYPpBGptcJYDlIW4VHIrCBfkQvhvmg/B3qKF6bMMi8g==" + "resolved" "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docsearch/react" "^3.0.0-alpha.39" "@docusaurus/core" "2.0.0-beta.15" @@ -1476,268 +1475,268 @@ "@docusaurus/theme-translations" "2.0.0-beta.15" "@docusaurus/utils" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" - algoliasearch "^4.10.5" - algoliasearch-helper "^3.5.5" - clsx "^1.1.1" - eta "^1.12.3" - lodash "^4.17.20" - tslib "^2.3.1" - utility-types "^3.10.0" + "algoliasearch" "^4.10.5" + "algoliasearch-helper" "^3.5.5" + "clsx" "^1.1.1" + "eta" "^1.12.3" + "lodash" "^4.17.20" + "tslib" "^2.3.1" + "utility-types" "^3.10.0" "@docusaurus/theme-translations@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-2.0.0-beta.15.tgz#658397ab4c0d7784043e3cec52cef7ae09d2fb59" - integrity sha512-Lu2JDsnZaB2BcJe8Hpq5nrbS7+7bd09jT08b9vztQyvzR8PgzsthnzlLN4ilOeamRIuYJKo1pUGm0EsQBOP6Nw== + "integrity" "sha512-Lu2JDsnZaB2BcJe8Hpq5nrbS7+7bd09jT08b9vztQyvzR8PgzsthnzlLN4ilOeamRIuYJKo1pUGm0EsQBOP6Nw==" + "resolved" "https://registry.npmjs.org/@docusaurus/theme-translations/-/theme-translations-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: - fs-extra "^10.0.0" - tslib "^2.3.1" + "fs-extra" "^10.0.0" + "tslib" "^2.3.1" "@docusaurus/utils-common@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-2.0.0-beta.15.tgz#5549b329fc750bd5e9f24952c9e3ff7cf1f63e08" - integrity sha512-kIGlSIvbE/oniUpUjI8GOkSpH8o4NXbYqAh9dqPn+TJ0KbEFY3fc80gzZQU+9SunCwJMJbIxIGevX9Ry+nackw== + "integrity" "sha512-kIGlSIvbE/oniUpUjI8GOkSpH8o4NXbYqAh9dqPn+TJ0KbEFY3fc80gzZQU+9SunCwJMJbIxIGevX9Ry+nackw==" + "resolved" "https://registry.npmjs.org/@docusaurus/utils-common/-/utils-common-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: - tslib "^2.3.1" + "tslib" "^2.3.1" "@docusaurus/utils-validation@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.15.tgz#c664bc021194db9254eb45e6b48cb7c2af269041" - integrity sha512-1oOVBCkRrsTXSYrBTsMdnj3a/R56zrx11rjF4xo0+dmm8C01Xw4msFtc3uA7VLX0HQvgHsk8xPzU5GERNdsNpg== + "integrity" "sha512-1oOVBCkRrsTXSYrBTsMdnj3a/R56zrx11rjF4xo0+dmm8C01Xw4msFtc3uA7VLX0HQvgHsk8xPzU5GERNdsNpg==" + "resolved" "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/logger" "2.0.0-beta.15" "@docusaurus/utils" "2.0.0-beta.15" - joi "^17.4.2" - tslib "^2.3.1" + "joi" "^17.4.2" + "tslib" "^2.3.1" "@docusaurus/utils@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.0.0-beta.15.tgz#60868046700d5585cfa6ffc57c5f3fbed00b61fc" - integrity sha512-xkoPmFxCBkDqbZR4U3SE752OcXtWTGgZnc/pZWxItzb1IYRGNZHrzdIr7CnI7rppriuZzsyivDGiC4Ud9MWhkA== + "integrity" "sha512-xkoPmFxCBkDqbZR4U3SE752OcXtWTGgZnc/pZWxItzb1IYRGNZHrzdIr7CnI7rppriuZzsyivDGiC4Ud9MWhkA==" + "resolved" "https://registry.npmjs.org/@docusaurus/utils/-/utils-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/logger" "2.0.0-beta.15" "@mdx-js/runtime" "^1.6.22" "@svgr/webpack" "^6.0.0" - file-loader "^6.2.0" - fs-extra "^10.0.0" - github-slugger "^1.4.0" - globby "^11.0.4" - gray-matter "^4.0.3" - js-yaml "^4.0.0" - lodash "^4.17.20" - micromatch "^4.0.4" - remark-mdx-remove-exports "^1.6.22" - remark-mdx-remove-imports "^1.6.22" - resolve-pathname "^3.0.0" - tslib "^2.3.1" - url-loader "^4.1.1" + "file-loader" "^6.2.0" + "fs-extra" "^10.0.0" + "github-slugger" "^1.4.0" + "globby" "^11.0.4" + "gray-matter" "^4.0.3" + "js-yaml" "^4.0.0" + "lodash" "^4.17.20" + "micromatch" "^4.0.4" + "remark-mdx-remove-exports" "^1.6.22" + "remark-mdx-remove-imports" "^1.6.22" + "resolve-pathname" "^3.0.0" + "tslib" "^2.3.1" + "url-loader" "^4.1.1" "@hapi/hoek@^9.0.0": - version "9.2.1" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" - integrity sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw== + "integrity" "sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw==" + "resolved" "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.1.tgz" + "version" "9.2.1" "@hapi/topo@^5.0.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012" - integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg== + "integrity" "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==" + "resolved" "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz" + "version" "5.1.0" dependencies: "@hapi/hoek" "^9.0.0" -"@jridgewell/gen-mapping@^0.3.0": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" - integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== +"@jridgewell/gen-mapping@^0.1.0": + "integrity" "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==" + "resolved" "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz" + "version" "0.1.1" + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": + "integrity" "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==" + "resolved" "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz" + "version" "0.3.2" dependencies: "@jridgewell/set-array" "^1.0.1" "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/resolve-uri@^3.0.3": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" - integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== +"@jridgewell/resolve-uri@3.1.0": + "integrity" "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==" + "resolved" "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz" + "version" "3.1.0" -"@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== +"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": + "integrity" "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==" + "resolved" "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz" + "version" "1.1.2" "@jridgewell/source-map@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" - integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== + "integrity" "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==" + "resolved" "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz" + "version" "0.3.2" dependencies: "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.14" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" - integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@1.4.14": + "integrity" "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" + "resolved" "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz" + "version" "1.4.14" -"@jridgewell/trace-mapping@^0.3.0": - version "0.3.4" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3" - integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ== +"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": + "integrity" "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==" + "resolved" "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz" + "version" "0.3.17" dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/resolve-uri" "3.1.0" + "@jridgewell/sourcemap-codec" "1.4.14" -"@jridgewell/trace-mapping@^0.3.9": - version "0.3.14" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed" - integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@mdx-js/mdx@1.6.22", "@mdx-js/mdx@^1.6.21": - version "1.6.22" - resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" - integrity sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA== +"@mdx-js/mdx@^1.6.21", "@mdx-js/mdx@1.6.22": + "integrity" "sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA==" + "resolved" "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.22.tgz" + "version" "1.6.22" dependencies: "@babel/core" "7.12.9" "@babel/plugin-syntax-jsx" "7.12.1" "@babel/plugin-syntax-object-rest-spread" "7.8.3" "@mdx-js/util" "1.6.22" - babel-plugin-apply-mdx-type-prop "1.6.22" - babel-plugin-extract-import-names "1.6.22" - camelcase-css "2.0.1" - detab "2.0.4" - hast-util-raw "6.0.1" - lodash.uniq "4.5.0" - mdast-util-to-hast "10.0.1" - remark-footnotes "2.0.0" - remark-mdx "1.6.22" - remark-parse "8.0.3" - remark-squeeze-paragraphs "4.0.0" - style-to-object "0.3.0" - unified "9.2.0" - unist-builder "2.0.3" - unist-util-visit "2.0.3" + "babel-plugin-apply-mdx-type-prop" "1.6.22" + "babel-plugin-extract-import-names" "1.6.22" + "camelcase-css" "2.0.1" + "detab" "2.0.4" + "hast-util-raw" "6.0.1" + "lodash.uniq" "4.5.0" + "mdast-util-to-hast" "10.0.1" + "remark-footnotes" "2.0.0" + "remark-mdx" "1.6.22" + "remark-parse" "8.0.3" + "remark-squeeze-paragraphs" "4.0.0" + "style-to-object" "0.3.0" + "unified" "9.2.0" + "unist-builder" "2.0.3" + "unist-util-visit" "2.0.3" -"@mdx-js/react@1.6.22", "@mdx-js/react@^1.6.21": - version "1.6.22" - resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" - integrity sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg== +"@mdx-js/react@^1.6.21", "@mdx-js/react@1.6.22": + "integrity" "sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg==" + "resolved" "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.22.tgz" + "version" "1.6.22" "@mdx-js/runtime@^1.6.22": - version "1.6.22" - resolved "https://registry.yarnpkg.com/@mdx-js/runtime/-/runtime-1.6.22.tgz#3edd388bf68a519ffa1aaf9c446b548165102345" - integrity sha512-p17spaO2+55VLCuxXA3LVHC4phRx60NR2XMdZ+qgVU1lKvEX4y88dmFNOzGDCPLJ03IZyKrJ/rPWWRiBrd9JrQ== + "integrity" "sha512-p17spaO2+55VLCuxXA3LVHC4phRx60NR2XMdZ+qgVU1lKvEX4y88dmFNOzGDCPLJ03IZyKrJ/rPWWRiBrd9JrQ==" + "resolved" "https://registry.npmjs.org/@mdx-js/runtime/-/runtime-1.6.22.tgz" + "version" "1.6.22" dependencies: "@mdx-js/mdx" "1.6.22" "@mdx-js/react" "1.6.22" - buble-jsx-only "^0.19.8" + "buble-jsx-only" "^0.19.8" "@mdx-js/util@1.6.22": - version "1.6.22" - resolved "https://registry.yarnpkg.com/@mdx-js/util/-/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" - integrity sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA== + "integrity" "sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==" + "resolved" "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.22.tgz" + "version" "1.6.22" "@nodelib/fs.scandir@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" - integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + "integrity" "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==" + "resolved" "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" + "version" "2.1.5" dependencies: "@nodelib/fs.stat" "2.0.5" - run-parallel "^1.1.9" + "run-parallel" "^1.1.9" -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" - integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== +"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5": + "integrity" "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==" + "resolved" "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" + "version" "2.0.5" "@nodelib/fs.walk@^1.2.3": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" - integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + "integrity" "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==" + "resolved" "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz" + "version" "1.2.8" dependencies: "@nodelib/fs.scandir" "2.1.5" - fastq "^1.6.0" + "fastq" "^1.6.0" "@polka/url@^1.0.0-next.20": - version "1.0.0-next.21" - resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" - integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== + "integrity" "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==" + "resolved" "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz" + "version" "1.0.0-next.21" "@sideway/address@^4.1.3": - version "4.1.3" - resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.3.tgz#d93cce5d45c5daec92ad76db492cc2ee3c64ab27" - integrity sha512-8ncEUtmnTsMmL7z1YPB47kPUq7LpKWJNFPsRzHiIajGC5uXlWGn+AmkYPcHNl8S4tcEGx+cnORnNYaw2wvL+LQ== + "integrity" "sha512-8ncEUtmnTsMmL7z1YPB47kPUq7LpKWJNFPsRzHiIajGC5uXlWGn+AmkYPcHNl8S4tcEGx+cnORnNYaw2wvL+LQ==" + "resolved" "https://registry.npmjs.org/@sideway/address/-/address-4.1.3.tgz" + "version" "4.1.3" dependencies: "@hapi/hoek" "^9.0.0" "@sideway/formula@^3.0.0": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f" - integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg== + "integrity" "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==" + "resolved" "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz" + "version" "3.0.1" "@sideway/pinpoint@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df" - integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== + "integrity" "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" + "resolved" "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz" + "version" "2.0.0" "@sindresorhus/is@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" - integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== + "integrity" "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" + "resolved" "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz" + "version" "0.14.0" "@slorber/static-site-generator-webpack-plugin@^4.0.0": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.1.tgz#0c8852146441aaa683693deaa5aee2f991d94841" - integrity sha512-PSv4RIVO1Y3kvHxjvqeVisk3E9XFoO04uwYBDWe217MFqKspplYswTuKLiJu0aLORQWzuQjfVsSlLPojwfYsLw== + "integrity" "sha512-PSv4RIVO1Y3kvHxjvqeVisk3E9XFoO04uwYBDWe217MFqKspplYswTuKLiJu0aLORQWzuQjfVsSlLPojwfYsLw==" + "resolved" "https://registry.npmjs.org/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.1.tgz" + "version" "4.0.1" dependencies: - bluebird "^3.7.1" - cheerio "^0.22.0" - eval "^0.1.4" - url "^0.11.0" - webpack-sources "^1.4.3" + "bluebird" "^3.7.1" + "cheerio" "^0.22.0" + "eval" "^0.1.4" + "url" "^0.11.0" + "webpack-sources" "^1.4.3" "@svgr/babel-plugin-add-jsx-attribute@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.0.0.tgz#bd6d1ff32a31b82b601e73672a789cc41e84fe18" - integrity sha512-MdPdhdWLtQsjd29Wa4pABdhWbaRMACdM1h31BY+c6FghTZqNGT7pEYdBoaGeKtdTOBC/XNFQaKVj+r/Ei2ryWA== + "integrity" "sha512-MdPdhdWLtQsjd29Wa4pABdhWbaRMACdM1h31BY+c6FghTZqNGT7pEYdBoaGeKtdTOBC/XNFQaKVj+r/Ei2ryWA==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.0.0.tgz" + "version" "6.0.0" "@svgr/babel-plugin-remove-jsx-attribute@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-6.0.0.tgz#58654908beebfa069681a83332544b17e5237e89" - integrity sha512-aVdtfx9jlaaxc3unA6l+M9YRnKIZjOhQPthLKqmTXC8UVkBLDRGwPKo+r8n3VZN8B34+yVajzPTZ+ptTSuZZCw== + "integrity" "sha512-aVdtfx9jlaaxc3unA6l+M9YRnKIZjOhQPthLKqmTXC8UVkBLDRGwPKo+r8n3VZN8B34+yVajzPTZ+ptTSuZZCw==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-6.0.0.tgz" + "version" "6.0.0" "@svgr/babel-plugin-remove-jsx-empty-expression@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-6.0.0.tgz#d06dd6e8a8f603f92f9979bb9990a1f85a4f57ba" - integrity sha512-Ccj42ApsePD451AZJJf1QzTD1B/BOU392URJTeXFxSK709i0KUsGtbwyiqsKu7vsYxpTM0IA5clAKDyf9RCZyA== + "integrity" "sha512-Ccj42ApsePD451AZJJf1QzTD1B/BOU392URJTeXFxSK709i0KUsGtbwyiqsKu7vsYxpTM0IA5clAKDyf9RCZyA==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-6.0.0.tgz" + "version" "6.0.0" "@svgr/babel-plugin-replace-jsx-attribute-value@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.0.0.tgz#0b85837577b02c31c09c758a12932820f5245cee" - integrity sha512-88V26WGyt1Sfd1emBYmBJRWMmgarrExpKNVmI9vVozha4kqs6FzQJ/Kp5+EYli1apgX44518/0+t9+NU36lThQ== + "integrity" "sha512-88V26WGyt1Sfd1emBYmBJRWMmgarrExpKNVmI9vVozha4kqs6FzQJ/Kp5+EYli1apgX44518/0+t9+NU36lThQ==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.0.0.tgz" + "version" "6.0.0" "@svgr/babel-plugin-svg-dynamic-title@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.0.0.tgz#28236ec26f7ab9d486a487d36ae52d58ba15676f" - integrity sha512-F7YXNLfGze+xv0KMQxrl2vkNbI9kzT9oDK55/kUuymh1ACyXkMV+VZWX1zEhSTfEKh7VkHVZGmVtHg8eTZ6PRg== + "integrity" "sha512-F7YXNLfGze+xv0KMQxrl2vkNbI9kzT9oDK55/kUuymh1ACyXkMV+VZWX1zEhSTfEKh7VkHVZGmVtHg8eTZ6PRg==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.0.0.tgz" + "version" "6.0.0" "@svgr/babel-plugin-svg-em-dimensions@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.0.0.tgz#40267c5dea1b43c4f83a0eb6169e08b43d8bafce" - integrity sha512-+rghFXxdIqJNLQK08kwPBD3Z22/0b2tEZ9lKiL/yTfuyj1wW8HUXu4bo/XkogATIYuXSghVQOOCwURXzHGKyZA== + "integrity" "sha512-+rghFXxdIqJNLQK08kwPBD3Z22/0b2tEZ9lKiL/yTfuyj1wW8HUXu4bo/XkogATIYuXSghVQOOCwURXzHGKyZA==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.0.0.tgz" + "version" "6.0.0" "@svgr/babel-plugin-transform-react-native-svg@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.0.0.tgz#eb688d0a5f539e34d268d8a516e81f5d7fede7c9" - integrity sha512-VaphyHZ+xIKv5v0K0HCzyfAaLhPGJXSk2HkpYfXIOKb7DjLBv0soHDxNv6X0vr2titsxE7klb++u7iOf7TSrFQ== + "integrity" "sha512-VaphyHZ+xIKv5v0K0HCzyfAaLhPGJXSk2HkpYfXIOKb7DjLBv0soHDxNv6X0vr2titsxE7klb++u7iOf7TSrFQ==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.0.0.tgz" + "version" "6.0.0" "@svgr/babel-plugin-transform-svg-component@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.2.0.tgz#7ba61d9fc1fb42b0ba1a04e4630019fa7e993c4f" - integrity sha512-bhYIpsORb++wpsp91fymbFkf09Z/YEKR0DnFjxvN+8JHeCUD2unnh18jIMKnDJTWtvpTaGYPXELVe4OOzFI0xg== + "integrity" "sha512-bhYIpsORb++wpsp91fymbFkf09Z/YEKR0DnFjxvN+8JHeCUD2unnh18jIMKnDJTWtvpTaGYPXELVe4OOzFI0xg==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.2.0.tgz" + "version" "6.2.0" "@svgr/babel-preset@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-6.2.0.tgz#1d3ad8c7664253a4be8e4a0f0e6872f30d8af627" - integrity sha512-4WQNY0J71JIaL03DRn0vLiz87JXx0b9dYm2aA8XHlQJQoixMl4r/soYHm8dsaJZ3jWtkCiOYy48dp9izvXhDkQ== + "integrity" "sha512-4WQNY0J71JIaL03DRn0vLiz87JXx0b9dYm2aA8XHlQJQoixMl4r/soYHm8dsaJZ3jWtkCiOYy48dp9izvXhDkQ==" + "resolved" "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-6.2.0.tgz" + "version" "6.2.0" dependencies: "@svgr/babel-plugin-add-jsx-attribute" "^6.0.0" "@svgr/babel-plugin-remove-jsx-attribute" "^6.0.0" @@ -1748,46 +1747,46 @@ "@svgr/babel-plugin-transform-react-native-svg" "^6.0.0" "@svgr/babel-plugin-transform-svg-component" "^6.2.0" -"@svgr/core@^6.2.1": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@svgr/core/-/core-6.2.1.tgz#195de807a9f27f9e0e0d678e01084b05c54fdf61" - integrity sha512-NWufjGI2WUyrg46mKuySfviEJ6IxHUOm/8a3Ph38VCWSp+83HBraCQrpEM3F3dB6LBs5x8OElS8h3C0oOJaJAA== +"@svgr/core@^6.0.0", "@svgr/core@^6.2.1": + "integrity" "sha512-NWufjGI2WUyrg46mKuySfviEJ6IxHUOm/8a3Ph38VCWSp+83HBraCQrpEM3F3dB6LBs5x8OElS8h3C0oOJaJAA==" + "resolved" "https://registry.npmjs.org/@svgr/core/-/core-6.2.1.tgz" + "version" "6.2.1" dependencies: "@svgr/plugin-jsx" "^6.2.1" - camelcase "^6.2.0" - cosmiconfig "^7.0.1" + "camelcase" "^6.2.0" + "cosmiconfig" "^7.0.1" "@svgr/hast-util-to-babel-ast@^6.2.1": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.2.1.tgz#ae065567b74cbe745afae617053adf9a764bea25" - integrity sha512-pt7MMkQFDlWJVy9ULJ1h+hZBDGFfSCwlBNW1HkLnVi7jUhyEXUaGYWi1x6bM2IXuAR9l265khBT4Av4lPmaNLQ== + "integrity" "sha512-pt7MMkQFDlWJVy9ULJ1h+hZBDGFfSCwlBNW1HkLnVi7jUhyEXUaGYWi1x6bM2IXuAR9l265khBT4Av4lPmaNLQ==" + "resolved" "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.2.1.tgz" + "version" "6.2.1" dependencies: "@babel/types" "^7.15.6" - entities "^3.0.1" + "entities" "^3.0.1" "@svgr/plugin-jsx@^6.2.1": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-6.2.1.tgz#5668f1d2aa18c2f1bb7a1fc9f682d3f9aed263bd" - integrity sha512-u+MpjTsLaKo6r3pHeeSVsh9hmGRag2L7VzApWIaS8imNguqoUwDq/u6U/NDmYs/KAsrmtBjOEaAAPbwNGXXp1g== + "integrity" "sha512-u+MpjTsLaKo6r3pHeeSVsh9hmGRag2L7VzApWIaS8imNguqoUwDq/u6U/NDmYs/KAsrmtBjOEaAAPbwNGXXp1g==" + "resolved" "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-6.2.1.tgz" + "version" "6.2.1" dependencies: "@babel/core" "^7.15.5" "@svgr/babel-preset" "^6.2.0" "@svgr/hast-util-to-babel-ast" "^6.2.1" - svg-parser "^2.0.2" + "svg-parser" "^2.0.2" "@svgr/plugin-svgo@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-6.2.0.tgz#4cbe6a33ccccdcae4e3b63ded64cc1cbe1faf48c" - integrity sha512-oDdMQONKOJEbuKwuy4Np6VdV6qoaLLvoY86hjvQEgU82Vx1MSWRyYms6Sl0f+NtqxLI/rDVufATbP/ev996k3Q== + "integrity" "sha512-oDdMQONKOJEbuKwuy4Np6VdV6qoaLLvoY86hjvQEgU82Vx1MSWRyYms6Sl0f+NtqxLI/rDVufATbP/ev996k3Q==" + "resolved" "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-6.2.0.tgz" + "version" "6.2.0" dependencies: - cosmiconfig "^7.0.1" - deepmerge "^4.2.2" - svgo "^2.5.0" + "cosmiconfig" "^7.0.1" + "deepmerge" "^4.2.2" + "svgo" "^2.5.0" "@svgr/webpack@^6.0.0": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-6.2.1.tgz#ef5d51c1b6be4e7537fb9f76b3f2b2e22b63c58d" - integrity sha512-h09ngMNd13hnePwgXa+Y5CgOjzlCvfWLHg+MBnydEedAnuLRzUHUJmGS3o2OsrhxTOOqEsPOFt5v/f6C5Qulcw== + "integrity" "sha512-h09ngMNd13hnePwgXa+Y5CgOjzlCvfWLHg+MBnydEedAnuLRzUHUJmGS3o2OsrhxTOOqEsPOFt5v/f6C5Qulcw==" + "resolved" "https://registry.npmjs.org/@svgr/webpack/-/webpack-6.2.1.tgz" + "version" "6.2.1" dependencies: "@babel/core" "^7.15.5" "@babel/plugin-transform-react-constant-elements" "^7.14.5" @@ -1799,81 +1798,81 @@ "@svgr/plugin-svgo" "^6.2.0" "@szmarczak/http-timer@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" - integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== + "integrity" "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==" + "resolved" "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz" + "version" "1.1.2" dependencies: - defer-to-connect "^1.0.1" + "defer-to-connect" "^1.0.1" "@trysound/sax@0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" - integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== + "integrity" "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==" + "resolved" "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz" + "version" "0.2.0" "@types/body-parser@*": - version "1.19.2" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" - integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== + "integrity" "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==" + "resolved" "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz" + "version" "1.19.2" dependencies: "@types/connect" "*" "@types/node" "*" "@types/bonjour@^3.5.9": - version "3.5.10" - resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" - integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw== + "integrity" "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==" + "resolved" "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz" + "version" "3.5.10" dependencies: "@types/node" "*" "@types/connect-history-api-fallback@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" - integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw== + "integrity" "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==" + "resolved" "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz" + "version" "1.3.5" dependencies: "@types/express-serve-static-core" "*" "@types/node" "*" "@types/connect@*": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== + "integrity" "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==" + "resolved" "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz" + "version" "3.4.35" dependencies: "@types/node" "*" "@types/eslint-scope@^3.7.3": - version "3.7.3" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224" - integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g== + "integrity" "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==" + "resolved" "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz" + "version" "3.7.3" dependencies: "@types/eslint" "*" "@types/estree" "*" "@types/eslint@*": - version "8.4.1" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304" - integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA== + "integrity" "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==" + "resolved" "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz" + "version" "8.4.1" dependencies: "@types/estree" "*" "@types/json-schema" "*" "@types/estree@*", "@types/estree@^0.0.51": - version "0.0.51" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" - integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== + "integrity" "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==" + "resolved" "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz" + "version" "0.0.51" "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": - version "4.17.28" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" - integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig== + "integrity" "sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==" + "resolved" "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz" + "version" "4.17.28" dependencies: "@types/node" "*" "@types/qs" "*" "@types/range-parser" "*" "@types/express@*", "@types/express@^4.17.13": - version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" - integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== + "integrity" "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==" + "resolved" "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz" + "version" "4.17.13" dependencies: "@types/body-parser" "*" "@types/express-serve-static-core" "^4.17.18" @@ -1881,172 +1880,172 @@ "@types/serve-static" "*" "@types/hast@^2.0.0": - version "2.3.4" - resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz#8aa5ef92c117d20d974a82bdfb6a648b08c0bafc" - integrity sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g== + "integrity" "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==" + "resolved" "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz" + "version" "2.3.4" dependencies: "@types/unist" "*" "@types/html-minifier-terser@^6.0.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35" - integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg== + "integrity" "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==" + "resolved" "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz" + "version" "6.1.0" "@types/http-proxy@^1.17.8": - version "1.17.8" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55" - integrity sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA== + "integrity" "sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==" + "resolved" "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz" + "version" "1.17.8" dependencies: "@types/node" "*" "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" - integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== + "integrity" "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==" + "resolved" "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz" + "version" "7.0.9" "@types/mdast@^3.0.0": - version "3.0.10" - resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" - integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA== + "integrity" "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==" + "resolved" "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz" + "version" "3.0.10" dependencies: "@types/unist" "*" "@types/mime@^1": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" - integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== + "integrity" "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==" + "resolved" "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz" + "version" "1.3.2" "@types/node@*", "@types/node@^17.0.5": - version "17.0.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.18.tgz#3b4fed5cfb58010e3a2be4b6e74615e4847f1074" - integrity sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA== + "integrity" "sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==" + "resolved" "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz" + "version" "17.0.18" "@types/parse-json@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" - integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + "integrity" "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" + "resolved" "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz" + "version" "4.0.0" "@types/parse5@^5.0.0": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109" - integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw== + "integrity" "sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==" + "resolved" "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz" + "version" "5.0.3" "@types/prop-types@*": - version "15.7.4" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" - integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== + "integrity" "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==" + "resolved" "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz" + "version" "15.7.4" "@types/qs@*": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== + "integrity" "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==" + "resolved" "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz" + "version" "6.9.7" "@types/range-parser@*": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" - integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== + "integrity" "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==" + "resolved" "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz" + "version" "1.2.4" -"@types/react@*": - version "17.0.39" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.39.tgz#d0f4cde092502a6db00a1cded6e6bf2abb7633ce" - integrity sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug== +"@types/react@*", "@types/react@>= 16.8.0 < 18.0.0": + "integrity" "sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug==" + "resolved" "https://registry.npmjs.org/@types/react/-/react-17.0.39.tgz" + "version" "17.0.39" dependencies: "@types/prop-types" "*" "@types/scheduler" "*" - csstype "^3.0.2" + "csstype" "^3.0.2" "@types/retry@^0.12.0": - version "0.12.1" - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" - integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g== + "integrity" "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==" + "resolved" "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz" + "version" "0.12.1" "@types/sax@^1.2.1": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/sax/-/sax-1.2.4.tgz#8221affa7f4f3cb21abd22f244cfabfa63e6a69e" - integrity sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw== + "integrity" "sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw==" + "resolved" "https://registry.npmjs.org/@types/sax/-/sax-1.2.4.tgz" + "version" "1.2.4" dependencies: "@types/node" "*" "@types/scheduler@*": - version "0.16.2" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" - integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + "integrity" "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==" + "resolved" "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz" + "version" "0.16.2" "@types/serve-index@^1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" - integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg== + "integrity" "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==" + "resolved" "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz" + "version" "1.9.1" dependencies: "@types/express" "*" "@types/serve-static@*": - version "1.13.10" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" - integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== + "integrity" "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==" + "resolved" "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz" + "version" "1.13.10" dependencies: "@types/mime" "^1" "@types/node" "*" "@types/sockjs@^0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" - integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw== + "integrity" "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==" + "resolved" "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz" + "version" "0.3.33" dependencies: "@types/node" "*" "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" - integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ== + "integrity" "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==" + "resolved" "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz" + "version" "2.0.6" "@types/ws@^8.2.2": - version "8.2.2" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.2.2.tgz#7c5be4decb19500ae6b3d563043cd407bf366c21" - integrity sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg== + "integrity" "sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==" + "resolved" "https://registry.npmjs.org/@types/ws/-/ws-8.2.2.tgz" + "version" "8.2.2" dependencies: "@types/node" "*" "@webassemblyjs/ast@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" - integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== + "integrity" "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/helper-numbers" "1.11.1" "@webassemblyjs/helper-wasm-bytecode" "1.11.1" "@webassemblyjs/floating-point-hex-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" - integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== + "integrity" "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz" + "version" "1.11.1" "@webassemblyjs/helper-api-error@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" - integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== + "integrity" "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz" + "version" "1.11.1" "@webassemblyjs/helper-buffer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" - integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== + "integrity" "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz" + "version" "1.11.1" "@webassemblyjs/helper-numbers@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" - integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== + "integrity" "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/floating-point-hex-parser" "1.11.1" "@webassemblyjs/helper-api-error" "1.11.1" "@xtuc/long" "4.2.2" "@webassemblyjs/helper-wasm-bytecode@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" - integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== + "integrity" "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz" + "version" "1.11.1" "@webassemblyjs/helper-wasm-section@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" - integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== + "integrity" "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/ast" "1.11.1" "@webassemblyjs/helper-buffer" "1.11.1" @@ -2054,28 +2053,28 @@ "@webassemblyjs/wasm-gen" "1.11.1" "@webassemblyjs/ieee754@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" - integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== + "integrity" "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz" + "version" "1.11.1" dependencies: "@xtuc/ieee754" "^1.2.0" "@webassemblyjs/leb128@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" - integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== + "integrity" "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz" + "version" "1.11.1" dependencies: "@xtuc/long" "4.2.2" "@webassemblyjs/utf8@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" - integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== + "integrity" "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz" + "version" "1.11.1" "@webassemblyjs/wasm-edit@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" - integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== + "integrity" "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/ast" "1.11.1" "@webassemblyjs/helper-buffer" "1.11.1" @@ -2087,9 +2086,9 @@ "@webassemblyjs/wast-printer" "1.11.1" "@webassemblyjs/wasm-gen@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" - integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== + "integrity" "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/ast" "1.11.1" "@webassemblyjs/helper-wasm-bytecode" "1.11.1" @@ -2098,9 +2097,9 @@ "@webassemblyjs/utf8" "1.11.1" "@webassemblyjs/wasm-opt@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" - integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== + "integrity" "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/ast" "1.11.1" "@webassemblyjs/helper-buffer" "1.11.1" @@ -2108,9 +2107,9 @@ "@webassemblyjs/wasm-parser" "1.11.1" "@webassemblyjs/wasm-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" - integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== + "integrity" "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/ast" "1.11.1" "@webassemblyjs/helper-api-error" "1.11.1" @@ -2120,124 +2119,124 @@ "@webassemblyjs/utf8" "1.11.1" "@webassemblyjs/wast-printer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" - integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== + "integrity" "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/ast" "1.11.1" "@xtuc/long" "4.2.2" "@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== + "integrity" "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==" + "resolved" "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz" + "version" "1.2.0" "@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== + "integrity" "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" + "resolved" "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz" + "version" "4.2.2" -accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: - version "1.3.8" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" - integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== +"accepts@~1.3.4", "accepts@~1.3.5", "accepts@~1.3.8": + "integrity" "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==" + "resolved" "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz" + "version" "1.3.8" dependencies: - mime-types "~2.1.34" - negotiator "0.6.3" + "mime-types" "~2.1.34" + "negotiator" "0.6.3" -acorn-dynamic-import@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" - integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw== +"acorn-dynamic-import@^4.0.0": + "integrity" "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==" + "resolved" "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz" + "version" "4.0.0" -acorn-import-assertions@^1.7.6: - version "1.8.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" - integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== +"acorn-import-assertions@^1.7.6": + "integrity" "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==" + "resolved" "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz" + "version" "1.8.0" -acorn-jsx@^5.0.1: - version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" - integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== +"acorn-jsx@^5.0.1": + "integrity" "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" + "resolved" "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz" + "version" "5.3.2" -acorn-walk@^8.0.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" - integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== +"acorn-walk@^8.0.0": + "integrity" "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==" + "resolved" "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz" + "version" "8.2.0" -acorn@^6.1.1: - version "6.4.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" - integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== +"acorn@^6.0.0", "acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^6.1.1": + "integrity" "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==" + "resolved" "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz" + "version" "6.4.2" -acorn@^8.0.4, acorn@^8.4.1, acorn@^8.5.0: - version "8.7.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" - integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== +"acorn@^8", "acorn@^8.0.4", "acorn@^8.4.1", "acorn@^8.5.0": + "integrity" "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==" + "resolved" "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz" + "version" "8.7.1" -address@^1.0.1, address@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" - integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA== +"address@^1.0.1", "address@^1.1.2": + "integrity" "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==" + "resolved" "https://registry.npmjs.org/address/-/address-1.1.2.tgz" + "version" "1.1.2" -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== +"aggregate-error@^3.0.0": + "integrity" "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==" + "resolved" "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz" + "version" "3.1.0" dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" + "clean-stack" "^2.0.0" + "indent-string" "^4.0.0" -ajv-formats@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" - integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== +"ajv-formats@^2.1.1": + "integrity" "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==" + "resolved" "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz" + "version" "2.1.1" dependencies: - ajv "^8.0.0" + "ajv" "^8.0.0" -ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== +"ajv-keywords@^3.4.1", "ajv-keywords@^3.5.2": + "integrity" "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==" + "resolved" "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz" + "version" "3.5.2" -ajv-keywords@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" - integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== +"ajv-keywords@^5.0.0": + "integrity" "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==" + "resolved" "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz" + "version" "5.1.0" dependencies: - fast-deep-equal "^3.1.3" + "fast-deep-equal" "^3.1.3" -ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== +"ajv@^6.12.2", "ajv@^6.12.4", "ajv@^6.12.5", "ajv@^6.9.1": + "integrity" "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==" + "resolved" "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" + "version" "6.12.6" dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" + "fast-deep-equal" "^3.1.1" + "fast-json-stable-stringify" "^2.0.0" + "json-schema-traverse" "^0.4.1" + "uri-js" "^4.2.2" -ajv@^8.0.0, ajv@^8.8.0: - version "8.10.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d" - integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw== +"ajv@^8.0.0", "ajv@^8.8.0", "ajv@^8.8.2": + "integrity" "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==" + "resolved" "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz" + "version" "8.10.0" dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" + "fast-deep-equal" "^3.1.1" + "json-schema-traverse" "^1.0.0" + "require-from-string" "^2.0.2" + "uri-js" "^4.2.2" -algoliasearch-helper@^3.5.5: - version "3.7.0" - resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-3.7.0.tgz#c0a0493df84d850360f664ad7a9d4fc78a94fd78" - integrity sha512-XJ3QfERBLfeVCyTVx80gon7r3/rgm/CE8Ha1H7cbablRe/X7SfYQ14g/eO+MhjVKIQp+gy9oC6G5ilmLwS1k6w== +"algoliasearch-helper@^3.5.5": + "integrity" "sha512-XJ3QfERBLfeVCyTVx80gon7r3/rgm/CE8Ha1H7cbablRe/X7SfYQ14g/eO+MhjVKIQp+gy9oC6G5ilmLwS1k6w==" + "resolved" "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.7.0.tgz" + "version" "3.7.0" dependencies: "@algolia/events" "^4.0.1" -algoliasearch@^4.0.0, algoliasearch@^4.10.5: - version "4.12.1" - resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.12.1.tgz#574a2c5424c4b6681c026928fb810be2d2ec3924" - integrity sha512-c0dM1g3zZBJrkzE5GA/Nu1y3fFxx3LCzxKzcmp2dgGS8P4CjszB/l3lsSh2MSrrK1Hn/KV4BlbBMXtYgG1Bfrw== +"algoliasearch@^4.0.0", "algoliasearch@^4.10.5", "algoliasearch@^4.9.1", "algoliasearch@>= 3.1 < 5": + "integrity" "sha512-c0dM1g3zZBJrkzE5GA/Nu1y3fFxx3LCzxKzcmp2dgGS8P4CjszB/l3lsSh2MSrrK1Hn/KV4BlbBMXtYgG1Bfrw==" + "resolved" "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/cache-browser-local-storage" "4.12.1" "@algolia/cache-common" "4.12.1" @@ -2254,2429 +2253,2448 @@ algoliasearch@^4.0.0, algoliasearch@^4.10.5: "@algolia/requester-node-http" "4.12.1" "@algolia/transporter" "4.12.1" -ansi-align@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" - integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== +"ansi-align@^3.0.0": + "integrity" "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==" + "resolved" "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz" + "version" "3.0.1" dependencies: - string-width "^4.1.0" + "string-width" "^4.1.0" -ansi-html-community@^0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" - integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== +"ansi-html-community@^0.0.8": + "integrity" "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==" + "resolved" "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz" + "version" "0.0.8" -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== +"ansi-regex@^5.0.1": + "integrity" "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz" + "version" "5.0.1" -ansi-regex@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" - integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== +"ansi-regex@^6.0.1": + "integrity" "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==" + "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz" + "version" "6.0.1" -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== +"ansi-styles@^3.2.1": + "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==" + "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz" + "version" "3.2.1" dependencies: - color-convert "^1.9.0" + "color-convert" "^1.9.0" -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== +"ansi-styles@^4.0.0", "ansi-styles@^4.1.0": + "integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==" + "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz" + "version" "4.3.0" dependencies: - color-convert "^2.0.1" + "color-convert" "^2.0.1" -anymatch@~3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== +"anymatch@~3.1.2": + "integrity" "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==" + "resolved" "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz" + "version" "3.1.2" dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" + "normalize-path" "^3.0.0" + "picomatch" "^2.0.4" -arg@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" - integrity sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA== +"arg@^5.0.0": + "integrity" "sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==" + "resolved" "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz" + "version" "5.0.1" -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== +"argparse@^1.0.7": + "integrity" "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==" + "resolved" "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz" + "version" "1.0.10" dependencies: - sprintf-js "~1.0.2" + "sprintf-js" "~1.0.2" -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== +"argparse@^2.0.1": + "integrity" "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "resolved" "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz" + "version" "2.0.1" -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= +"array-flatten@^2.1.0": + "integrity" "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==" + "resolved" "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz" + "version" "2.1.2" -array-flatten@^2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== +"array-flatten@1.1.1": + "integrity" "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + "resolved" "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz" + "version" "1.1.1" -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== +"array-union@^2.1.0": + "integrity" "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==" + "resolved" "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz" + "version" "2.1.0" -array-union@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975" - integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw== +"array-union@^3.0.1": + "integrity" "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==" + "resolved" "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz" + "version" "3.0.1" -asap@~2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" - integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= +"asap@~2.0.3": + "integrity" "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + "resolved" "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz" + "version" "2.0.6" -async@^2.6.2: - version "2.6.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" - integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== +"async@^2.6.2": + "integrity" "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==" + "resolved" "https://registry.npmjs.org/async/-/async-2.6.4.tgz" + "version" "2.6.4" dependencies: - lodash "^4.17.14" + "lodash" "^4.17.14" -at-least-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" - integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== +"at-least-node@^1.0.0": + "integrity" "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==" + "resolved" "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz" + "version" "1.0.0" -autoprefixer@^10.3.5, autoprefixer@^10.3.7: - version "10.4.2" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.2.tgz#25e1df09a31a9fba5c40b578936b90d35c9d4d3b" - integrity sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ== +"autoprefixer@^10.3.5", "autoprefixer@^10.3.7": + "integrity" "sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==" + "resolved" "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.2.tgz" + "version" "10.4.2" dependencies: - browserslist "^4.19.1" - caniuse-lite "^1.0.30001297" - fraction.js "^4.1.2" - normalize-range "^0.1.2" - picocolors "^1.0.0" - postcss-value-parser "^4.2.0" + "browserslist" "^4.19.1" + "caniuse-lite" "^1.0.30001297" + "fraction.js" "^4.1.2" + "normalize-range" "^0.1.2" + "picocolors" "^1.0.0" + "postcss-value-parser" "^4.2.0" -axios@^0.25.0: - version "0.25.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a" - integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g== +"axios@^0.25.0": + "integrity" "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==" + "resolved" "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz" + "version" "0.25.0" dependencies: - follow-redirects "^1.14.7" + "follow-redirects" "^1.14.7" -babel-loader@^8.2.2: - version "8.2.3" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" - integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw== +"babel-loader@^8.2.2": + "integrity" "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==" + "resolved" "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz" + "version" "8.2.3" dependencies: - find-cache-dir "^3.3.1" - loader-utils "^1.4.0" - make-dir "^3.1.0" - schema-utils "^2.6.5" + "find-cache-dir" "^3.3.1" + "loader-utils" "^1.4.0" + "make-dir" "^3.1.0" + "schema-utils" "^2.6.5" -babel-plugin-apply-mdx-type-prop@1.6.22: - version "1.6.22" - resolved "https://registry.yarnpkg.com/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" - integrity sha512-VefL+8o+F/DfK24lPZMtJctrCVOfgbqLAGZSkxwhazQv4VxPg3Za/i40fu22KR2m8eEda+IfSOlPLUSIiLcnCQ== +"babel-plugin-apply-mdx-type-prop@1.6.22": + "integrity" "sha512-VefL+8o+F/DfK24lPZMtJctrCVOfgbqLAGZSkxwhazQv4VxPg3Za/i40fu22KR2m8eEda+IfSOlPLUSIiLcnCQ==" + "resolved" "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.22.tgz" + "version" "1.6.22" dependencies: "@babel/helper-plugin-utils" "7.10.4" "@mdx-js/util" "1.6.22" -babel-plugin-dynamic-import-node@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" - integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ== +"babel-plugin-dynamic-import-node@^2.3.3": + "integrity" "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==" + "resolved" "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz" + "version" "2.3.3" dependencies: - object.assign "^4.1.0" + "object.assign" "^4.1.0" -babel-plugin-dynamic-import-node@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" - integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== +"babel-plugin-dynamic-import-node@2.3.0": + "integrity" "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==" + "resolved" "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz" + "version" "2.3.0" dependencies: - object.assign "^4.1.0" + "object.assign" "^4.1.0" -babel-plugin-extract-import-names@1.6.22: - version "1.6.22" - resolved "https://registry.yarnpkg.com/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc" - integrity sha512-yJ9BsJaISua7d8zNT7oRG1ZLBJCIdZ4PZqmH8qa9N5AK01ifk3fnkc98AXhtzE7UkfCsEumvoQWgoYLhOnJ7jQ== +"babel-plugin-extract-import-names@1.6.22": + "integrity" "sha512-yJ9BsJaISua7d8zNT7oRG1ZLBJCIdZ4PZqmH8qa9N5AK01ifk3fnkc98AXhtzE7UkfCsEumvoQWgoYLhOnJ7jQ==" + "resolved" "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.22.tgz" + "version" "1.6.22" dependencies: "@babel/helper-plugin-utils" "7.10.4" -babel-plugin-polyfill-corejs2@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5" - integrity sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w== +"babel-plugin-polyfill-corejs2@^0.3.0": + "integrity" "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==" + "resolved" "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz" + "version" "0.3.1" dependencies: "@babel/compat-data" "^7.13.11" "@babel/helper-define-polyfill-provider" "^0.3.1" - semver "^6.1.1" + "semver" "^6.1.1" -babel-plugin-polyfill-corejs3@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72" - integrity sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ== +"babel-plugin-polyfill-corejs3@^0.5.0": + "integrity" "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==" + "resolved" "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz" + "version" "0.5.2" dependencies: "@babel/helper-define-polyfill-provider" "^0.3.1" - core-js-compat "^3.21.0" + "core-js-compat" "^3.21.0" -babel-plugin-polyfill-regenerator@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990" - integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A== +"babel-plugin-polyfill-regenerator@^0.3.0": + "integrity" "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==" + "resolved" "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz" + "version" "0.3.1" dependencies: "@babel/helper-define-polyfill-provider" "^0.3.1" -bail@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" - integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ== +"bail@^1.0.0": + "integrity" "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==" + "resolved" "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz" + "version" "1.0.5" -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== +"balanced-match@^1.0.0": + "integrity" "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "resolved" "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" + "version" "1.0.2" -base16@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz#e297f60d7ec1014a7a971a39ebc8a98c0b681e70" - integrity sha1-4pf2DX7BAUp6lxo568ipjAtoHnA= +"base16@^1.0.0": + "integrity" "sha1-4pf2DX7BAUp6lxo568ipjAtoHnA=" + "resolved" "https://registry.npmjs.org/base16/-/base16-1.0.0.tgz" + "version" "1.0.0" -batch@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= +"batch@0.6.1": + "integrity" "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=" + "resolved" "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz" + "version" "0.6.1" -big.js@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" - integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== +"big.js@^5.2.2": + "integrity" "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==" + "resolved" "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz" + "version" "5.2.2" -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== +"binary-extensions@^2.0.0": + "integrity" "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" + "resolved" "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" + "version" "2.2.0" -bluebird@^3.7.1: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== +"bluebird@^3.7.1": + "integrity" "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + "resolved" "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz" + "version" "3.7.2" -body-parser@1.19.2: - version "1.19.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e" - integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw== +"body-parser@1.19.2": + "integrity" "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==" + "resolved" "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz" + "version" "1.19.2" dependencies: - bytes "3.1.2" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.8.1" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.9.7" - raw-body "2.4.3" - type-is "~1.6.18" + "bytes" "3.1.2" + "content-type" "~1.0.4" + "debug" "2.6.9" + "depd" "~1.1.2" + "http-errors" "1.8.1" + "iconv-lite" "0.4.24" + "on-finished" "~2.3.0" + "qs" "6.9.7" + "raw-body" "2.4.3" + "type-is" "~1.6.18" -bonjour@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" - integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= +"bonjour@^3.5.0": + "integrity" "sha1-jokKGD2O6aI5OzhExpGkK897yfU=" + "resolved" "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz" + "version" "3.5.0" dependencies: - array-flatten "^2.1.0" - deep-equal "^1.0.1" - dns-equal "^1.0.0" - dns-txt "^2.0.2" - multicast-dns "^6.0.1" - multicast-dns-service-types "^1.1.0" + "array-flatten" "^2.1.0" + "deep-equal" "^1.0.1" + "dns-equal" "^1.0.0" + "dns-txt" "^2.0.2" + "multicast-dns" "^6.0.1" + "multicast-dns-service-types" "^1.1.0" -boolbase@^1.0.0, boolbase@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" - integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= +"boolbase@^1.0.0", "boolbase@~1.0.0": + "integrity" "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" + "resolved" "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz" + "version" "1.0.0" -boxen@^5.0.0, boxen@^5.0.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" - integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== +"boxen@^5.0.0", "boxen@^5.0.1": + "integrity" "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==" + "resolved" "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz" + "version" "5.1.2" dependencies: - ansi-align "^3.0.0" - camelcase "^6.2.0" - chalk "^4.1.0" - cli-boxes "^2.2.1" - string-width "^4.2.2" - type-fest "^0.20.2" - widest-line "^3.1.0" - wrap-ansi "^7.0.0" + "ansi-align" "^3.0.0" + "camelcase" "^6.2.0" + "chalk" "^4.1.0" + "cli-boxes" "^2.2.1" + "string-width" "^4.2.2" + "type-fest" "^0.20.2" + "widest-line" "^3.1.0" + "wrap-ansi" "^7.0.0" -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== +"brace-expansion@^1.1.7": + "integrity" "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==" + "resolved" "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" + "version" "1.1.11" dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" + "balanced-match" "^1.0.0" + "concat-map" "0.0.1" -braces@^3.0.1, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== +"braces@^3.0.1", "braces@~3.0.2": + "integrity" "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==" + "resolved" "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz" + "version" "3.0.2" dependencies: - fill-range "^7.0.1" + "fill-range" "^7.0.1" -browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.18.1, browserslist@^4.19.1: - version "4.19.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3" - integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A== +"browserslist@^4.0.0", "browserslist@^4.14.5", "browserslist@^4.16.6", "browserslist@^4.18.1", "browserslist@^4.19.1", "browserslist@^4.21.3", "browserslist@>= 4.21.0": + "integrity" "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==" + "resolved" "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz" + "version" "4.21.5" dependencies: - caniuse-lite "^1.0.30001286" - electron-to-chromium "^1.4.17" - escalade "^3.1.1" - node-releases "^2.0.1" - picocolors "^1.0.0" + "caniuse-lite" "^1.0.30001449" + "electron-to-chromium" "^1.4.284" + "node-releases" "^2.0.8" + "update-browserslist-db" "^1.0.10" -buble-jsx-only@^0.19.8: - version "0.19.8" - resolved "https://registry.yarnpkg.com/buble-jsx-only/-/buble-jsx-only-0.19.8.tgz#6e3524aa0f1c523de32496ac9aceb9cc2b493867" - integrity sha512-7AW19pf7PrKFnGTEDzs6u9+JZqQwM1VnLS19OlqYDhXomtFFknnoQJAPHeg84RMFWAvOhYrG7harizJNwUKJsA== +"buble-jsx-only@^0.19.8": + "integrity" "sha512-7AW19pf7PrKFnGTEDzs6u9+JZqQwM1VnLS19OlqYDhXomtFFknnoQJAPHeg84RMFWAvOhYrG7harizJNwUKJsA==" + "resolved" "https://registry.npmjs.org/buble-jsx-only/-/buble-jsx-only-0.19.8.tgz" + "version" "0.19.8" dependencies: - acorn "^6.1.1" - acorn-dynamic-import "^4.0.0" - acorn-jsx "^5.0.1" - chalk "^2.4.2" - magic-string "^0.25.3" - minimist "^1.2.0" - regexpu-core "^4.5.4" + "acorn" "^6.1.1" + "acorn-dynamic-import" "^4.0.0" + "acorn-jsx" "^5.0.1" + "chalk" "^2.4.2" + "magic-string" "^0.25.3" + "minimist" "^1.2.0" + "regexpu-core" "^4.5.4" -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== +"buffer-from@^1.0.0": + "integrity" "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" + "resolved" "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz" + "version" "1.1.2" -buffer-indexof@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" - integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== +"buffer-indexof@^1.0.0": + "integrity" "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==" + "resolved" "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz" + "version" "1.1.1" -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= +"bytes@3.0.0": + "integrity" "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" + "resolved" "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz" + "version" "3.0.0" -bytes@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" - integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== +"bytes@3.1.2": + "integrity" "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" + "resolved" "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz" + "version" "3.1.2" -cacheable-request@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" - integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== +"cacheable-request@^6.0.0": + "integrity" "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==" + "resolved" "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz" + "version" "6.1.0" dependencies: - clone-response "^1.0.2" - get-stream "^5.1.0" - http-cache-semantics "^4.0.0" - keyv "^3.0.0" - lowercase-keys "^2.0.0" - normalize-url "^4.1.0" - responselike "^1.0.2" + "clone-response" "^1.0.2" + "get-stream" "^5.1.0" + "http-cache-semantics" "^4.0.0" + "keyv" "^3.0.0" + "lowercase-keys" "^2.0.0" + "normalize-url" "^4.1.0" + "responselike" "^1.0.2" -call-bind@^1.0.0, call-bind@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== +"call-bind@^1.0.0", "call-bind@^1.0.2": + "integrity" "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==" + "resolved" "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz" + "version" "1.0.2" dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" + "function-bind" "^1.1.1" + "get-intrinsic" "^1.0.2" -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== +"callsites@^3.0.0": + "integrity" "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" + "resolved" "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz" + "version" "3.1.0" -camel-case@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" - integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== +"camel-case@^4.1.2": + "integrity" "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==" + "resolved" "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz" + "version" "4.1.2" dependencies: - pascal-case "^3.1.2" - tslib "^2.0.3" + "pascal-case" "^3.1.2" + "tslib" "^2.0.3" -camelcase-css@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" - integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== +"camelcase-css@2.0.1": + "integrity" "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==" + "resolved" "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz" + "version" "2.0.1" -camelcase@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" - integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== +"camelcase@^6.2.0": + "integrity" "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==" + "resolved" "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz" + "version" "6.3.0" -caniuse-api@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" - integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== +"caniuse-api@^3.0.0": + "integrity" "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==" + "resolved" "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz" + "version" "3.0.0" dependencies: - browserslist "^4.0.0" - caniuse-lite "^1.0.0" - lodash.memoize "^4.1.2" - lodash.uniq "^4.5.0" + "browserslist" "^4.0.0" + "caniuse-lite" "^1.0.0" + "lodash.memoize" "^4.1.2" + "lodash.uniq" "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001297: - version "1.0.30001312" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz#e11eba4b87e24d22697dae05455d5aea28550d5f" - integrity sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ== +"caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30001297", "caniuse-lite@^1.0.30001449": + "integrity" "sha512-ewtFBSfWjEmxUgNBSZItFSmVtvk9zkwkl1OfRZlKA8slltRN+/C/tuGVrF9styXkN36Yu3+SeJ1qkXxDEyNZ5w==" + "resolved" "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001466.tgz" + "version" "1.0.30001466" -ccount@^1.0.0, ccount@^1.0.3: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043" - integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg== +"ccount@^1.0.0", "ccount@^1.0.3": + "integrity" "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==" + "resolved" "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz" + "version" "1.1.0" -chalk@^2.0.0, chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== +"chalk@^2.0.0": + "integrity" "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==" + "resolved" "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" + "version" "2.4.2" dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" + "ansi-styles" "^3.2.1" + "escape-string-regexp" "^1.0.5" + "supports-color" "^5.3.0" -chalk@^4.1.0, chalk@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== +"chalk@^2.4.2": + "integrity" "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==" + "resolved" "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" + "version" "2.4.2" dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" + "ansi-styles" "^3.2.1" + "escape-string-regexp" "^1.0.5" + "supports-color" "^5.3.0" -character-entities-legacy@^1.0.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" - integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA== - -character-entities@^1.0.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" - integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw== - -character-reference-invalid@^1.0.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" - integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg== - -cheerio-select@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.5.0.tgz#faf3daeb31b17c5e1a9dabcee288aaf8aafa5823" - integrity sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg== +"chalk@^4.1.0", "chalk@^4.1.2": + "integrity" "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==" + "resolved" "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" + "version" "4.1.2" dependencies: - css-select "^4.1.3" - css-what "^5.0.1" - domelementtype "^2.2.0" - domhandler "^4.2.0" - domutils "^2.7.0" + "ansi-styles" "^4.1.0" + "supports-color" "^7.1.0" -cheerio@^0.22.0: - version "0.22.0" - resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" - integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4= - dependencies: - css-select "~1.2.0" - dom-serializer "~0.1.0" - entities "~1.1.1" - htmlparser2 "^3.9.1" - lodash.assignin "^4.0.9" - lodash.bind "^4.1.4" - lodash.defaults "^4.0.1" - lodash.filter "^4.4.0" - lodash.flatten "^4.2.0" - lodash.foreach "^4.3.0" - lodash.map "^4.4.0" - lodash.merge "^4.4.0" - lodash.pick "^4.2.1" - lodash.reduce "^4.4.0" - lodash.reject "^4.4.0" - lodash.some "^4.4.0" +"character-entities-legacy@^1.0.0": + "integrity" "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==" + "resolved" "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz" + "version" "1.1.4" -cheerio@^1.0.0-rc.10: - version "1.0.0-rc.10" - resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.10.tgz#2ba3dcdfcc26e7956fc1f440e61d51c643379f3e" - integrity sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw== - dependencies: - cheerio-select "^1.5.0" - dom-serializer "^1.3.2" - domhandler "^4.2.0" - htmlparser2 "^6.1.0" - parse5 "^6.0.1" - parse5-htmlparser2-tree-adapter "^6.0.1" - tslib "^2.2.0" +"character-entities@^1.0.0": + "integrity" "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==" + "resolved" "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz" + "version" "1.2.4" -chokidar@^3.4.2, chokidar@^3.5.2, chokidar@^3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== +"character-reference-invalid@^1.0.0": + "integrity" "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==" + "resolved" "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz" + "version" "1.1.4" + +"cheerio-select@^1.5.0": + "integrity" "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==" + "resolved" "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz" + "version" "1.5.0" dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" + "css-select" "^4.1.3" + "css-what" "^5.0.1" + "domelementtype" "^2.2.0" + "domhandler" "^4.2.0" + "domutils" "^2.7.0" + +"cheerio@^0.22.0": + "integrity" "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=" + "resolved" "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz" + "version" "0.22.0" + dependencies: + "css-select" "~1.2.0" + "dom-serializer" "~0.1.0" + "entities" "~1.1.1" + "htmlparser2" "^3.9.1" + "lodash.assignin" "^4.0.9" + "lodash.bind" "^4.1.4" + "lodash.defaults" "^4.0.1" + "lodash.filter" "^4.4.0" + "lodash.flatten" "^4.2.0" + "lodash.foreach" "^4.3.0" + "lodash.map" "^4.4.0" + "lodash.merge" "^4.4.0" + "lodash.pick" "^4.2.1" + "lodash.reduce" "^4.4.0" + "lodash.reject" "^4.4.0" + "lodash.some" "^4.4.0" + +"cheerio@^1.0.0-rc.10": + "integrity" "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==" + "resolved" "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz" + "version" "1.0.0-rc.10" + dependencies: + "cheerio-select" "^1.5.0" + "dom-serializer" "^1.3.2" + "domhandler" "^4.2.0" + "htmlparser2" "^6.1.0" + "parse5" "^6.0.1" + "parse5-htmlparser2-tree-adapter" "^6.0.1" + "tslib" "^2.2.0" + +"chokidar@^3.4.2", "chokidar@^3.5.2", "chokidar@^3.5.3": + "integrity" "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==" + "resolved" "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" + "version" "3.5.3" + dependencies: + "anymatch" "~3.1.2" + "braces" "~3.0.2" + "glob-parent" "~5.1.2" + "is-binary-path" "~2.1.0" + "is-glob" "~4.0.1" + "normalize-path" "~3.0.0" + "readdirp" "~3.6.0" optionalDependencies: - fsevents "~2.3.2" + "fsevents" "~2.3.2" -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== +"chrome-trace-event@^1.0.2": + "integrity" "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==" + "resolved" "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz" + "version" "1.0.3" -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== +"ci-info@^2.0.0": + "integrity" "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" + "resolved" "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz" + "version" "2.0.0" -classnames@^2.2.6: - version "2.3.1" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" - integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== +"classnames@^2.2.6": + "integrity" "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==" + "resolved" "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz" + "version" "2.3.1" -clean-css@^5.1.5, clean-css@^5.2.2: - version "5.2.4" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.2.4.tgz#982b058f8581adb2ae062520808fb2429bd487a4" - integrity sha512-nKseG8wCzEuji/4yrgM/5cthL9oTDc5UOQyFMvW/Q53oP6gLH690o1NbuTh6Y18nujr7BxlsFuS7gXLnLzKJGg== +"clean-css@^5.1.5", "clean-css@^5.2.2": + "integrity" "sha512-nKseG8wCzEuji/4yrgM/5cthL9oTDc5UOQyFMvW/Q53oP6gLH690o1NbuTh6Y18nujr7BxlsFuS7gXLnLzKJGg==" + "resolved" "https://registry.npmjs.org/clean-css/-/clean-css-5.2.4.tgz" + "version" "5.2.4" dependencies: - source-map "~0.6.0" + "source-map" "~0.6.0" -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== +"clean-stack@^2.0.0": + "integrity" "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" + "resolved" "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz" + "version" "2.2.0" -cli-boxes@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" - integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== +"cli-boxes@^2.2.1": + "integrity" "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==" + "resolved" "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz" + "version" "2.2.1" -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== +"clone-deep@^4.0.1": + "integrity" "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==" + "resolved" "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz" + "version" "4.0.1" dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" + "is-plain-object" "^2.0.4" + "kind-of" "^6.0.2" + "shallow-clone" "^3.0.0" -clone-response@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" - integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= +"clone-response@^1.0.2": + "integrity" "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=" + "resolved" "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz" + "version" "1.0.2" dependencies: - mimic-response "^1.0.0" + "mimic-response" "^1.0.0" -clsx@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" - integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA== +"clsx@^1.1.1": + "integrity" "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==" + "resolved" "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz" + "version" "1.1.1" -collapse-white-space@^1.0.2: - version "1.0.6" - resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287" - integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ== +"collapse-white-space@^1.0.2": + "integrity" "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==" + "resolved" "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz" + "version" "1.0.6" -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== +"color-convert@^1.9.0": + "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==" + "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz" + "version" "1.9.3" dependencies: - color-name "1.1.3" + "color-name" "1.1.3" -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== +"color-convert@^2.0.1": + "integrity" "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==" + "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz" + "version" "2.0.1" dependencies: - color-name "~1.1.4" + "color-name" "~1.1.4" -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= +"color-name@~1.1.4": + "integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" + "version" "1.1.4" -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +"color-name@1.1.3": + "integrity" "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" + "version" "1.1.3" -colord@^2.9.1: - version "2.9.2" - resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1" - integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ== +"colord@^2.9.1": + "integrity" "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==" + "resolved" "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz" + "version" "2.9.2" -colorette@^2.0.10: - version "2.0.16" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" - integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== +"colorette@^2.0.10": + "integrity" "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==" + "resolved" "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz" + "version" "2.0.16" -combine-promises@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/combine-promises/-/combine-promises-1.1.0.tgz#72db90743c0ca7aab7d0d8d2052fd7b0f674de71" - integrity sha512-ZI9jvcLDxqwaXEixOhArm3r7ReIivsXkpbyEWyeOhzz1QS0iSgBPnWvEqvIQtYyamGCYA88gFhmUrs9hrrQ0pg== +"combine-promises@^1.1.0": + "integrity" "sha512-ZI9jvcLDxqwaXEixOhArm3r7ReIivsXkpbyEWyeOhzz1QS0iSgBPnWvEqvIQtYyamGCYA88gFhmUrs9hrrQ0pg==" + "resolved" "https://registry.npmjs.org/combine-promises/-/combine-promises-1.1.0.tgz" + "version" "1.1.0" -comma-separated-tokens@^1.0.0: - version "1.0.8" - resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" - integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw== +"comma-separated-tokens@^1.0.0": + "integrity" "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==" + "resolved" "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz" + "version" "1.0.8" -commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +"commander@^2.20.0": + "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + "resolved" "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" + "version" "2.20.3" -commander@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" - integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== +"commander@^5.1.0": + "integrity" "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==" + "resolved" "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz" + "version" "5.1.0" -commander@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== +"commander@^7.2.0": + "integrity" "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==" + "resolved" "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" + "version" "7.2.0" -commander@^8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" - integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== +"commander@^8.3.0": + "integrity" "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==" + "resolved" "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz" + "version" "8.3.0" -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= +"commondir@^1.0.1": + "integrity" "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" + "resolved" "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz" + "version" "1.0.1" -compressible@~2.0.16: - version "2.0.18" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" - integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== +"compressible@~2.0.16": + "integrity" "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==" + "resolved" "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz" + "version" "2.0.18" dependencies: - mime-db ">= 1.43.0 < 2" + "mime-db" ">= 1.43.0 < 2" -compression@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" - integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== +"compression@^1.7.4": + "integrity" "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==" + "resolved" "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz" + "version" "1.7.4" dependencies: - accepts "~1.3.5" - bytes "3.0.0" - compressible "~2.0.16" - debug "2.6.9" - on-headers "~1.0.2" - safe-buffer "5.1.2" - vary "~1.1.2" + "accepts" "~1.3.5" + "bytes" "3.0.0" + "compressible" "~2.0.16" + "debug" "2.6.9" + "on-headers" "~1.0.2" + "safe-buffer" "5.1.2" + "vary" "~1.1.2" -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= +"concat-map@0.0.1": + "integrity" "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "resolved" "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "version" "0.0.1" -configstore@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" - integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== +"configstore@^5.0.1": + "integrity" "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==" + "resolved" "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz" + "version" "5.0.1" dependencies: - dot-prop "^5.2.0" - graceful-fs "^4.1.2" - make-dir "^3.0.0" - unique-string "^2.0.0" - write-file-atomic "^3.0.0" - xdg-basedir "^4.0.0" + "dot-prop" "^5.2.0" + "graceful-fs" "^4.1.2" + "make-dir" "^3.0.0" + "unique-string" "^2.0.0" + "write-file-atomic" "^3.0.0" + "xdg-basedir" "^4.0.0" -connect-history-api-fallback@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" - integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== +"connect-history-api-fallback@^1.6.0": + "integrity" "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==" + "resolved" "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz" + "version" "1.6.0" -consola@^2.15.3: - version "2.15.3" - resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550" - integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw== +"consola@^2.15.3": + "integrity" "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==" + "resolved" "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz" + "version" "2.15.3" -content-disposition@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" - integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ= +"content-disposition@0.5.2": + "integrity" "sha1-DPaLud318r55YcOoUXjLhdunjLQ=" + "resolved" "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz" + "version" "0.5.2" -content-disposition@0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" - integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== +"content-disposition@0.5.4": + "integrity" "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==" + "resolved" "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz" + "version" "0.5.4" dependencies: - safe-buffer "5.2.1" + "safe-buffer" "5.2.1" -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== +"content-type@~1.0.4": + "integrity" "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + "resolved" "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz" + "version" "1.0.4" -convert-source-map@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" - integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== +"convert-source-map@^1.7.0": + "integrity" "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==" + "resolved" "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz" + "version" "1.8.0" dependencies: - safe-buffer "~5.1.1" + "safe-buffer" "~5.1.1" -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= +"cookie-signature@1.0.6": + "integrity" "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + "resolved" "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" + "version" "1.0.6" -cookie@0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" - integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== +"cookie@0.4.2": + "integrity" "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==" + "resolved" "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz" + "version" "0.4.2" -copy-text-to-clipboard@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" - integrity sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q== +"copy-text-to-clipboard@^3.0.1": + "integrity" "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q==" + "resolved" "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz" + "version" "3.0.1" -copy-webpack-plugin@^10.2.0: - version "10.2.4" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz#6c854be3fdaae22025da34b9112ccf81c63308fe" - integrity sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg== +"copy-webpack-plugin@^10.2.0": + "integrity" "sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg==" + "resolved" "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz" + "version" "10.2.4" dependencies: - fast-glob "^3.2.7" - glob-parent "^6.0.1" - globby "^12.0.2" - normalize-path "^3.0.0" - schema-utils "^4.0.0" - serialize-javascript "^6.0.0" + "fast-glob" "^3.2.7" + "glob-parent" "^6.0.1" + "globby" "^12.0.2" + "normalize-path" "^3.0.0" + "schema-utils" "^4.0.0" + "serialize-javascript" "^6.0.0" -core-js-compat@^3.20.2, core-js-compat@^3.21.0: - version "3.21.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82" - integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g== +"core-js-compat@^3.20.2", "core-js-compat@^3.21.0": + "integrity" "sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==" + "resolved" "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz" + "version" "3.21.1" dependencies: - browserslist "^4.19.1" - semver "7.0.0" + "browserslist" "^4.19.1" + "semver" "7.0.0" -core-js-pure@^3.20.2: - version "3.21.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.21.1.tgz#8c4d1e78839f5f46208de7230cebfb72bc3bdb51" - integrity sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ== +"core-js-pure@^3.20.2": + "integrity" "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==" + "resolved" "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz" + "version" "3.21.1" -core-js@^3.18.0: - version "3.21.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.1.tgz#f2e0ddc1fc43da6f904706e8e955bc19d06a0d94" - integrity sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig== +"core-js@^3.18.0": + "integrity" "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==" + "resolved" "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz" + "version" "3.21.1" -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== +"core-util-is@~1.0.0": + "integrity" "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" + "resolved" "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz" + "version" "1.0.3" -cosmiconfig@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" - integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== +"cosmiconfig@^6.0.0": + "integrity" "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==" + "resolved" "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz" + "version" "6.0.0" dependencies: "@types/parse-json" "^4.0.0" - import-fresh "^3.1.0" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.7.2" + "import-fresh" "^3.1.0" + "parse-json" "^5.0.0" + "path-type" "^4.0.0" + "yaml" "^1.7.2" -cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" - integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== +"cosmiconfig@^7.0.0", "cosmiconfig@^7.0.1": + "integrity" "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==" + "resolved" "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz" + "version" "7.0.1" dependencies: "@types/parse-json" "^4.0.0" - import-fresh "^3.2.1" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.10.0" + "import-fresh" "^3.2.1" + "parse-json" "^5.0.0" + "path-type" "^4.0.0" + "yaml" "^1.10.0" -cross-fetch@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" - integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== +"cross-fetch@^3.1.5": + "integrity" "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==" + "resolved" "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz" + "version" "3.1.5" dependencies: - node-fetch "2.6.7" + "node-fetch" "2.6.7" -cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== +"cross-spawn@^7.0.3": + "integrity" "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==" + "resolved" "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" + "version" "7.0.3" dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" + "path-key" "^3.1.0" + "shebang-command" "^2.0.0" + "which" "^2.0.1" -crypto-random-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" - integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== +"crypto-random-string@^2.0.0": + "integrity" "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==" + "resolved" "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz" + "version" "2.0.0" -css-declaration-sorter@^6.0.3: - version "6.1.4" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz#b9bfb4ed9a41f8dcca9bf7184d849ea94a8294b4" - integrity sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw== +"css-declaration-sorter@^6.0.3": + "integrity" "sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw==" + "resolved" "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz" + "version" "6.1.4" dependencies: - timsort "^0.3.0" + "timsort" "^0.3.0" -css-loader@^6.5.1: - version "6.6.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.6.0.tgz#c792ad5510bd1712618b49381bd0310574fafbd3" - integrity sha512-FK7H2lisOixPT406s5gZM1S3l8GrfhEBT3ZiL2UX1Ng1XWs0y2GPllz/OTyvbaHe12VgQrIXIzuEGVlbUhodqg== +"css-loader@^6.5.1": + "integrity" "sha512-FK7H2lisOixPT406s5gZM1S3l8GrfhEBT3ZiL2UX1Ng1XWs0y2GPllz/OTyvbaHe12VgQrIXIzuEGVlbUhodqg==" + "resolved" "https://registry.npmjs.org/css-loader/-/css-loader-6.6.0.tgz" + "version" "6.6.0" dependencies: - icss-utils "^5.1.0" - postcss "^8.4.5" - postcss-modules-extract-imports "^3.0.0" - postcss-modules-local-by-default "^4.0.0" - postcss-modules-scope "^3.0.0" - postcss-modules-values "^4.0.0" - postcss-value-parser "^4.2.0" - semver "^7.3.5" + "icss-utils" "^5.1.0" + "postcss" "^8.4.5" + "postcss-modules-extract-imports" "^3.0.0" + "postcss-modules-local-by-default" "^4.0.0" + "postcss-modules-scope" "^3.0.0" + "postcss-modules-values" "^4.0.0" + "postcss-value-parser" "^4.2.0" + "semver" "^7.3.5" -css-minimizer-webpack-plugin@^3.3.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz#ab78f781ced9181992fe7b6e4f3422e76429878f" - integrity sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q== +"css-minimizer-webpack-plugin@^3.3.1": + "integrity" "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==" + "resolved" "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz" + "version" "3.4.1" dependencies: - cssnano "^5.0.6" - jest-worker "^27.0.2" - postcss "^8.3.5" - schema-utils "^4.0.0" - serialize-javascript "^6.0.0" - source-map "^0.6.1" + "cssnano" "^5.0.6" + "jest-worker" "^27.0.2" + "postcss" "^8.3.5" + "schema-utils" "^4.0.0" + "serialize-javascript" "^6.0.0" + "source-map" "^0.6.1" -css-select@^4.1.3: - version "4.2.1" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd" - integrity sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ== +"css-select@^4.1.3": + "integrity" "sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==" + "resolved" "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz" + "version" "4.2.1" dependencies: - boolbase "^1.0.0" - css-what "^5.1.0" - domhandler "^4.3.0" - domutils "^2.8.0" - nth-check "^2.0.1" + "boolbase" "^1.0.0" + "css-what" "^5.1.0" + "domhandler" "^4.3.0" + "domutils" "^2.8.0" + "nth-check" "^2.0.1" -css-select@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" - integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= +"css-select@~1.2.0": + "integrity" "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=" + "resolved" "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz" + "version" "1.2.0" dependencies: - boolbase "~1.0.0" - css-what "2.1" - domutils "1.5.1" - nth-check "~1.0.1" + "boolbase" "~1.0.0" + "css-what" "2.1" + "domutils" "1.5.1" + "nth-check" "~1.0.1" -css-tree@^1.1.2, css-tree@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" - integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== +"css-tree@^1.1.2", "css-tree@^1.1.3": + "integrity" "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==" + "resolved" "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz" + "version" "1.1.3" dependencies: - mdn-data "2.0.14" - source-map "^0.6.1" + "mdn-data" "2.0.14" + "source-map" "^0.6.1" -css-what@2.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" - integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== +"css-what@^5.0.1", "css-what@^5.1.0": + "integrity" "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==" + "resolved" "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz" + "version" "5.1.0" -css-what@^5.0.1, css-what@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" - integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== +"css-what@2.1": + "integrity" "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==" + "resolved" "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz" + "version" "2.1.3" -cssesc@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" - integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== +"cssesc@^3.0.0": + "integrity" "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" + "resolved" "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz" + "version" "3.0.0" -cssnano-preset-advanced@^5.1.4: - version "5.1.12" - resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-5.1.12.tgz#11f5b0c4e3c32bcfd475465a283fa14dec8df972" - integrity sha512-5WWV9mbqVNwH4nRjs5UbhNl7eKo+16eYNzGogmz0Sa6iqWUeLdN8oo83WuTTqz5vjEKhTbRM5oX6WV1i6ees6g== +"cssnano-preset-advanced@^5.1.4": + "integrity" "sha512-5WWV9mbqVNwH4nRjs5UbhNl7eKo+16eYNzGogmz0Sa6iqWUeLdN8oo83WuTTqz5vjEKhTbRM5oX6WV1i6ees6g==" + "resolved" "https://registry.npmjs.org/cssnano-preset-advanced/-/cssnano-preset-advanced-5.1.12.tgz" + "version" "5.1.12" dependencies: - autoprefixer "^10.3.7" - cssnano-preset-default "^5.1.12" - postcss-discard-unused "^5.0.3" - postcss-merge-idents "^5.0.3" - postcss-reduce-idents "^5.0.3" - postcss-zindex "^5.0.2" + "autoprefixer" "^10.3.7" + "cssnano-preset-default" "^5.1.12" + "postcss-discard-unused" "^5.0.3" + "postcss-merge-idents" "^5.0.3" + "postcss-reduce-idents" "^5.0.3" + "postcss-zindex" "^5.0.2" -cssnano-preset-default@^5.1.12: - version "5.1.12" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.12.tgz#64e2ad8e27a279e1413d2d2383ef89a41c909be9" - integrity sha512-rO/JZYyjW1QNkWBxMGV28DW7d98UDLaF759frhli58QFehZ+D/LSmwQ2z/ylBAe2hUlsIWTq6NYGfQPq65EF9w== +"cssnano-preset-default@^5.1.12": + "integrity" "sha512-rO/JZYyjW1QNkWBxMGV28DW7d98UDLaF759frhli58QFehZ+D/LSmwQ2z/ylBAe2hUlsIWTq6NYGfQPq65EF9w==" + "resolved" "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.12.tgz" + "version" "5.1.12" dependencies: - css-declaration-sorter "^6.0.3" - cssnano-utils "^3.0.2" - postcss-calc "^8.2.0" - postcss-colormin "^5.2.5" - postcss-convert-values "^5.0.4" - postcss-discard-comments "^5.0.3" - postcss-discard-duplicates "^5.0.3" - postcss-discard-empty "^5.0.3" - postcss-discard-overridden "^5.0.4" - postcss-merge-longhand "^5.0.6" - postcss-merge-rules "^5.0.6" - postcss-minify-font-values "^5.0.4" - postcss-minify-gradients "^5.0.6" - postcss-minify-params "^5.0.5" - postcss-minify-selectors "^5.1.3" - postcss-normalize-charset "^5.0.3" - postcss-normalize-display-values "^5.0.3" - postcss-normalize-positions "^5.0.4" - postcss-normalize-repeat-style "^5.0.4" - postcss-normalize-string "^5.0.4" - postcss-normalize-timing-functions "^5.0.3" - postcss-normalize-unicode "^5.0.4" - postcss-normalize-url "^5.0.5" - postcss-normalize-whitespace "^5.0.4" - postcss-ordered-values "^5.0.5" - postcss-reduce-initial "^5.0.3" - postcss-reduce-transforms "^5.0.4" - postcss-svgo "^5.0.4" - postcss-unique-selectors "^5.0.4" + "css-declaration-sorter" "^6.0.3" + "cssnano-utils" "^3.0.2" + "postcss-calc" "^8.2.0" + "postcss-colormin" "^5.2.5" + "postcss-convert-values" "^5.0.4" + "postcss-discard-comments" "^5.0.3" + "postcss-discard-duplicates" "^5.0.3" + "postcss-discard-empty" "^5.0.3" + "postcss-discard-overridden" "^5.0.4" + "postcss-merge-longhand" "^5.0.6" + "postcss-merge-rules" "^5.0.6" + "postcss-minify-font-values" "^5.0.4" + "postcss-minify-gradients" "^5.0.6" + "postcss-minify-params" "^5.0.5" + "postcss-minify-selectors" "^5.1.3" + "postcss-normalize-charset" "^5.0.3" + "postcss-normalize-display-values" "^5.0.3" + "postcss-normalize-positions" "^5.0.4" + "postcss-normalize-repeat-style" "^5.0.4" + "postcss-normalize-string" "^5.0.4" + "postcss-normalize-timing-functions" "^5.0.3" + "postcss-normalize-unicode" "^5.0.4" + "postcss-normalize-url" "^5.0.5" + "postcss-normalize-whitespace" "^5.0.4" + "postcss-ordered-values" "^5.0.5" + "postcss-reduce-initial" "^5.0.3" + "postcss-reduce-transforms" "^5.0.4" + "postcss-svgo" "^5.0.4" + "postcss-unique-selectors" "^5.0.4" -cssnano-utils@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.0.2.tgz#d82b4991a27ba6fec644b39bab35fe027137f516" - integrity sha512-KhprijuQv2sP4kT92sSQwhlK3SJTbDIsxcfIEySB0O+3m9esFOai7dP9bMx5enHAh2MwarVIcnwiWoOm01RIbQ== +"cssnano-utils@^3.0.2": + "integrity" "sha512-KhprijuQv2sP4kT92sSQwhlK3SJTbDIsxcfIEySB0O+3m9esFOai7dP9bMx5enHAh2MwarVIcnwiWoOm01RIbQ==" + "resolved" "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.0.2.tgz" + "version" "3.0.2" -cssnano@^5.0.6, cssnano@^5.0.8: - version "5.0.17" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.17.tgz#ff45713c05cfc780a1aeb3e663b6f224d091cabf" - integrity sha512-fmjLP7k8kL18xSspeXTzRhaFtRI7DL9b8IcXR80JgtnWBpvAzHT7sCR/6qdn0tnxIaINUN6OEQu83wF57Gs3Xw== +"cssnano@^5.0.6", "cssnano@^5.0.8": + "integrity" "sha512-fmjLP7k8kL18xSspeXTzRhaFtRI7DL9b8IcXR80JgtnWBpvAzHT7sCR/6qdn0tnxIaINUN6OEQu83wF57Gs3Xw==" + "resolved" "https://registry.npmjs.org/cssnano/-/cssnano-5.0.17.tgz" + "version" "5.0.17" dependencies: - cssnano-preset-default "^5.1.12" - lilconfig "^2.0.3" - yaml "^1.10.2" + "cssnano-preset-default" "^5.1.12" + "lilconfig" "^2.0.3" + "yaml" "^1.10.2" -csso@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" - integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== +"csso@^4.2.0": + "integrity" "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==" + "resolved" "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz" + "version" "4.2.0" dependencies: - css-tree "^1.1.2" + "css-tree" "^1.1.2" -csstype@^3.0.2: - version "3.0.10" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" - integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA== +"csstype@^3.0.2": + "integrity" "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==" + "resolved" "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz" + "version" "3.0.10" -debug@2.6.9, debug@^2.6.0: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== +"debug@^2.6.0", "debug@2.6.9": + "integrity" "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==" + "resolved" "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" + "version" "2.6.9" dependencies: - ms "2.0.0" + "ms" "2.0.0" -debug@^3.1.1: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== +"debug@^3.1.1": + "integrity" "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==" + "resolved" "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" + "version" "3.2.7" dependencies: - ms "^2.1.1" + "ms" "^2.1.1" -debug@^4.1.0, debug@^4.1.1: - version "4.3.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== +"debug@^4.1.0": + "integrity" "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==" + "resolved" "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz" + "version" "4.3.3" dependencies: - ms "2.1.2" + "ms" "2.1.2" -decompress-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= +"debug@^4.1.1": + "integrity" "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==" + "resolved" "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz" + "version" "4.3.3" dependencies: - mimic-response "^1.0.0" + "ms" "2.1.2" -deep-equal@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" - integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== +"decompress-response@^3.3.0": + "integrity" "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=" + "resolved" "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz" + "version" "3.3.0" dependencies: - is-arguments "^1.0.4" - is-date-object "^1.0.1" - is-regex "^1.0.4" - object-is "^1.0.1" - object-keys "^1.1.1" - regexp.prototype.flags "^1.2.0" + "mimic-response" "^1.0.0" -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - -deepmerge@^1.3.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753" - integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ== - -deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== - -default-gateway@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" - integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg== +"deep-equal@^1.0.1": + "integrity" "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==" + "resolved" "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz" + "version" "1.1.1" dependencies: - execa "^5.0.0" + "is-arguments" "^1.0.4" + "is-date-object" "^1.0.1" + "is-regex" "^1.0.4" + "object-is" "^1.0.1" + "object-keys" "^1.1.1" + "regexp.prototype.flags" "^1.2.0" -defer-to-connect@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" - integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== +"deep-extend@^0.6.0": + "integrity" "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" + "resolved" "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz" + "version" "0.6.0" -define-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== +"deepmerge@^1.3.2": + "integrity" "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==" + "resolved" "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz" + "version" "1.5.2" -define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== +"deepmerge@^4.2.2": + "integrity" "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" + "resolved" "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz" + "version" "4.2.2" + +"default-gateway@^6.0.3": + "integrity" "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==" + "resolved" "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz" + "version" "6.0.3" dependencies: - object-keys "^1.0.12" + "execa" "^5.0.0" -del@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" - integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ== +"defer-to-connect@^1.0.1": + "integrity" "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" + "resolved" "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz" + "version" "1.1.3" + +"define-lazy-prop@^2.0.0": + "integrity" "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==" + "resolved" "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz" + "version" "2.0.0" + +"define-properties@^1.1.3": + "integrity" "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==" + "resolved" "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz" + "version" "1.1.3" dependencies: - globby "^11.0.1" - graceful-fs "^4.2.4" - is-glob "^4.0.1" - is-path-cwd "^2.2.0" - is-path-inside "^3.0.2" - p-map "^4.0.0" - rimraf "^3.0.2" - slash "^3.0.0" + "object-keys" "^1.0.12" -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= - -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= - -detab@2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/detab/-/detab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" - integrity sha512-8zdsQA5bIkoRECvCrNKPla84lyoR7DSAyf7p0YgXzBO9PDJx8KntPUay7NS6yp+KdxdVtiE5SpHKtbp2ZQyA9g== +"del@^6.0.0": + "integrity" "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==" + "resolved" "https://registry.npmjs.org/del/-/del-6.0.0.tgz" + "version" "6.0.0" dependencies: - repeat-string "^1.5.4" + "globby" "^11.0.1" + "graceful-fs" "^4.2.4" + "is-glob" "^4.0.1" + "is-path-cwd" "^2.2.0" + "is-path-inside" "^3.0.2" + "p-map" "^4.0.0" + "rimraf" "^3.0.2" + "slash" "^3.0.0" -detect-node@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" - integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== +"depd@~1.1.2": + "integrity" "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + "resolved" "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" + "version" "1.1.2" -detect-port-alt@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275" - integrity sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q== +"destroy@~1.0.4": + "integrity" "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + "resolved" "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz" + "version" "1.0.4" + +"detab@2.0.4": + "integrity" "sha512-8zdsQA5bIkoRECvCrNKPla84lyoR7DSAyf7p0YgXzBO9PDJx8KntPUay7NS6yp+KdxdVtiE5SpHKtbp2ZQyA9g==" + "resolved" "https://registry.npmjs.org/detab/-/detab-2.0.4.tgz" + "version" "2.0.4" dependencies: - address "^1.0.1" - debug "^2.6.0" + "repeat-string" "^1.5.4" -detect-port@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.3.0.tgz#d9c40e9accadd4df5cac6a782aefd014d573d1f1" - integrity sha512-E+B1gzkl2gqxt1IhUzwjrxBKRqx1UzC3WLONHinn8S3T6lwV/agVCyitiFOsGJ/eYuEUBvD71MZHy3Pv1G9doQ== +"detect-node@^2.0.4": + "integrity" "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==" + "resolved" "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz" + "version" "2.1.0" + +"detect-port-alt@^1.1.6": + "integrity" "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==" + "resolved" "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz" + "version" "1.1.6" dependencies: - address "^1.0.1" - debug "^2.6.0" + "address" "^1.0.1" + "debug" "^2.6.0" -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== +"detect-port@^1.3.0": + "integrity" "sha512-E+B1gzkl2gqxt1IhUzwjrxBKRqx1UzC3WLONHinn8S3T6lwV/agVCyitiFOsGJ/eYuEUBvD71MZHy3Pv1G9doQ==" + "resolved" "https://registry.npmjs.org/detect-port/-/detect-port-1.3.0.tgz" + "version" "1.3.0" dependencies: - path-type "^4.0.0" + "address" "^1.0.1" + "debug" "^2.6.0" -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= - -dns-packet@^1.3.1: - version "1.3.4" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" - integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA== +"dir-glob@^3.0.1": + "integrity" "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==" + "resolved" "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz" + "version" "3.0.1" dependencies: - ip "^1.1.0" - safe-buffer "^5.0.1" + "path-type" "^4.0.0" -dns-txt@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" - integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= +"dns-equal@^1.0.0": + "integrity" "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=" + "resolved" "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz" + "version" "1.0.0" + +"dns-packet@^1.3.1": + "integrity" "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==" + "resolved" "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz" + "version" "1.3.4" dependencies: - buffer-indexof "^1.0.0" + "ip" "^1.1.0" + "safe-buffer" "^5.0.1" -dom-converter@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" - integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA== +"dns-txt@^2.0.2": + "integrity" "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=" + "resolved" "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz" + "version" "2.0.2" dependencies: - utila "~0.4" + "buffer-indexof" "^1.0.0" -dom-serializer@0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" - integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== +"dom-converter@^0.2.0": + "integrity" "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==" + "resolved" "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz" + "version" "0.2.0" dependencies: - domelementtype "^2.0.1" - entities "^2.0.0" + "utila" "~0.4" -dom-serializer@^1.0.1, dom-serializer@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" - integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== +"dom-serializer@^1.0.1": + "integrity" "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==" + "resolved" "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz" + "version" "1.3.2" dependencies: - domelementtype "^2.0.1" - domhandler "^4.2.0" - entities "^2.0.0" + "domelementtype" "^2.0.1" + "domhandler" "^4.2.0" + "entities" "^2.0.0" -dom-serializer@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" - integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA== +"dom-serializer@^1.3.2": + "integrity" "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==" + "resolved" "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz" + "version" "1.3.2" dependencies: - domelementtype "^1.3.0" - entities "^1.1.1" + "domelementtype" "^2.0.1" + "domhandler" "^4.2.0" + "entities" "^2.0.0" -domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" - integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== - -domelementtype@^2.0.1, domelementtype@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" - integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== - -domhandler@^2.3.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" - integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA== +"dom-serializer@~0.1.0": + "integrity" "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==" + "resolved" "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz" + "version" "0.1.1" dependencies: - domelementtype "1" + "domelementtype" "^1.3.0" + "entities" "^1.1.1" -domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626" - integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g== +"dom-serializer@0": + "integrity" "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==" + "resolved" "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz" + "version" "0.2.2" dependencies: - domelementtype "^2.2.0" + "domelementtype" "^2.0.1" + "entities" "^2.0.0" -domutils@1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" - integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8= +"domelementtype@^1.3.0", "domelementtype@^1.3.1", "domelementtype@1": + "integrity" "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" + "resolved" "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz" + "version" "1.3.1" + +"domelementtype@^2.0.1", "domelementtype@^2.2.0": + "integrity" "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==" + "resolved" "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz" + "version" "2.2.0" + +"domhandler@^2.3.0": + "integrity" "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==" + "resolved" "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz" + "version" "2.4.2" dependencies: - dom-serializer "0" - domelementtype "1" + "domelementtype" "1" -domutils@^1.5.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" - integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== +"domhandler@^4.0.0", "domhandler@^4.2.0", "domhandler@^4.3.0": + "integrity" "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==" + "resolved" "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz" + "version" "4.3.0" dependencies: - dom-serializer "0" - domelementtype "1" + "domelementtype" "^2.2.0" -domutils@^2.5.2, domutils@^2.7.0, domutils@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" - integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== +"domutils@^1.5.1": + "integrity" "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==" + "resolved" "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz" + "version" "1.7.0" dependencies: - dom-serializer "^1.0.1" - domelementtype "^2.2.0" - domhandler "^4.2.0" + "dom-serializer" "0" + "domelementtype" "1" -dot-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" - integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== +"domutils@^2.5.2", "domutils@^2.7.0", "domutils@^2.8.0": + "integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==" + "resolved" "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz" + "version" "2.8.0" dependencies: - no-case "^3.0.4" - tslib "^2.0.3" + "dom-serializer" "^1.0.1" + "domelementtype" "^2.2.0" + "domhandler" "^4.2.0" -dot-prop@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" - integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== +"domutils@1.5.1": + "integrity" "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=" + "resolved" "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz" + "version" "1.5.1" dependencies: - is-obj "^2.0.0" + "dom-serializer" "0" + "domelementtype" "1" -duplexer3@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" - integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= - -duplexer@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" - integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= - -electron-to-chromium@^1.4.17: - version "1.4.71" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz#17056914465da0890ce00351a3b946fd4cd51ff6" - integrity sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw== - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -emojis-list@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" - integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== - -emoticon@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/emoticon/-/emoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" - integrity sha512-SNujglcLTTg+lDAcApPNgEdudaqQFiAbJCqzjNxJkvN9vAwCGi0uu8IUVvx+f16h+V44KCY6Y2yboroc9pilHg== - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= - -end-of-stream@^1.1.0: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== +"dot-case@^3.0.4": + "integrity" "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==" + "resolved" "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz" + "version" "3.0.4" dependencies: - once "^1.4.0" + "no-case" "^3.0.4" + "tslib" "^2.0.3" -enhanced-resolve@^5.8.3: - version "5.9.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.0.tgz#49ac24953ac8452ed8fed2ef1340fc8e043667ee" - integrity sha512-weDYmzbBygL7HzGGS26M3hGQx68vehdEg6VUmqSOaFzXExFqlnKuSvsEJCVGQHScS8CQMbrAqftT+AzzHNt/YA== +"dot-prop@^5.2.0": + "integrity" "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==" + "resolved" "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz" + "version" "5.3.0" dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" + "is-obj" "^2.0.0" -entities@^1.1.1, entities@~1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" - integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== +"duplexer@^0.1.2": + "integrity" "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==" + "resolved" "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz" + "version" "0.1.2" -entities@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" - integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== +"duplexer3@^0.1.4": + "integrity" "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" + "resolved" "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz" + "version" "0.1.4" -entities@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4" - integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== +"ee-first@1.1.1": + "integrity" "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + "resolved" "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" + "version" "1.1.1" -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== +"electron-to-chromium@^1.4.284": + "integrity" "sha512-DE9tTy2PNmy1v55AZAO542ui+MLC2cvINMK4P2LXGsJdput/ThVG9t+QGecPuAZZSgC8XoI+Jh9M1OG9IoNSCw==" + "resolved" "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.328.tgz" + "version" "1.4.328" + +"emoji-regex@^8.0.0": + "integrity" "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "resolved" "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz" + "version" "8.0.0" + +"emojis-list@^3.0.0": + "integrity" "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" + "resolved" "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz" + "version" "3.0.0" + +"emoticon@^3.2.0": + "integrity" "sha512-SNujglcLTTg+lDAcApPNgEdudaqQFiAbJCqzjNxJkvN9vAwCGi0uu8IUVvx+f16h+V44KCY6Y2yboroc9pilHg==" + "resolved" "https://registry.npmjs.org/emoticon/-/emoticon-3.2.0.tgz" + "version" "3.2.0" + +"encodeurl@~1.0.2": + "integrity" "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + "resolved" "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz" + "version" "1.0.2" + +"end-of-stream@^1.1.0": + "integrity" "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==" + "resolved" "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz" + "version" "1.4.4" dependencies: - is-arrayish "^0.2.1" + "once" "^1.4.0" -es-module-lexer@^0.9.0: - version "0.9.3" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" - integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-goat@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" - integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== - -escape-html@^1.0.3, escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -eslint-scope@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== +"enhanced-resolve@^5.8.3": + "integrity" "sha512-weDYmzbBygL7HzGGS26M3hGQx68vehdEg6VUmqSOaFzXExFqlnKuSvsEJCVGQHScS8CQMbrAqftT+AzzHNt/YA==" + "resolved" "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.0.tgz" + "version" "5.9.0" dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" + "graceful-fs" "^4.2.4" + "tapable" "^2.2.0" -esprima@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== +"entities@^1.1.1", "entities@~1.1.1": + "integrity" "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" + "resolved" "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz" + "version" "1.1.2" -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== +"entities@^2.0.0": + "integrity" "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" + "resolved" "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz" + "version" "2.2.0" + +"entities@^3.0.1": + "integrity" "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==" + "resolved" "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz" + "version" "3.0.1" + +"error-ex@^1.3.1": + "integrity" "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==" + "resolved" "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz" + "version" "1.3.2" dependencies: - estraverse "^5.2.0" + "is-arrayish" "^0.2.1" -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== +"es-module-lexer@^0.9.0": + "integrity" "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==" + "resolved" "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz" + "version" "0.9.3" -estraverse@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== +"escalade@^3.1.1": + "integrity" "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + "resolved" "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz" + "version" "3.1.1" -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== +"escape-goat@^2.0.0": + "integrity" "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==" + "resolved" "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz" + "version" "2.1.1" -eta@^1.12.3: - version "1.12.3" - resolved "https://registry.yarnpkg.com/eta/-/eta-1.12.3.tgz#2982d08adfbef39f9fa50e2fbd42d7337e7338b1" - integrity sha512-qHixwbDLtekO/d51Yr4glcaUJCIjGVJyTzuqV4GPlgZo1YpgOKG+avQynErZIYrfM6JIJdtiG2Kox8tbb+DoGg== +"escape-html@^1.0.3", "escape-html@~1.0.3": + "integrity" "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + "resolved" "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" + "version" "1.0.3" -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= +"escape-string-regexp@^1.0.5": + "integrity" "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==" + "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + "version" "1.0.5" -eval@^0.1.4: - version "0.1.6" - resolved "https://registry.yarnpkg.com/eval/-/eval-0.1.6.tgz#9620d7d8c85515e97e6b47c5814f46ae381cb3cc" - integrity sha512-o0XUw+5OGkXw4pJZzQoXUk+H87DHuC+7ZE//oSrRGtatTmr12oTnLfg6QOq9DyTt0c/p4TwzgmkKrBzWTSizyQ== +"escape-string-regexp@^4.0.0": + "integrity" "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" + "version" "4.0.0" + +"eslint-scope@5.1.1": + "integrity" "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==" + "resolved" "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz" + "version" "5.1.1" dependencies: - require-like ">= 0.1.1" + "esrecurse" "^4.3.0" + "estraverse" "^4.1.1" -eventemitter3@^4.0.0: - version "4.0.7" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" - integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== +"esprima@^4.0.0": + "integrity" "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + "resolved" "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz" + "version" "4.0.1" -events@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== +"esrecurse@^4.3.0": + "integrity" "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==" + "resolved" "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz" + "version" "4.3.0" dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" + "estraverse" "^5.2.0" -express@^4.17.1: - version "4.17.3" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1" - integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg== +"estraverse@^4.1.1": + "integrity" "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" + "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz" + "version" "4.3.0" + +"estraverse@^5.2.0": + "integrity" "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" + "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz" + "version" "5.3.0" + +"esutils@^2.0.2": + "integrity" "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" + "resolved" "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz" + "version" "2.0.3" + +"eta@^1.12.3": + "integrity" "sha512-qHixwbDLtekO/d51Yr4glcaUJCIjGVJyTzuqV4GPlgZo1YpgOKG+avQynErZIYrfM6JIJdtiG2Kox8tbb+DoGg==" + "resolved" "https://registry.npmjs.org/eta/-/eta-1.12.3.tgz" + "version" "1.12.3" + +"etag@~1.8.1": + "integrity" "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + "resolved" "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz" + "version" "1.8.1" + +"eval@^0.1.4": + "integrity" "sha512-o0XUw+5OGkXw4pJZzQoXUk+H87DHuC+7ZE//oSrRGtatTmr12oTnLfg6QOq9DyTt0c/p4TwzgmkKrBzWTSizyQ==" + "resolved" "https://registry.npmjs.org/eval/-/eval-0.1.6.tgz" + "version" "0.1.6" dependencies: - accepts "~1.3.8" - array-flatten "1.1.1" - body-parser "1.19.2" - content-disposition "0.5.4" - content-type "~1.0.4" - cookie "0.4.2" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "~1.1.2" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.7" - qs "6.9.7" - range-parser "~1.2.1" - safe-buffer "5.2.1" - send "0.17.2" - serve-static "1.14.2" - setprototypeof "1.2.0" - statuses "~1.5.0" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" + "require-like" ">= 0.1.1" -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= +"eventemitter3@^4.0.0": + "integrity" "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" + "resolved" "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz" + "version" "4.0.7" + +"events@^3.2.0": + "integrity" "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" + "resolved" "https://registry.npmjs.org/events/-/events-3.3.0.tgz" + "version" "3.3.0" + +"execa@^5.0.0": + "integrity" "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==" + "resolved" "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz" + "version" "5.1.1" dependencies: - is-extendable "^0.1.0" + "cross-spawn" "^7.0.3" + "get-stream" "^6.0.0" + "human-signals" "^2.1.0" + "is-stream" "^2.0.0" + "merge-stream" "^2.0.0" + "npm-run-path" "^4.0.1" + "onetime" "^5.1.2" + "signal-exit" "^3.0.3" + "strip-final-newline" "^2.0.0" -extend@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== +"express@^4.17.1": + "integrity" "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==" + "resolved" "https://registry.npmjs.org/express/-/express-4.17.3.tgz" + "version" "4.17.3" + dependencies: + "accepts" "~1.3.8" + "array-flatten" "1.1.1" + "body-parser" "1.19.2" + "content-disposition" "0.5.4" + "content-type" "~1.0.4" + "cookie" "0.4.2" + "cookie-signature" "1.0.6" + "debug" "2.6.9" + "depd" "~1.1.2" + "encodeurl" "~1.0.2" + "escape-html" "~1.0.3" + "etag" "~1.8.1" + "finalhandler" "~1.1.2" + "fresh" "0.5.2" + "merge-descriptors" "1.0.1" + "methods" "~1.1.2" + "on-finished" "~2.3.0" + "parseurl" "~1.3.3" + "path-to-regexp" "0.1.7" + "proxy-addr" "~2.0.7" + "qs" "6.9.7" + "range-parser" "~1.2.1" + "safe-buffer" "5.2.1" + "send" "0.17.2" + "serve-static" "1.14.2" + "setprototypeof" "1.2.0" + "statuses" "~1.5.0" + "type-is" "~1.6.18" + "utils-merge" "1.0.1" + "vary" "~1.1.2" -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== +"extend-shallow@^2.0.1": + "integrity" "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=" + "resolved" "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz" + "version" "2.0.1" + dependencies: + "is-extendable" "^0.1.0" -fast-glob@^3.2.7, fast-glob@^3.2.9: - version "3.2.11" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" - integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== +"extend@^3.0.0": + "integrity" "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + "resolved" "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz" + "version" "3.0.2" + +"fast-deep-equal@^3.1.1", "fast-deep-equal@^3.1.3": + "integrity" "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "resolved" "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz" + "version" "3.1.3" + +"fast-glob@^3.2.7", "fast-glob@^3.2.9": + "integrity" "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==" + "resolved" "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz" + "version" "3.2.11" dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" + "glob-parent" "^5.1.2" + "merge2" "^1.3.0" + "micromatch" "^4.0.4" -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== +"fast-json-stable-stringify@^2.0.0": + "integrity" "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "resolved" "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz" + "version" "2.1.0" -fast-url-parser@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" - integrity sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0= +"fast-url-parser@1.1.3": + "integrity" "sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0=" + "resolved" "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz" + "version" "1.1.3" dependencies: - punycode "^1.3.2" + "punycode" "^1.3.2" -fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== +"fastq@^1.6.0": + "integrity" "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==" + "resolved" "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz" + "version" "1.13.0" dependencies: - reusify "^1.0.4" + "reusify" "^1.0.4" -faye-websocket@^0.11.3: - version "0.11.4" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" - integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== +"faye-websocket@^0.11.3": + "integrity" "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==" + "resolved" "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz" + "version" "0.11.4" dependencies: - websocket-driver ">=0.5.1" + "websocket-driver" ">=0.5.1" -fbemitter@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/fbemitter/-/fbemitter-3.0.0.tgz#00b2a1af5411254aab416cd75f9e6289bee4bff3" - integrity sha512-KWKaceCwKQU0+HPoop6gn4eOHk50bBv/VxjJtGMfwmJt3D29JpN4H4eisCtIPA+a8GVBam+ldMMpMjJUvpDyHw== +"fbemitter@^3.0.0": + "integrity" "sha512-KWKaceCwKQU0+HPoop6gn4eOHk50bBv/VxjJtGMfwmJt3D29JpN4H4eisCtIPA+a8GVBam+ldMMpMjJUvpDyHw==" + "resolved" "https://registry.npmjs.org/fbemitter/-/fbemitter-3.0.0.tgz" + "version" "3.0.0" dependencies: - fbjs "^3.0.0" + "fbjs" "^3.0.0" -fbjs-css-vars@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8" - integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ== +"fbjs-css-vars@^1.0.0": + "integrity" "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==" + "resolved" "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz" + "version" "1.0.2" -fbjs@^3.0.0, fbjs@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.4.tgz#e1871c6bd3083bac71ff2da868ad5067d37716c6" - integrity sha512-ucV0tDODnGV3JCnnkmoszb5lf4bNpzjv80K41wd4k798Etq+UYD0y0TIfalLjZoKgjive6/adkRnszwapiDgBQ== +"fbjs@^3.0.0", "fbjs@^3.0.1": + "integrity" "sha512-ucV0tDODnGV3JCnnkmoszb5lf4bNpzjv80K41wd4k798Etq+UYD0y0TIfalLjZoKgjive6/adkRnszwapiDgBQ==" + "resolved" "https://registry.npmjs.org/fbjs/-/fbjs-3.0.4.tgz" + "version" "3.0.4" dependencies: - cross-fetch "^3.1.5" - fbjs-css-vars "^1.0.0" - loose-envify "^1.0.0" - object-assign "^4.1.0" - promise "^7.1.1" - setimmediate "^1.0.5" - ua-parser-js "^0.7.30" + "cross-fetch" "^3.1.5" + "fbjs-css-vars" "^1.0.0" + "loose-envify" "^1.0.0" + "object-assign" "^4.1.0" + "promise" "^7.1.1" + "setimmediate" "^1.0.5" + "ua-parser-js" "^0.7.30" -feed@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/feed/-/feed-4.2.2.tgz#865783ef6ed12579e2c44bbef3c9113bc4956a7e" - integrity sha512-u5/sxGfiMfZNtJ3OvQpXcvotFpYkL0n9u9mM2vkui2nGo8b4wvDkJ8gAkYqbA8QpGyFCv3RK0Z+Iv+9veCS9bQ== +"feed@^4.2.2": + "integrity" "sha512-u5/sxGfiMfZNtJ3OvQpXcvotFpYkL0n9u9mM2vkui2nGo8b4wvDkJ8gAkYqbA8QpGyFCv3RK0Z+Iv+9veCS9bQ==" + "resolved" "https://registry.npmjs.org/feed/-/feed-4.2.2.tgz" + "version" "4.2.2" dependencies: - xml-js "^1.6.11" + "xml-js" "^1.6.11" -file-loader@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" - integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw== +"file-loader@*", "file-loader@^6.2.0": + "integrity" "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==" + "resolved" "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz" + "version" "6.2.0" dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" + "loader-utils" "^2.0.0" + "schema-utils" "^3.0.0" -filesize@^8.0.6: - version "8.0.7" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.7.tgz#695e70d80f4e47012c132d57a059e80c6b580bd8" - integrity sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ== +"filesize@^8.0.6": + "integrity" "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==" + "resolved" "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz" + "version" "8.0.7" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +"fill-range@^7.0.1": + "integrity" "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==" + "resolved" "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz" + "version" "7.0.1" dependencies: - to-regex-range "^5.0.1" + "to-regex-range" "^5.0.1" -finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== +"finalhandler@~1.1.2": + "integrity" "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==" + "resolved" "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz" + "version" "1.1.2" dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" - unpipe "~1.0.0" + "debug" "2.6.9" + "encodeurl" "~1.0.2" + "escape-html" "~1.0.3" + "on-finished" "~2.3.0" + "parseurl" "~1.3.3" + "statuses" "~1.5.0" + "unpipe" "~1.0.0" -find-cache-dir@^3.3.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" - integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== +"find-cache-dir@^3.3.1": + "integrity" "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==" + "resolved" "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz" + "version" "3.3.2" dependencies: - commondir "^1.0.1" - make-dir "^3.0.2" - pkg-dir "^4.1.0" + "commondir" "^1.0.1" + "make-dir" "^3.0.2" + "pkg-dir" "^4.1.0" -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== +"find-up@^3.0.0": + "integrity" "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==" + "resolved" "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz" + "version" "3.0.0" dependencies: - locate-path "^3.0.0" + "locate-path" "^3.0.0" -find-up@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== +"find-up@^4.0.0": + "integrity" "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==" + "resolved" "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz" + "version" "4.1.0" dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" + "locate-path" "^5.0.0" + "path-exists" "^4.0.0" -find-up@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== +"find-up@^5.0.0": + "integrity" "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==" + "resolved" "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz" + "version" "5.0.0" dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" + "locate-path" "^6.0.0" + "path-exists" "^4.0.0" -flux@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/flux/-/flux-4.0.3.tgz#573b504a24982c4768fdfb59d8d2ea5637d72ee7" - integrity sha512-yKAbrp7JhZhj6uiT1FTuVMlIAT1J4jqEyBpFApi1kxpGZCvacMVc/t1pMQyotqHhAgvoE3bNvAykhCo2CLjnYw== +"flux@^4.0.1": + "integrity" "sha512-yKAbrp7JhZhj6uiT1FTuVMlIAT1J4jqEyBpFApi1kxpGZCvacMVc/t1pMQyotqHhAgvoE3bNvAykhCo2CLjnYw==" + "resolved" "https://registry.npmjs.org/flux/-/flux-4.0.3.tgz" + "version" "4.0.3" dependencies: - fbemitter "^3.0.0" - fbjs "^3.0.1" + "fbemitter" "^3.0.0" + "fbjs" "^3.0.1" -follow-redirects@^1.0.0, follow-redirects@^1.14.7: - version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" - integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== +"follow-redirects@^1.0.0", "follow-redirects@^1.14.7": + "integrity" "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==" + "resolved" "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz" + "version" "1.14.9" -fork-ts-checker-webpack-plugin@^6.5.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz#0282b335fa495a97e167f69018f566ea7d2a2b5e" - integrity sha512-cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw== +"fork-ts-checker-webpack-plugin@^6.5.0": + "integrity" "sha512-cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw==" + "resolved" "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz" + "version" "6.5.0" dependencies: "@babel/code-frame" "^7.8.3" "@types/json-schema" "^7.0.5" - chalk "^4.1.0" - chokidar "^3.4.2" - cosmiconfig "^6.0.0" - deepmerge "^4.2.2" - fs-extra "^9.0.0" - glob "^7.1.6" - memfs "^3.1.2" - minimatch "^3.0.4" - schema-utils "2.7.0" - semver "^7.3.2" - tapable "^1.0.0" + "chalk" "^4.1.0" + "chokidar" "^3.4.2" + "cosmiconfig" "^6.0.0" + "deepmerge" "^4.2.2" + "fs-extra" "^9.0.0" + "glob" "^7.1.6" + "memfs" "^3.1.2" + "minimatch" "^3.0.4" + "schema-utils" "2.7.0" + "semver" "^7.3.2" + "tapable" "^1.0.0" -forwarded@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" - integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== +"forwarded@0.2.0": + "integrity" "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" + "resolved" "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz" + "version" "0.2.0" -fraction.js@^4.1.2: - version "4.1.3" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.3.tgz#be65b0f20762ef27e1e793860bc2dfb716e99e65" - integrity sha512-pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg== +"fraction.js@^4.1.2": + "integrity" "sha512-pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg==" + "resolved" "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.3.tgz" + "version" "4.1.3" -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= +"fresh@0.5.2": + "integrity" "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + "resolved" "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz" + "version" "0.5.2" -fs-extra@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1" - integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ== +"fs-extra@^10.0.0": + "integrity" "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==" + "resolved" "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz" + "version" "10.0.0" dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" + "graceful-fs" "^4.2.0" + "jsonfile" "^6.0.1" + "universalify" "^2.0.0" -fs-extra@^9.0.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== +"fs-extra@^9.0.0": + "integrity" "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==" + "resolved" "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz" + "version" "9.1.0" dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" + "at-least-node" "^1.0.0" + "graceful-fs" "^4.2.0" + "jsonfile" "^6.0.1" + "universalify" "^2.0.0" -fs-monkey@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" - integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== +"fs-monkey@1.0.3": + "integrity" "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==" + "resolved" "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz" + "version" "1.0.3" -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +"fs.realpath@^1.0.0": + "integrity" "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" + "version" "1.0.0" -fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== +"function-bind@^1.1.1": + "integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" + "version" "1.1.1" -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +"gensync@^1.0.0-beta.1", "gensync@^1.0.0-beta.2": + "integrity" "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" + "resolved" "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz" + "version" "1.0.0-beta.2" -gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: - version "1.0.0-beta.2" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" - integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== - -get-intrinsic@^1.0.2: - version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" - integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== +"get-intrinsic@^1.0.2": + "integrity" "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==" + "resolved" "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz" + "version" "1.1.1" dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" + "function-bind" "^1.1.1" + "has" "^1.0.3" + "has-symbols" "^1.0.1" -get-own-enumerable-property-symbols@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" - integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== +"get-own-enumerable-property-symbols@^3.0.0": + "integrity" "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==" + "resolved" "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz" + "version" "3.0.2" -get-stream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== +"get-stream@^4.1.0": + "integrity" "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==" + "resolved" "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz" + "version" "4.1.0" dependencies: - pump "^3.0.0" + "pump" "^3.0.0" -get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== +"get-stream@^5.1.0": + "integrity" "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==" + "resolved" "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz" + "version" "5.2.0" dependencies: - pump "^3.0.0" + "pump" "^3.0.0" -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== +"get-stream@^6.0.0": + "integrity" "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" + "resolved" "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz" + "version" "6.0.1" -github-slugger@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" - integrity sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ== +"github-slugger@^1.4.0": + "integrity" "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==" + "resolved" "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz" + "version" "1.4.0" -glob-parent@^5.1.2, glob-parent@~5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== +"glob-parent@^5.1.2", "glob-parent@~5.1.2": + "integrity" "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==" + "resolved" "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" + "version" "5.1.2" dependencies: - is-glob "^4.0.1" + "is-glob" "^4.0.1" -glob-parent@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" - integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== +"glob-parent@^6.0.1": + "integrity" "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==" + "resolved" "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz" + "version" "6.0.2" dependencies: - is-glob "^4.0.3" + "is-glob" "^4.0.3" -glob-to-regexp@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== +"glob-to-regexp@^0.4.1": + "integrity" "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + "resolved" "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz" + "version" "0.4.1" -glob@^7.0.0, glob@^7.1.3, glob@^7.1.6: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== +"glob@^7.0.0", "glob@^7.1.3", "glob@^7.1.6": + "integrity" "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==" + "resolved" "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz" + "version" "7.2.0" dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" + "fs.realpath" "^1.0.0" + "inflight" "^1.0.4" + "inherits" "2" + "minimatch" "^3.0.4" + "once" "^1.3.0" + "path-is-absolute" "^1.0.0" -global-dirs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" - integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== +"global-dirs@^3.0.0": + "integrity" "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==" + "resolved" "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz" + "version" "3.0.0" dependencies: - ini "2.0.0" + "ini" "2.0.0" -global-modules@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" - integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== +"global-modules@^2.0.0": + "integrity" "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==" + "resolved" "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz" + "version" "2.0.0" dependencies: - global-prefix "^3.0.0" + "global-prefix" "^3.0.0" -global-prefix@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" - integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== +"global-prefix@^3.0.0": + "integrity" "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==" + "resolved" "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz" + "version" "3.0.0" dependencies: - ini "^1.3.5" - kind-of "^6.0.2" - which "^1.3.1" + "ini" "^1.3.5" + "kind-of" "^6.0.2" + "which" "^1.3.1" -globals@^11.1.0: - version "11.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" - integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== +"globals@^11.1.0": + "integrity" "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" + "resolved" "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz" + "version" "11.12.0" -globby@^11.0.1, globby@^11.0.2, globby@^11.0.4: - version "11.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" - integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== +"globby@^11.0.1", "globby@^11.0.2", "globby@^11.0.4": + "integrity" "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==" + "resolved" "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz" + "version" "11.1.0" dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.2.9" - ignore "^5.2.0" - merge2 "^1.4.1" - slash "^3.0.0" + "array-union" "^2.1.0" + "dir-glob" "^3.0.1" + "fast-glob" "^3.2.9" + "ignore" "^5.2.0" + "merge2" "^1.4.1" + "slash" "^3.0.0" -globby@^12.0.2: - version "12.2.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-12.2.0.tgz#2ab8046b4fba4ff6eede835b29f678f90e3d3c22" - integrity sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA== +"globby@^12.0.2": + "integrity" "sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==" + "resolved" "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz" + "version" "12.2.0" dependencies: - array-union "^3.0.1" - dir-glob "^3.0.1" - fast-glob "^3.2.7" - ignore "^5.1.9" - merge2 "^1.4.1" - slash "^4.0.0" + "array-union" "^3.0.1" + "dir-glob" "^3.0.1" + "fast-glob" "^3.2.7" + "ignore" "^5.1.9" + "merge2" "^1.4.1" + "slash" "^4.0.0" -got@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== +"got@^9.6.0": + "integrity" "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==" + "resolved" "https://registry.npmjs.org/got/-/got-9.6.0.tgz" + "version" "9.6.0" dependencies: "@sindresorhus/is" "^0.14.0" "@szmarczak/http-timer" "^1.1.2" - cacheable-request "^6.0.0" - decompress-response "^3.3.0" - duplexer3 "^0.1.4" - get-stream "^4.1.0" - lowercase-keys "^1.0.1" - mimic-response "^1.0.1" - p-cancelable "^1.0.0" - to-readable-stream "^1.0.0" - url-parse-lax "^3.0.0" + "cacheable-request" "^6.0.0" + "decompress-response" "^3.3.0" + "duplexer3" "^0.1.4" + "get-stream" "^4.1.0" + "lowercase-keys" "^1.0.1" + "mimic-response" "^1.0.1" + "p-cancelable" "^1.0.0" + "to-readable-stream" "^1.0.0" + "url-parse-lax" "^3.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: - version "4.2.9" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" - integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== +"graceful-fs@^4.1.2", "graceful-fs@^4.1.6", "graceful-fs@^4.2.0", "graceful-fs@^4.2.4", "graceful-fs@^4.2.6", "graceful-fs@^4.2.9": + "integrity" "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==" + "resolved" "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz" + "version" "4.2.9" -gray-matter@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-4.0.3.tgz#e893c064825de73ea1f5f7d88c7a9f7274288798" - integrity sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q== +"gray-matter@^4.0.3": + "integrity" "sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==" + "resolved" "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.3.tgz" + "version" "4.0.3" dependencies: - js-yaml "^3.13.1" - kind-of "^6.0.2" - section-matter "^1.0.0" - strip-bom-string "^1.0.0" + "js-yaml" "^3.13.1" + "kind-of" "^6.0.2" + "section-matter" "^1.0.0" + "strip-bom-string" "^1.0.0" -gzip-size@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462" - integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q== +"gzip-size@^6.0.0": + "integrity" "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==" + "resolved" "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz" + "version" "6.0.0" dependencies: - duplexer "^0.1.2" + "duplexer" "^0.1.2" -handle-thing@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" - integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== +"handle-thing@^2.0.0": + "integrity" "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==" + "resolved" "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz" + "version" "2.0.1" -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= +"has-flag@^3.0.0": + "integrity" "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" + "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz" + "version" "3.0.0" -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +"has-flag@^4.0.0": + "integrity" "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz" + "version" "4.0.0" -has-symbols@^1.0.1, has-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== +"has-symbols@^1.0.1", "has-symbols@^1.0.2": + "integrity" "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" + "resolved" "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz" + "version" "1.0.2" -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== +"has-tostringtag@^1.0.0": + "integrity" "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==" + "resolved" "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz" + "version" "1.0.0" dependencies: - has-symbols "^1.0.2" + "has-symbols" "^1.0.2" -has-yarn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" - integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== +"has-yarn@^2.1.0": + "integrity" "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==" + "resolved" "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz" + "version" "2.1.0" -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== +"has@^1.0.3": + "integrity" "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==" + "resolved" "https://registry.npmjs.org/has/-/has-1.0.3.tgz" + "version" "1.0.3" dependencies: - function-bind "^1.1.1" + "function-bind" "^1.1.1" -hast-to-hyperscript@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz#9b67fd188e4c81e8ad66f803855334173920218d" - integrity sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA== +"hast-to-hyperscript@^9.0.0": + "integrity" "sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA==" + "resolved" "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz" + "version" "9.0.1" dependencies: "@types/unist" "^2.0.3" - comma-separated-tokens "^1.0.0" - property-information "^5.3.0" - space-separated-tokens "^1.0.0" - style-to-object "^0.3.0" - unist-util-is "^4.0.0" - web-namespaces "^1.0.0" + "comma-separated-tokens" "^1.0.0" + "property-information" "^5.3.0" + "space-separated-tokens" "^1.0.0" + "style-to-object" "^0.3.0" + "unist-util-is" "^4.0.0" + "web-namespaces" "^1.0.0" -hast-util-from-parse5@^5.0.0: - version "5.0.3" - resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" - integrity sha512-gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA== +"hast-util-from-parse5@^5.0.0": + "integrity" "sha512-gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA==" + "resolved" "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-5.0.3.tgz" + "version" "5.0.3" dependencies: - ccount "^1.0.3" - hastscript "^5.0.0" - property-information "^5.0.0" - web-namespaces "^1.1.2" - xtend "^4.0.1" + "ccount" "^1.0.3" + "hastscript" "^5.0.0" + "property-information" "^5.0.0" + "web-namespaces" "^1.1.2" + "xtend" "^4.0.1" -hast-util-from-parse5@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" - integrity sha512-jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA== +"hast-util-from-parse5@^6.0.0": + "integrity" "sha512-jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA==" + "resolved" "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz" + "version" "6.0.1" dependencies: "@types/parse5" "^5.0.0" - hastscript "^6.0.0" - property-information "^5.0.0" - vfile "^4.0.0" - vfile-location "^3.2.0" - web-namespaces "^1.0.0" + "hastscript" "^6.0.0" + "property-information" "^5.0.0" + "vfile" "^4.0.0" + "vfile-location" "^3.2.0" + "web-namespaces" "^1.0.0" -hast-util-parse-selector@^2.0.0: - version "2.2.5" - resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz#d57c23f4da16ae3c63b3b6ca4616683313499c3a" - integrity sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ== +"hast-util-parse-selector@^2.0.0": + "integrity" "sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==" + "resolved" "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz" + "version" "2.2.5" -hast-util-raw@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" - integrity sha512-ZMuiYA+UF7BXBtsTBNcLBF5HzXzkyE6MLzJnL605LKE8GJylNjGc4jjxazAHUtcwT5/CEt6afRKViYB4X66dig== +"hast-util-raw@6.0.1": + "integrity" "sha512-ZMuiYA+UF7BXBtsTBNcLBF5HzXzkyE6MLzJnL605LKE8GJylNjGc4jjxazAHUtcwT5/CEt6afRKViYB4X66dig==" + "resolved" "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-6.0.1.tgz" + "version" "6.0.1" dependencies: "@types/hast" "^2.0.0" - hast-util-from-parse5 "^6.0.0" - hast-util-to-parse5 "^6.0.0" - html-void-elements "^1.0.0" - parse5 "^6.0.0" - unist-util-position "^3.0.0" - vfile "^4.0.0" - web-namespaces "^1.0.0" - xtend "^4.0.0" - zwitch "^1.0.0" + "hast-util-from-parse5" "^6.0.0" + "hast-util-to-parse5" "^6.0.0" + "html-void-elements" "^1.0.0" + "parse5" "^6.0.0" + "unist-util-position" "^3.0.0" + "vfile" "^4.0.0" + "web-namespaces" "^1.0.0" + "xtend" "^4.0.0" + "zwitch" "^1.0.0" -hast-util-to-parse5@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz#1ec44650b631d72952066cea9b1445df699f8479" - integrity sha512-Lu5m6Lgm/fWuz8eWnrKezHtVY83JeRGaNQ2kn9aJgqaxvVkFCZQBEhgodZUDUvoodgyROHDb3r5IxAEdl6suJQ== +"hast-util-to-parse5@^6.0.0": + "integrity" "sha512-Lu5m6Lgm/fWuz8eWnrKezHtVY83JeRGaNQ2kn9aJgqaxvVkFCZQBEhgodZUDUvoodgyROHDb3r5IxAEdl6suJQ==" + "resolved" "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz" + "version" "6.0.0" dependencies: - hast-to-hyperscript "^9.0.0" - property-information "^5.0.0" - web-namespaces "^1.0.0" - xtend "^4.0.0" - zwitch "^1.0.0" + "hast-to-hyperscript" "^9.0.0" + "property-information" "^5.0.0" + "web-namespaces" "^1.0.0" + "xtend" "^4.0.0" + "zwitch" "^1.0.0" -hastscript@^5.0.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a" - integrity sha512-WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ== +"hastscript@^5.0.0": + "integrity" "sha512-WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ==" + "resolved" "https://registry.npmjs.org/hastscript/-/hastscript-5.1.2.tgz" + "version" "5.1.2" dependencies: - comma-separated-tokens "^1.0.0" - hast-util-parse-selector "^2.0.0" - property-information "^5.0.0" - space-separated-tokens "^1.0.0" + "comma-separated-tokens" "^1.0.0" + "hast-util-parse-selector" "^2.0.0" + "property-information" "^5.0.0" + "space-separated-tokens" "^1.0.0" -hastscript@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" - integrity sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w== +"hastscript@^6.0.0": + "integrity" "sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==" + "resolved" "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz" + "version" "6.0.0" dependencies: "@types/hast" "^2.0.0" - comma-separated-tokens "^1.0.0" - hast-util-parse-selector "^2.0.0" - property-information "^5.0.0" - space-separated-tokens "^1.0.0" + "comma-separated-tokens" "^1.0.0" + "hast-util-parse-selector" "^2.0.0" + "property-information" "^5.0.0" + "space-separated-tokens" "^1.0.0" -he@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" - integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== +"he@^1.2.0": + "integrity" "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" + "resolved" "https://registry.npmjs.org/he/-/he-1.2.0.tgz" + "version" "1.2.0" -history@^4.9.0: - version "4.10.1" - resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" - integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew== +"history@^4.9.0": + "integrity" "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==" + "resolved" "https://registry.npmjs.org/history/-/history-4.10.1.tgz" + "version" "4.10.1" dependencies: "@babel/runtime" "^7.1.2" - loose-envify "^1.2.0" - resolve-pathname "^3.0.0" - tiny-invariant "^1.0.2" - tiny-warning "^1.0.0" - value-equal "^1.0.1" + "loose-envify" "^1.2.0" + "resolve-pathname" "^3.0.0" + "tiny-invariant" "^1.0.2" + "tiny-warning" "^1.0.0" + "value-equal" "^1.0.1" -hoist-non-react-statics@^3.1.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" - integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== +"hoist-non-react-statics@^3.1.0": + "integrity" "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==" + "resolved" "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz" + "version" "3.3.2" dependencies: - react-is "^16.7.0" + "react-is" "^16.7.0" -hpack.js@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" - integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI= +"hpack.js@^2.1.6": + "integrity" "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=" + "resolved" "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz" + "version" "2.1.6" dependencies: - inherits "^2.0.1" - obuf "^1.0.0" - readable-stream "^2.0.1" - wbuf "^1.1.0" + "inherits" "^2.0.1" + "obuf" "^1.0.0" + "readable-stream" "^2.0.1" + "wbuf" "^1.1.0" -html-entities@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" - integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ== +"html-entities@^2.3.2": + "integrity" "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==" + "resolved" "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz" + "version" "2.3.2" -html-minifier-terser@^6.0.2: - version "6.1.0" - resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab" - integrity sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw== +"html-minifier-terser@^6.0.2": + "integrity" "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==" + "resolved" "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz" + "version" "6.1.0" dependencies: - camel-case "^4.1.2" - clean-css "^5.2.2" - commander "^8.3.0" - he "^1.2.0" - param-case "^3.0.4" - relateurl "^0.2.7" - terser "^5.10.0" + "camel-case" "^4.1.2" + "clean-css" "^5.2.2" + "commander" "^8.3.0" + "he" "^1.2.0" + "param-case" "^3.0.4" + "relateurl" "^0.2.7" + "terser" "^5.10.0" -html-tags@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" - integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg== +"html-tags@^3.1.0": + "integrity" "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==" + "resolved" "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz" + "version" "3.1.0" -html-void-elements@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483" - integrity sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w== +"html-void-elements@^1.0.0": + "integrity" "sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==" + "resolved" "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz" + "version" "1.0.5" -html-webpack-plugin@^5.4.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" - integrity sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw== +"html-webpack-plugin@^5.4.0": + "integrity" "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==" + "resolved" "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz" + "version" "5.5.0" dependencies: "@types/html-minifier-terser" "^6.0.0" - html-minifier-terser "^6.0.2" - lodash "^4.17.21" - pretty-error "^4.0.0" - tapable "^2.0.0" + "html-minifier-terser" "^6.0.2" + "lodash" "^4.17.21" + "pretty-error" "^4.0.0" + "tapable" "^2.0.0" -htmlparser2@^3.9.1: - version "3.10.1" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" - integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== +"htmlparser2@^3.9.1": + "integrity" "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==" + "resolved" "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz" + "version" "3.10.1" dependencies: - domelementtype "^1.3.1" - domhandler "^2.3.0" - domutils "^1.5.1" - entities "^1.1.1" - inherits "^2.0.1" - readable-stream "^3.1.1" + "domelementtype" "^1.3.1" + "domhandler" "^2.3.0" + "domutils" "^1.5.1" + "entities" "^1.1.1" + "inherits" "^2.0.1" + "readable-stream" "^3.1.1" -htmlparser2@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" - integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== +"htmlparser2@^6.1.0": + "integrity" "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==" + "resolved" "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz" + "version" "6.1.0" dependencies: - domelementtype "^2.0.1" - domhandler "^4.0.0" - domutils "^2.5.2" - entities "^2.0.0" + "domelementtype" "^2.0.1" + "domhandler" "^4.0.0" + "domutils" "^2.5.2" + "entities" "^2.0.0" -http-cache-semantics@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" - integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== +"http-cache-semantics@^4.0.0": + "integrity" "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" + "resolved" "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz" + "version" "4.1.1" -http-deceiver@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" - integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= +"http-deceiver@^1.2.7": + "integrity" "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=" + "resolved" "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz" + "version" "1.2.7" -http-errors@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" - integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== +"http-errors@~1.6.2": + "integrity" "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=" + "resolved" "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz" + "version" "1.6.3" dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.1" + "depd" "~1.1.2" + "inherits" "2.0.3" + "setprototypeof" "1.1.0" + "statuses" ">= 1.4.0 < 2" -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= +"http-errors@1.8.1": + "integrity" "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==" + "resolved" "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz" + "version" "1.8.1" dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" + "depd" "~1.1.2" + "inherits" "2.0.4" + "setprototypeof" "1.2.0" + "statuses" ">= 1.5.0 < 2" + "toidentifier" "1.0.1" -http-parser-js@>=0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5" - integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA== +"http-parser-js@>=0.5.1": + "integrity" "sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==" + "resolved" "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz" + "version" "0.5.5" -http-proxy-middleware@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.3.tgz#5df04f69a89f530c2284cd71eeaa51ba52243289" - integrity sha512-1bloEwnrHMnCoO/Gcwbz7eSVvW50KPES01PecpagI+YLNLci4AcuKJrujW4Mc3sBLpFxMSlsLNHS5Nl/lvrTPA== +"http-proxy-middleware@^2.0.0": + "integrity" "sha512-1bloEwnrHMnCoO/Gcwbz7eSVvW50KPES01PecpagI+YLNLci4AcuKJrujW4Mc3sBLpFxMSlsLNHS5Nl/lvrTPA==" + "resolved" "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.3.tgz" + "version" "2.0.3" dependencies: "@types/http-proxy" "^1.17.8" - http-proxy "^1.18.1" - is-glob "^4.0.1" - is-plain-obj "^3.0.0" - micromatch "^4.0.2" + "http-proxy" "^1.18.1" + "is-glob" "^4.0.1" + "is-plain-obj" "^3.0.0" + "micromatch" "^4.0.2" -http-proxy@^1.18.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" - integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== +"http-proxy@^1.18.1": + "integrity" "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==" + "resolved" "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz" + "version" "1.18.1" dependencies: - eventemitter3 "^4.0.0" - follow-redirects "^1.0.0" - requires-port "^1.0.0" + "eventemitter3" "^4.0.0" + "follow-redirects" "^1.0.0" + "requires-port" "^1.0.0" -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== +"human-signals@^2.1.0": + "integrity" "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==" + "resolved" "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz" + "version" "2.1.0" -iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== +"iconv-lite@0.4.24": + "integrity" "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==" + "resolved" "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" + "version" "0.4.24" dependencies: - safer-buffer ">= 2.1.2 < 3" + "safer-buffer" ">= 2.1.2 < 3" -icss-utils@^5.0.0, icss-utils@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" - integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== +"icss-utils@^5.0.0", "icss-utils@^5.1.0": + "integrity" "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==" + "resolved" "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz" + "version" "5.1.0" -ignore@^5.1.9, ignore@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" - integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== +"ignore@^5.1.9", "ignore@^5.2.0": + "integrity" "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==" + "resolved" "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz" + "version" "5.2.0" -image-size@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.1.tgz#86d6cfc2b1d19eab5d2b368d4b9194d9e48541c5" - integrity sha512-VAwkvNSNGClRw9mDHhc5Efax8PLlsOGcUTh0T/LIriC8vPA3U5PdqXWqkz406MoYHMKW8Uf9gWr05T/rYB44kQ== +"image-size@^1.0.1": + "integrity" "sha512-VAwkvNSNGClRw9mDHhc5Efax8PLlsOGcUTh0T/LIriC8vPA3U5PdqXWqkz406MoYHMKW8Uf9gWr05T/rYB44kQ==" + "resolved" "https://registry.npmjs.org/image-size/-/image-size-1.0.1.tgz" + "version" "1.0.1" dependencies: - queue "6.0.2" + "queue" "6.0.2" -immer@^9.0.7: - version "9.0.12" - resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.12.tgz#2d33ddf3ee1d247deab9d707ca472c8c942a0f20" - integrity sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA== +"immer@^9.0.7": + "integrity" "sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA==" + "resolved" "https://registry.npmjs.org/immer/-/immer-9.0.12.tgz" + "version" "9.0.12" -import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.2.2, import-fresh@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" - integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== +"import-fresh@^3.1.0", "import-fresh@^3.2.1", "import-fresh@^3.2.2", "import-fresh@^3.3.0": + "integrity" "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==" + "resolved" "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz" + "version" "3.3.0" dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" + "parent-module" "^1.0.0" + "resolve-from" "^4.0.0" -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= +"import-lazy@^2.1.0": + "integrity" "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=" + "resolved" "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz" + "version" "2.1.0" -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= +"imurmurhash@^0.1.4": + "integrity" "sha1-khi5srkoojixPcT7a21XbyMUU+o=" + "resolved" "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz" + "version" "0.1.4" -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== +"indent-string@^4.0.0": + "integrity" "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" + "resolved" "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz" + "version" "4.0.0" -infima@0.2.0-alpha.37: - version "0.2.0-alpha.37" - resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.37.tgz#b87ff42d528d6d050098a560f0294fbdd12adb78" - integrity sha512-4GX7Baw+/lwS4PPW/UJNY89tWSvYG1DL6baKVdpK6mC593iRgMssxNtORMTFArLPJ/A/lzsGhRmx+z6MaMxj0Q== +"infima@0.2.0-alpha.37": + "integrity" "sha512-4GX7Baw+/lwS4PPW/UJNY89tWSvYG1DL6baKVdpK6mC593iRgMssxNtORMTFArLPJ/A/lzsGhRmx+z6MaMxj0Q==" + "resolved" "https://registry.npmjs.org/infima/-/infima-0.2.0-alpha.37.tgz" + "version" "0.2.0-alpha.37" -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= +"inflight@^1.0.4": + "integrity" "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=" + "resolved" "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" + "version" "1.0.6" dependencies: - once "^1.3.0" - wrappy "1" + "once" "^1.3.0" + "wrappy" "1" -inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== +"inherits@^2.0.0", "inherits@^2.0.1", "inherits@^2.0.3", "inherits@~2.0.3", "inherits@2", "inherits@2.0.4": + "integrity" "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" + "version" "2.0.4" -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= +"inherits@2.0.3": + "integrity" "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" + "version" "2.0.3" -ini@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" - integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== +"ini@^1.3.5", "ini@~1.3.0": + "integrity" "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" + "resolved" "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz" + "version" "1.3.8" -ini@^1.3.5, ini@~1.3.0: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== +"ini@2.0.0": + "integrity" "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==" + "resolved" "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz" + "version" "2.0.0" -inline-style-parser@0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1" - integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q== +"inline-style-parser@0.1.1": + "integrity" "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==" + "resolved" "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz" + "version" "0.1.1" -interpret@^1.0.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" - integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== +"interpret@^1.0.0": + "integrity" "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==" + "resolved" "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz" + "version" "1.4.0" -ip@^1.1.0: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= +"ip@^1.1.0": + "integrity" "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=" + "resolved" "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz" + "version" "1.1.5" -ipaddr.js@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== +"ipaddr.js@^2.0.1": + "integrity" "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==" + "resolved" "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz" + "version" "2.0.1" -ipaddr.js@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" - integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== +"ipaddr.js@1.9.1": + "integrity" "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" + "resolved" "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz" + "version" "1.9.1" -is-alphabetical@1.0.4, is-alphabetical@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d" - integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg== +"is-alphabetical@^1.0.0", "is-alphabetical@1.0.4": + "integrity" "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==" + "resolved" "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz" + "version" "1.0.4" -is-alphanumerical@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf" - integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A== +"is-alphanumerical@^1.0.0": + "integrity" "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==" + "resolved" "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz" + "version" "1.0.4" dependencies: - is-alphabetical "^1.0.0" - is-decimal "^1.0.0" + "is-alphabetical" "^1.0.0" + "is-decimal" "^1.0.0" -is-arguments@^1.0.4: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== +"is-arguments@^1.0.4": + "integrity" "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==" + "resolved" "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz" + "version" "1.1.1" dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" + "call-bind" "^1.0.2" + "has-tostringtag" "^1.0.0" -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= +"is-arrayish@^0.2.1": + "integrity" "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + "resolved" "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz" + "version" "0.2.1" -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== +"is-binary-path@~2.1.0": + "integrity" "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==" + "resolved" "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz" + "version" "2.1.0" dependencies: - binary-extensions "^2.0.0" + "binary-extensions" "^2.0.0" -is-buffer@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" - integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== +"is-buffer@^2.0.0": + "integrity" "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==" + "resolved" "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz" + "version" "2.0.5" -is-ci@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" - integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== +"is-ci@^2.0.0": + "integrity" "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==" + "resolved" "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz" + "version" "2.0.0" dependencies: - ci-info "^2.0.0" + "ci-info" "^2.0.0" -is-core-module@^2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" - integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== +"is-core-module@^2.8.1": + "integrity" "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==" + "resolved" "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz" + "version" "2.8.1" dependencies: - has "^1.0.3" + "has" "^1.0.3" -is-date-object@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== +"is-date-object@^1.0.1": + "integrity" "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==" + "resolved" "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz" + "version" "1.0.5" dependencies: - has-tostringtag "^1.0.0" + "has-tostringtag" "^1.0.0" -is-decimal@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" - integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw== +"is-decimal@^1.0.0": + "integrity" "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==" + "resolved" "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz" + "version" "1.0.4" -is-docker@^2.0.0, is-docker@^2.1.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== +"is-docker@^2.0.0", "is-docker@^2.1.1": + "integrity" "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==" + "resolved" "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz" + "version" "2.2.1" -is-extendable@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= +"is-extendable@^0.1.0": + "integrity" "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" + "resolved" "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz" + "version" "0.1.1" -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= +"is-extglob@^2.1.1": + "integrity" "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + "resolved" "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" + "version" "2.1.1" -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== +"is-fullwidth-code-point@^3.0.0": + "integrity" "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + "resolved" "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz" + "version" "3.0.0" -is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== +"is-glob@^4.0.1", "is-glob@^4.0.3", "is-glob@~4.0.1": + "integrity" "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==" + "resolved" "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz" + "version" "4.0.3" dependencies: - is-extglob "^2.1.1" + "is-extglob" "^2.1.1" -is-hexadecimal@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" - integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== +"is-hexadecimal@^1.0.0": + "integrity" "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==" + "resolved" "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz" + "version" "1.0.4" -is-installed-globally@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" - integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== +"is-installed-globally@^0.4.0": + "integrity" "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==" + "resolved" "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz" + "version" "0.4.0" dependencies: - global-dirs "^3.0.0" - is-path-inside "^3.0.2" + "global-dirs" "^3.0.0" + "is-path-inside" "^3.0.2" -is-npm@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" - integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== +"is-npm@^5.0.0": + "integrity" "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==" + "resolved" "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz" + "version" "5.0.0" -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== +"is-number@^7.0.0": + "integrity" "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + "resolved" "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz" + "version" "7.0.0" -is-obj@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" - integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= +"is-obj@^1.0.1": + "integrity" "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + "resolved" "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz" + "version" "1.0.1" -is-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" - integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== +"is-obj@^2.0.0": + "integrity" "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" + "resolved" "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz" + "version" "2.0.0" -is-path-cwd@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" - integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== +"is-path-cwd@^2.2.0": + "integrity" "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==" + "resolved" "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz" + "version" "2.2.0" -is-path-inside@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== +"is-path-inside@^3.0.2": + "integrity" "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==" + "resolved" "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz" + "version" "3.0.3" -is-plain-obj@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" - integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== +"is-plain-obj@^2.0.0": + "integrity" "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==" + "resolved" "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz" + "version" "2.1.0" -is-plain-obj@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" - integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== +"is-plain-obj@^3.0.0": + "integrity" "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==" + "resolved" "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz" + "version" "3.0.0" -is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== +"is-plain-object@^2.0.4": + "integrity" "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==" + "resolved" "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz" + "version" "2.0.4" dependencies: - isobject "^3.0.1" + "isobject" "^3.0.1" -is-regex@^1.0.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== +"is-regex@^1.0.4": + "integrity" "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==" + "resolved" "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz" + "version" "1.1.4" dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" + "call-bind" "^1.0.2" + "has-tostringtag" "^1.0.0" -is-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" - integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= +"is-regexp@^1.0.0": + "integrity" "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=" + "resolved" "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz" + "version" "1.0.0" -is-root@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" - integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg== +"is-root@^2.1.0": + "integrity" "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==" + "resolved" "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz" + "version" "2.1.0" -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== +"is-stream@^2.0.0": + "integrity" "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" + "resolved" "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz" + "version" "2.0.1" -is-typedarray@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= +"is-typedarray@^1.0.0": + "integrity" "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + "resolved" "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" + "version" "1.0.0" -is-whitespace-character@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7" - integrity sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w== +"is-whitespace-character@^1.0.0": + "integrity" "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==" + "resolved" "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz" + "version" "1.0.4" -is-word-character@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230" - integrity sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA== +"is-word-character@^1.0.0": + "integrity" "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==" + "resolved" "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz" + "version" "1.0.4" -is-wsl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== +"is-wsl@^2.2.0": + "integrity" "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==" + "resolved" "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz" + "version" "2.2.0" dependencies: - is-docker "^2.0.0" + "is-docker" "^2.0.0" -is-yarn-global@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" - integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== +"is-yarn-global@^0.3.0": + "integrity" "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==" + "resolved" "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz" + "version" "0.3.0" -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= +"isarray@~1.0.0": + "integrity" "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "resolved" "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + "version" "1.0.0" -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +"isarray@0.0.1": + "integrity" "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + "resolved" "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + "version" "0.0.1" -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= +"isexe@^2.0.0": + "integrity" "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + "resolved" "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" + "version" "2.0.0" -isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= +"isobject@^3.0.1": + "integrity" "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "resolved" "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz" + "version" "3.0.1" -jest-worker@^27.0.2, jest-worker@^27.4.5: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" - integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== +"jest-worker@^27.0.2", "jest-worker@^27.4.5": + "integrity" "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==" + "resolved" "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz" + "version" "27.5.1" dependencies: "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" + "merge-stream" "^2.0.0" + "supports-color" "^8.0.0" -joi@^17.4.2, joi@^17.6.0: - version "17.6.0" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.0.tgz#0bb54f2f006c09a96e75ce687957bd04290054b2" - integrity sha512-OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw== +"joi@^17.4.2", "joi@^17.6.0": + "integrity" "sha512-OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw==" + "resolved" "https://registry.npmjs.org/joi/-/joi-17.6.0.tgz" + "version" "17.6.0" dependencies: "@hapi/hoek" "^9.0.0" "@hapi/topo" "^5.0.0" @@ -4684,2834 +4702,2879 @@ joi@^17.4.2, joi@^17.6.0: "@sideway/formula" "^3.0.0" "@sideway/pinpoint" "^2.0.0" -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== +"js-tokens@^3.0.0 || ^4.0.0", "js-tokens@^4.0.0": + "integrity" "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "resolved" "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" + "version" "4.0.0" -js-yaml@^3.13.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== +"js-yaml@^3.13.1": + "integrity" "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==" + "resolved" "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz" + "version" "3.14.1" dependencies: - argparse "^1.0.7" - esprima "^4.0.0" + "argparse" "^1.0.7" + "esprima" "^4.0.0" -js-yaml@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== +"js-yaml@^4.0.0": + "integrity" "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==" + "resolved" "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz" + "version" "4.1.0" dependencies: - argparse "^2.0.1" + "argparse" "^2.0.1" -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== +"jsesc@^2.5.1": + "integrity" "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" + "resolved" "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz" + "version" "2.5.2" -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= +"jsesc@~0.5.0": + "integrity" "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + "resolved" "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz" + "version" "0.5.0" -json-buffer@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= +"json-buffer@3.0.0": + "integrity" "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" + "resolved" "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz" + "version" "3.0.0" -json-parse-better-errors@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== +"json-parse-better-errors@^1.0.2": + "integrity" "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" + "resolved" "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz" + "version" "1.0.2" -json-parse-even-better-errors@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== +"json-parse-even-better-errors@^2.3.0": + "integrity" "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" + "resolved" "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz" + "version" "2.3.1" -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== +"json-schema-traverse@^0.4.1": + "integrity" "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "resolved" "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz" + "version" "0.4.1" -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== +"json-schema-traverse@^1.0.0": + "integrity" "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + "resolved" "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz" + "version" "1.0.0" -json5@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" - integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== +"json5@^1.0.1": + "integrity" "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==" + "resolved" "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz" + "version" "1.0.2" dependencies: - minimist "^1.2.0" + "minimist" "^1.2.0" -json5@^2.1.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" +"json5@^2.1.2", "json5@^2.2.2": + "integrity" "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" + "resolved" "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz" + "version" "2.2.3" -jsonfile@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" - integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== +"jsonfile@^6.0.1": + "integrity" "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==" + "resolved" "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz" + "version" "6.1.0" dependencies: - universalify "^2.0.0" + "universalify" "^2.0.0" optionalDependencies: - graceful-fs "^4.1.6" + "graceful-fs" "^4.1.6" -keyv@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" - integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== +"keyv@^3.0.0": + "integrity" "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==" + "resolved" "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz" + "version" "3.1.0" dependencies: - json-buffer "3.0.0" + "json-buffer" "3.0.0" -kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== +"kind-of@^6.0.0", "kind-of@^6.0.2": + "integrity" "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz" + "version" "6.0.3" -kleur@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" - integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== +"kleur@^3.0.3": + "integrity" "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==" + "resolved" "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz" + "version" "3.0.3" -klona@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" - integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== +"klona@^2.0.5": + "integrity" "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==" + "resolved" "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz" + "version" "2.0.5" -latest-version@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" - integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== +"latest-version@^5.1.0": + "integrity" "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==" + "resolved" "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz" + "version" "5.1.0" dependencies: - package-json "^6.3.0" + "package-json" "^6.3.0" -leven@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" - integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== +"leven@^3.1.0": + "integrity" "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==" + "resolved" "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz" + "version" "3.1.0" -lilconfig@^2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" - integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA== +"lilconfig@^2.0.3": + "integrity" "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==" + "resolved" "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz" + "version" "2.0.4" -lines-and-columns@^1.1.6: - version "1.2.4" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" - integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== +"lines-and-columns@^1.1.6": + "integrity" "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" + "resolved" "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz" + "version" "1.2.4" -loader-runner@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" - integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== +"loader-runner@^4.2.0": + "integrity" "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==" + "resolved" "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz" + "version" "4.2.0" -loader-utils@^1.4.0: - version "1.4.2" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3" - integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg== +"loader-utils@^1.4.0": + "integrity" "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==" + "resolved" "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz" + "version" "1.4.2" dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^1.0.1" + "big.js" "^5.2.2" + "emojis-list" "^3.0.0" + "json5" "^1.0.1" -loader-utils@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" - integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A== +"loader-utils@^2.0.0": + "integrity" "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==" + "resolved" "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz" + "version" "2.0.2" dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^2.1.2" + "big.js" "^5.2.2" + "emojis-list" "^3.0.0" + "json5" "^2.1.2" -loader-utils@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.0.tgz#bcecc51a7898bee7473d4bc6b845b23af8304d4f" - integrity sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ== +"loader-utils@^3.2.0": + "integrity" "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==" + "resolved" "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz" + "version" "3.2.0" -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== +"locate-path@^3.0.0": + "integrity" "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==" + "resolved" "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz" + "version" "3.0.0" dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" + "p-locate" "^3.0.0" + "path-exists" "^3.0.0" -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== +"locate-path@^5.0.0": + "integrity" "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==" + "resolved" "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz" + "version" "5.0.0" dependencies: - p-locate "^4.1.0" + "p-locate" "^4.1.0" -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== +"locate-path@^6.0.0": + "integrity" "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==" + "resolved" "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz" + "version" "6.0.0" dependencies: - p-locate "^5.0.0" + "p-locate" "^5.0.0" -lodash.assignin@^4.0.9: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" - integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI= +"lodash.assignin@^4.0.9": + "integrity" "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=" + "resolved" "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz" + "version" "4.2.0" -lodash.bind@^4.1.4: - version "4.2.1" - resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35" - integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU= +"lodash.bind@^4.1.4": + "integrity" "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=" + "resolved" "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz" + "version" "4.2.1" -lodash.curry@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170" - integrity sha1-JI42By7ekGUB11lmIAqG2riyMXA= +"lodash.curry@^4.0.1": + "integrity" "sha1-JI42By7ekGUB11lmIAqG2riyMXA=" + "resolved" "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz" + "version" "4.1.1" -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= +"lodash.debounce@^4.0.8": + "integrity" "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" + "resolved" "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz" + "version" "4.0.8" -lodash.defaults@^4.0.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" - integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= +"lodash.defaults@^4.0.1": + "integrity" "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=" + "resolved" "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz" + "version" "4.2.0" -lodash.filter@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" - integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= +"lodash.filter@^4.4.0": + "integrity" "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=" + "resolved" "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz" + "version" "4.6.0" -lodash.flatten@^4.2.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" - integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= +"lodash.flatten@^4.2.0": + "integrity" "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" + "resolved" "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz" + "version" "4.4.0" -lodash.flow@^3.3.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a" - integrity sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o= +"lodash.flow@^3.3.0": + "integrity" "sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o=" + "resolved" "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz" + "version" "3.5.0" -lodash.foreach@^4.3.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" - integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM= +"lodash.foreach@^4.3.0": + "integrity" "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" + "resolved" "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz" + "version" "4.5.0" -lodash.map@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" - integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= +"lodash.map@^4.4.0": + "integrity" "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=" + "resolved" "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz" + "version" "4.6.0" -lodash.memoize@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= +"lodash.memoize@^4.1.2": + "integrity" "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=" + "resolved" "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz" + "version" "4.1.2" -lodash.merge@^4.4.0: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== +"lodash.merge@^4.4.0": + "integrity" "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + "resolved" "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz" + "version" "4.6.2" -lodash.pick@^4.2.1: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" - integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= +"lodash.pick@^4.2.1": + "integrity" "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=" + "resolved" "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz" + "version" "4.4.0" -lodash.reduce@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" - integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs= +"lodash.reduce@^4.4.0": + "integrity" "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=" + "resolved" "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz" + "version" "4.6.0" -lodash.reject@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415" - integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU= +"lodash.reject@^4.4.0": + "integrity" "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=" + "resolved" "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz" + "version" "4.6.0" -lodash.some@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" - integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0= +"lodash.some@^4.4.0": + "integrity" "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=" + "resolved" "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz" + "version" "4.6.0" -lodash.uniq@4.5.0, lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= +"lodash.uniq@^4.5.0", "lodash.uniq@4.5.0": + "integrity" "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" + "resolved" "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz" + "version" "4.5.0" -lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== +"lodash@^4.17.14", "lodash@^4.17.19", "lodash@^4.17.20", "lodash@^4.17.21": + "integrity" "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + "resolved" "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" + "version" "4.17.21" -loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" - integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== +"loose-envify@^1.0.0", "loose-envify@^1.1.0", "loose-envify@^1.2.0", "loose-envify@^1.3.1", "loose-envify@^1.4.0": + "integrity" "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==" + "resolved" "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz" + "version" "1.4.0" dependencies: - js-tokens "^3.0.0 || ^4.0.0" + "js-tokens" "^3.0.0 || ^4.0.0" -lower-case@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" - integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== +"lower-case@^2.0.2": + "integrity" "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==" + "resolved" "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz" + "version" "2.0.2" dependencies: - tslib "^2.0.3" + "tslib" "^2.0.3" -lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== +"lowercase-keys@^1.0.0", "lowercase-keys@^1.0.1": + "integrity" "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" + "resolved" "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz" + "version" "1.0.1" -lowercase-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" - integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== +"lowercase-keys@^2.0.0": + "integrity" "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" + "resolved" "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz" + "version" "2.0.0" -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== +"lru-cache@^5.1.1": + "integrity" "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==" + "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz" + "version" "5.1.1" dependencies: - yallist "^4.0.0" + "yallist" "^3.0.2" -magic-string@^0.25.3: - version "0.25.7" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" - integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA== +"lru-cache@^6.0.0": + "integrity" "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==" + "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz" + "version" "6.0.0" dependencies: - sourcemap-codec "^1.4.4" + "yallist" "^4.0.0" -make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== +"magic-string@^0.25.3": + "integrity" "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==" + "resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz" + "version" "0.25.7" dependencies: - semver "^6.0.0" + "sourcemap-codec" "^1.4.4" -markdown-escapes@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" - integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg== - -mdast-squeeze-paragraphs@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97" - integrity sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ== +"make-dir@^3.0.0", "make-dir@^3.0.2", "make-dir@^3.1.0": + "integrity" "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==" + "resolved" "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz" + "version" "3.1.0" dependencies: - unist-util-remove "^2.0.0" + "semver" "^6.0.0" -mdast-util-definitions@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2" - integrity sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ== +"markdown-escapes@^1.0.0": + "integrity" "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==" + "resolved" "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz" + "version" "1.0.4" + +"mdast-squeeze-paragraphs@^4.0.0": + "integrity" "sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ==" + "resolved" "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz" + "version" "4.0.0" dependencies: - unist-util-visit "^2.0.0" + "unist-util-remove" "^2.0.0" -mdast-util-to-hast@10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb" - integrity sha512-BW3LM9SEMnjf4HXXVApZMt8gLQWVNXc3jryK0nJu/rOXPOnlkUjmdkDlmxMirpbU9ILncGFIwLH/ubnWBbcdgA== +"mdast-util-definitions@^4.0.0": + "integrity" "sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==" + "resolved" "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz" + "version" "4.0.0" + dependencies: + "unist-util-visit" "^2.0.0" + +"mdast-util-to-hast@10.0.1": + "integrity" "sha512-BW3LM9SEMnjf4HXXVApZMt8gLQWVNXc3jryK0nJu/rOXPOnlkUjmdkDlmxMirpbU9ILncGFIwLH/ubnWBbcdgA==" + "resolved" "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz" + "version" "10.0.1" dependencies: "@types/mdast" "^3.0.0" "@types/unist" "^2.0.0" - mdast-util-definitions "^4.0.0" - mdurl "^1.0.0" - unist-builder "^2.0.0" - unist-util-generated "^1.0.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "mdast-util-definitions" "^4.0.0" + "mdurl" "^1.0.0" + "unist-builder" "^2.0.0" + "unist-util-generated" "^1.0.0" + "unist-util-position" "^3.0.0" + "unist-util-visit" "^2.0.0" -mdast-util-to-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" - integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w== +"mdast-util-to-string@^2.0.0": + "integrity" "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==" + "resolved" "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz" + "version" "2.0.0" -mdn-data@2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" - integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== +"mdn-data@2.0.14": + "integrity" "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==" + "resolved" "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz" + "version" "2.0.14" -mdurl@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" - integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= +"mdurl@^1.0.0": + "integrity" "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=" + "resolved" "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz" + "version" "1.0.1" -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= +"media-typer@0.3.0": + "integrity" "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" + "resolved" "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" + "version" "0.3.0" -memfs@^3.1.2, memfs@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305" - integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw== +"memfs@^3.1.2", "memfs@^3.4.1": + "integrity" "sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==" + "resolved" "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz" + "version" "3.4.1" dependencies: - fs-monkey "1.0.3" + "fs-monkey" "1.0.3" -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= +"merge-descriptors@1.0.1": + "integrity" "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + "resolved" "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz" + "version" "1.0.1" -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== +"merge-stream@^2.0.0": + "integrity" "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + "resolved" "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz" + "version" "2.0.0" -merge2@^1.3.0, merge2@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== +"merge2@^1.3.0", "merge2@^1.4.1": + "integrity" "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" + "resolved" "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz" + "version" "1.4.1" -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= +"methods@~1.1.2": + "integrity" "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" + "resolved" "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" + "version" "1.1.2" -micromatch@^4.0.2, micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== +"micromatch@^4.0.2", "micromatch@^4.0.4": + "integrity" "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==" + "resolved" "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz" + "version" "4.0.4" dependencies: - braces "^3.0.1" - picomatch "^2.2.3" + "braces" "^3.0.1" + "picomatch" "^2.2.3" -mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": - version "1.51.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" - integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== +"mime-db@>= 1.43.0 < 2", "mime-db@1.51.0": + "integrity" "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==" + "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz" + "version" "1.51.0" -mime-db@~1.33.0: - version "1.33.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" - integrity sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ== +"mime-db@~1.33.0": + "integrity" "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" + "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz" + "version" "1.33.0" -mime-types@2.1.18: - version "2.1.18" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" - integrity sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ== +"mime-types@^2.1.27", "mime-types@^2.1.31", "mime-types@~2.1.17", "mime-types@~2.1.24", "mime-types@~2.1.34": + "integrity" "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==" + "resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz" + "version" "2.1.34" dependencies: - mime-db "~1.33.0" + "mime-db" "1.51.0" -mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: - version "2.1.34" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" - integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== +"mime-types@2.1.18": + "integrity" "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==" + "resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz" + "version" "2.1.18" dependencies: - mime-db "1.51.0" + "mime-db" "~1.33.0" -mime@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== +"mime@1.6.0": + "integrity" "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + "resolved" "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz" + "version" "1.6.0" -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +"mimic-fn@^2.1.0": + "integrity" "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + "resolved" "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz" + "version" "2.1.0" -mimic-response@^1.0.0, mimic-response@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" - integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== +"mimic-response@^1.0.0", "mimic-response@^1.0.1": + "integrity" "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" + "resolved" "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz" + "version" "1.0.1" -mini-create-react-context@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" - integrity sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ== +"mini-create-react-context@^0.4.0": + "integrity" "sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==" + "resolved" "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz" + "version" "0.4.1" dependencies: "@babel/runtime" "^7.12.1" - tiny-warning "^1.0.3" + "tiny-warning" "^1.0.3" -mini-css-extract-plugin@^1.6.0: - version "1.6.2" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" - integrity sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q== +"mini-css-extract-plugin@^1.6.0": + "integrity" "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==" + "resolved" "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz" + "version" "1.6.2" dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" - webpack-sources "^1.1.0" + "loader-utils" "^2.0.0" + "schema-utils" "^3.0.0" + "webpack-sources" "^1.1.0" -minimalistic-assert@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== +"minimalistic-assert@^1.0.0": + "integrity" "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" + "resolved" "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz" + "version" "1.0.1" -minimatch@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== +"minimatch@^3.0.4": + "integrity" "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==" + "resolved" "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" + "version" "3.1.2" dependencies: - brace-expansion "^1.1.7" + "brace-expansion" "^1.1.7" -minimatch@^3.0.4: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== +"minimatch@3.0.4": + "integrity" "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==" + "resolved" "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" + "version" "3.0.4" dependencies: - brace-expansion "^1.1.7" + "brace-expansion" "^1.1.7" -minimist@^1.2.0, minimist@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" - integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== +"minimist@^1.2.0", "minimist@^1.2.5": + "integrity" "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==" + "resolved" "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz" + "version" "1.2.7" -mkdirp@^0.5.5: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== +"mkdirp@^0.5.5": + "integrity" "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==" + "resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz" + "version" "0.5.5" dependencies: - minimist "^1.2.5" + "minimist" "^1.2.5" -mrmime@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.0.tgz#14d387f0585a5233d291baba339b063752a2398b" - integrity sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ== +"mrmime@^1.0.0": + "integrity" "sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==" + "resolved" "https://registry.npmjs.org/mrmime/-/mrmime-1.0.0.tgz" + "version" "1.0.0" -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= +"ms@^2.1.1", "ms@2.1.3": + "integrity" "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "resolved" "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" + "version" "2.1.3" -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +"ms@2.0.0": + "integrity" "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "resolved" "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" + "version" "2.0.0" -ms@2.1.3, ms@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== +"ms@2.1.2": + "integrity" "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "resolved" "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" + "version" "2.1.2" -multicast-dns-service-types@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" - integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE= +"multicast-dns-service-types@^1.1.0": + "integrity" "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=" + "resolved" "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz" + "version" "1.1.0" -multicast-dns@^6.0.1: - version "6.2.3" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" - integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g== +"multicast-dns@^6.0.1": + "integrity" "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==" + "resolved" "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz" + "version" "6.2.3" dependencies: - dns-packet "^1.3.1" - thunky "^1.0.2" + "dns-packet" "^1.3.1" + "thunky" "^1.0.2" -nanoid@^3.2.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" - integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw== +"nanoid@^3.2.0": + "integrity" "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==" + "resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz" + "version" "3.3.1" -negotiator@0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== +"negotiator@0.6.3": + "integrity" "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" + "resolved" "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz" + "version" "0.6.3" -neo-async@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== +"neo-async@^2.6.2": + "integrity" "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" + "resolved" "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz" + "version" "2.6.2" -no-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" - integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== +"no-case@^3.0.4": + "integrity" "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==" + "resolved" "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz" + "version" "3.0.4" dependencies: - lower-case "^2.0.2" - tslib "^2.0.3" + "lower-case" "^2.0.2" + "tslib" "^2.0.3" -node-emoji@^1.10.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" - integrity sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A== +"node-emoji@^1.10.0": + "integrity" "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==" + "resolved" "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz" + "version" "1.11.0" dependencies: - lodash "^4.17.21" + "lodash" "^4.17.21" -node-fetch@2.6.7: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== +"node-fetch@2.6.7": + "integrity" "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==" + "resolved" "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz" + "version" "2.6.7" dependencies: - whatwg-url "^5.0.0" + "whatwg-url" "^5.0.0" -node-forge@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.0.tgz#37a874ea723855f37db091e6c186e5b67a01d4b2" - integrity sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA== +"node-forge@^1.2.0": + "integrity" "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==" + "resolved" "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz" + "version" "1.3.0" -node-releases@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01" - integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg== +"node-releases@^2.0.8": + "integrity" "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==" + "resolved" "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz" + "version" "2.0.10" -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== +"normalize-path@^3.0.0", "normalize-path@~3.0.0": + "integrity" "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + "resolved" "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" + "version" "3.0.0" -normalize-range@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= +"normalize-range@^0.1.2": + "integrity" "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=" + "resolved" "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz" + "version" "0.1.2" -normalize-url@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" - integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== +"normalize-url@^4.1.0": + "integrity" "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==" + "resolved" "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz" + "version" "4.5.1" -normalize-url@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" - integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== +"normalize-url@^6.0.1": + "integrity" "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==" + "resolved" "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz" + "version" "6.1.0" -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== +"npm-run-path@^4.0.1": + "integrity" "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==" + "resolved" "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz" + "version" "4.0.1" dependencies: - path-key "^3.0.0" + "path-key" "^3.0.0" -nprogress@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/nprogress/-/nprogress-0.2.0.tgz#cb8f34c53213d895723fcbab907e9422adbcafb1" - integrity sha1-y480xTIT2JVyP8urkH6UIq28r7E= +"nprogress@^0.2.0": + "integrity" "sha1-y480xTIT2JVyP8urkH6UIq28r7E=" + "resolved" "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz" + "version" "0.2.0" -nth-check@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" - integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w== +"nth-check@^2.0.1": + "integrity" "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==" + "resolved" "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz" + "version" "2.0.1" dependencies: - boolbase "^1.0.0" + "boolbase" "^1.0.0" -nth-check@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" - integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== +"nth-check@~1.0.1": + "integrity" "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==" + "resolved" "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz" + "version" "1.0.2" dependencies: - boolbase "~1.0.0" + "boolbase" "~1.0.0" -object-assign@^4.1.0, object-assign@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= +"object-assign@^4.1.0", "object-assign@^4.1.1": + "integrity" "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "resolved" "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" + "version" "4.1.1" -object-is@^1.0.1: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" - integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== +"object-is@^1.0.1": + "integrity" "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==" + "resolved" "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz" + "version" "1.1.5" dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" + "call-bind" "^1.0.2" + "define-properties" "^1.1.3" -object-keys@^1.0.12, object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== +"object-keys@^1.0.12", "object-keys@^1.1.1": + "integrity" "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" + "resolved" "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz" + "version" "1.1.1" -object.assign@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" - integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== +"object.assign@^4.1.0": + "integrity" "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==" + "resolved" "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz" + "version" "4.1.2" dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - has-symbols "^1.0.1" - object-keys "^1.1.1" + "call-bind" "^1.0.0" + "define-properties" "^1.1.3" + "has-symbols" "^1.0.1" + "object-keys" "^1.1.1" -obuf@^1.0.0, obuf@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" - integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== +"obuf@^1.0.0", "obuf@^1.1.2": + "integrity" "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==" + "resolved" "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz" + "version" "1.1.2" -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= +"on-finished@~2.3.0": + "integrity" "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=" + "resolved" "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz" + "version" "2.3.0" dependencies: - ee-first "1.1.1" + "ee-first" "1.1.1" -on-headers@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" - integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== +"on-headers@~1.0.2": + "integrity" "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" + "resolved" "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz" + "version" "1.0.2" -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= +"once@^1.3.0", "once@^1.3.1", "once@^1.4.0": + "integrity" "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=" + "resolved" "https://registry.npmjs.org/once/-/once-1.4.0.tgz" + "version" "1.4.0" dependencies: - wrappy "1" + "wrappy" "1" -onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== +"onetime@^5.1.2": + "integrity" "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==" + "resolved" "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz" + "version" "5.1.2" dependencies: - mimic-fn "^2.1.0" + "mimic-fn" "^2.1.0" -open@^8.0.9, open@^8.4.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== +"open@^8.0.9", "open@^8.4.0": + "integrity" "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==" + "resolved" "https://registry.npmjs.org/open/-/open-8.4.0.tgz" + "version" "8.4.0" dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" + "define-lazy-prop" "^2.0.0" + "is-docker" "^2.1.1" + "is-wsl" "^2.2.0" -opener@^1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" - integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== +"opener@^1.5.2": + "integrity" "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==" + "resolved" "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz" + "version" "1.5.2" -p-cancelable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" - integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== +"p-cancelable@^1.0.0": + "integrity" "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" + "resolved" "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz" + "version" "1.1.0" -p-limit@^2.0.0, p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== +"p-limit@^2.0.0", "p-limit@^2.2.0": + "integrity" "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==" + "resolved" "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz" + "version" "2.3.0" dependencies: - p-try "^2.0.0" + "p-try" "^2.0.0" -p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== +"p-limit@^3.0.2": + "integrity" "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==" + "resolved" "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz" + "version" "3.1.0" dependencies: - yocto-queue "^0.1.0" + "yocto-queue" "^0.1.0" -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== +"p-locate@^3.0.0": + "integrity" "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==" + "resolved" "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz" + "version" "3.0.0" dependencies: - p-limit "^2.0.0" + "p-limit" "^2.0.0" -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== +"p-locate@^4.1.0": + "integrity" "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==" + "resolved" "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz" + "version" "4.1.0" dependencies: - p-limit "^2.2.0" + "p-limit" "^2.2.0" -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== +"p-locate@^5.0.0": + "integrity" "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==" + "resolved" "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz" + "version" "5.0.0" dependencies: - p-limit "^3.0.2" + "p-limit" "^3.0.2" -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== +"p-map@^4.0.0": + "integrity" "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==" + "resolved" "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz" + "version" "4.0.0" dependencies: - aggregate-error "^3.0.0" + "aggregate-error" "^3.0.0" -p-retry@^4.5.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" - integrity sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA== +"p-retry@^4.5.0": + "integrity" "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==" + "resolved" "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz" + "version" "4.6.1" dependencies: "@types/retry" "^0.12.0" - retry "^0.13.1" + "retry" "^0.13.1" -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== +"p-try@^2.0.0": + "integrity" "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + "resolved" "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz" + "version" "2.2.0" -package-json@^6.3.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" - integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== +"package-json@^6.3.0": + "integrity" "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==" + "resolved" "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz" + "version" "6.5.0" dependencies: - got "^9.6.0" - registry-auth-token "^4.0.0" - registry-url "^5.0.0" - semver "^6.2.0" + "got" "^9.6.0" + "registry-auth-token" "^4.0.0" + "registry-url" "^5.0.0" + "semver" "^6.2.0" -param-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" - integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== +"param-case@^3.0.4": + "integrity" "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==" + "resolved" "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz" + "version" "3.0.4" dependencies: - dot-case "^3.0.4" - tslib "^2.0.3" + "dot-case" "^3.0.4" + "tslib" "^2.0.3" -parent-module@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" - integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== +"parent-module@^1.0.0": + "integrity" "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==" + "resolved" "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz" + "version" "1.0.1" dependencies: - callsites "^3.0.0" + "callsites" "^3.0.0" -parse-entities@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8" - integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ== +"parse-entities@^2.0.0": + "integrity" "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==" + "resolved" "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz" + "version" "2.0.0" dependencies: - character-entities "^1.0.0" - character-entities-legacy "^1.0.0" - character-reference-invalid "^1.0.0" - is-alphanumerical "^1.0.0" - is-decimal "^1.0.0" - is-hexadecimal "^1.0.0" + "character-entities" "^1.0.0" + "character-entities-legacy" "^1.0.0" + "character-reference-invalid" "^1.0.0" + "is-alphanumerical" "^1.0.0" + "is-decimal" "^1.0.0" + "is-hexadecimal" "^1.0.0" -parse-json@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== +"parse-json@^5.0.0": + "integrity" "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==" + "resolved" "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz" + "version" "5.2.0" dependencies: "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" + "error-ex" "^1.3.1" + "json-parse-even-better-errors" "^2.3.0" + "lines-and-columns" "^1.1.6" -parse-numeric-range@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/parse-numeric-range/-/parse-numeric-range-1.3.0.tgz#7c63b61190d61e4d53a1197f0c83c47bb670ffa3" - integrity sha512-twN+njEipszzlMJd4ONUYgSfZPDxgHhT9Ahed5uTigpQn90FggW4SA/AIPq/6a149fTbE9qBEcSwE3FAEp6wQQ== +"parse-numeric-range@^1.3.0": + "integrity" "sha512-twN+njEipszzlMJd4ONUYgSfZPDxgHhT9Ahed5uTigpQn90FggW4SA/AIPq/6a149fTbE9qBEcSwE3FAEp6wQQ==" + "resolved" "https://registry.npmjs.org/parse-numeric-range/-/parse-numeric-range-1.3.0.tgz" + "version" "1.3.0" -parse5-htmlparser2-tree-adapter@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" - integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== +"parse5-htmlparser2-tree-adapter@^6.0.1": + "integrity" "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==" + "resolved" "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz" + "version" "6.0.1" dependencies: - parse5 "^6.0.1" + "parse5" "^6.0.1" -parse5@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" - integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== +"parse5@^5.0.0": + "integrity" "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==" + "resolved" "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz" + "version" "5.1.1" -parse5@^6.0.0, parse5@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== +"parse5@^6.0.0", "parse5@^6.0.1": + "integrity" "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" + "resolved" "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz" + "version" "6.0.1" -parseurl@~1.3.2, parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== +"parseurl@~1.3.2", "parseurl@~1.3.3": + "integrity" "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" + "resolved" "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz" + "version" "1.3.3" -pascal-case@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" - integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== +"pascal-case@^3.1.2": + "integrity" "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==" + "resolved" "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz" + "version" "3.1.2" dependencies: - no-case "^3.0.4" - tslib "^2.0.3" + "no-case" "^3.0.4" + "tslib" "^2.0.3" -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= +"path-exists@^3.0.0": + "integrity" "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" + "resolved" "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz" + "version" "3.0.0" -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== +"path-exists@^4.0.0": + "integrity" "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + "resolved" "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz" + "version" "4.0.0" -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= +"path-is-absolute@^1.0.0": + "integrity" "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + "resolved" "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" + "version" "1.0.1" -path-is-inside@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= +"path-is-inside@1.0.2": + "integrity" "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=" + "resolved" "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz" + "version" "1.0.2" -path-key@^3.0.0, path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== +"path-key@^3.0.0", "path-key@^3.1.0": + "integrity" "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + "resolved" "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz" + "version" "3.1.1" -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== +"path-parse@^1.0.7": + "integrity" "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + "resolved" "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" + "version" "1.0.7" -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= - -path-to-regexp@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" - integrity sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ== - -path-to-regexp@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" - integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== +"path-to-regexp@^1.7.0": + "integrity" "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==" + "resolved" "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz" + "version" "1.8.0" dependencies: - isarray "0.0.1" + "isarray" "0.0.1" -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== +"path-to-regexp@0.1.7": + "integrity" "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + "resolved" "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" + "version" "0.1.7" -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +"path-to-regexp@2.2.1": + "integrity" "sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ==" + "resolved" "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz" + "version" "2.2.1" -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +"path-type@^4.0.0": + "integrity" "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" + "resolved" "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz" + "version" "4.0.0" -pkg-dir@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== +"picocolors@^1.0.0": + "integrity" "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "resolved" "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz" + "version" "1.0.0" + +"picomatch@^2.0.4", "picomatch@^2.2.1", "picomatch@^2.2.3": + "integrity" "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" + "resolved" "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz" + "version" "2.3.1" + +"pkg-dir@^4.1.0": + "integrity" "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==" + "resolved" "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz" + "version" "4.2.0" dependencies: - find-up "^4.0.0" + "find-up" "^4.0.0" -pkg-up@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" - integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== +"pkg-up@^3.1.0": + "integrity" "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==" + "resolved" "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz" + "version" "3.1.0" dependencies: - find-up "^3.0.0" + "find-up" "^3.0.0" -portfinder@^1.0.28: - version "1.0.28" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" - integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== +"portfinder@^1.0.28": + "integrity" "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==" + "resolved" "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz" + "version" "1.0.28" dependencies: - async "^2.6.2" - debug "^3.1.1" - mkdirp "^0.5.5" + "async" "^2.6.2" + "debug" "^3.1.1" + "mkdirp" "^0.5.5" -postcss-calc@^8.2.0: - version "8.2.4" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5" - integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q== +"postcss-calc@^8.2.0": + "integrity" "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==" + "resolved" "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz" + "version" "8.2.4" dependencies: - postcss-selector-parser "^6.0.9" - postcss-value-parser "^4.2.0" + "postcss-selector-parser" "^6.0.9" + "postcss-value-parser" "^4.2.0" -postcss-colormin@^5.2.5: - version "5.2.5" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.5.tgz#d1fc269ac2ad03fe641d462b5d1dada35c69968a" - integrity sha512-+X30aDaGYq81mFqwyPpnYInsZQnNpdxMX0ajlY7AExCexEFkPVV+KrO7kXwayqEWL2xwEbNQ4nUO0ZsRWGnevg== +"postcss-colormin@^5.2.5": + "integrity" "sha512-+X30aDaGYq81mFqwyPpnYInsZQnNpdxMX0ajlY7AExCexEFkPVV+KrO7kXwayqEWL2xwEbNQ4nUO0ZsRWGnevg==" + "resolved" "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.5.tgz" + "version" "5.2.5" dependencies: - browserslist "^4.16.6" - caniuse-api "^3.0.0" - colord "^2.9.1" - postcss-value-parser "^4.2.0" + "browserslist" "^4.16.6" + "caniuse-api" "^3.0.0" + "colord" "^2.9.1" + "postcss-value-parser" "^4.2.0" -postcss-convert-values@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.4.tgz#3e74dd97c581f475ae7b4500bc0a7c4fb3a6b1b6" - integrity sha512-bugzSAyjIexdObovsPZu/sBCTHccImJxLyFgeV0MmNBm/Lw5h5XnjfML6gzEmJ3A6nyfCW7hb1JXzcsA4Zfbdw== +"postcss-convert-values@^5.0.4": + "integrity" "sha512-bugzSAyjIexdObovsPZu/sBCTHccImJxLyFgeV0MmNBm/Lw5h5XnjfML6gzEmJ3A6nyfCW7hb1JXzcsA4Zfbdw==" + "resolved" "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-discard-comments@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.3.tgz#011acb63418d600fdbe18804e1bbecb543ad2f87" - integrity sha512-6W5BemziRoqIdAKT+1QjM4bNcJAQ7z7zk073730NHg4cUXh3/rQHHj7pmYxUB9aGhuRhBiUf0pXvIHkRwhQP0Q== +"postcss-discard-comments@^5.0.3": + "integrity" "sha512-6W5BemziRoqIdAKT+1QjM4bNcJAQ7z7zk073730NHg4cUXh3/rQHHj7pmYxUB9aGhuRhBiUf0pXvIHkRwhQP0Q==" + "resolved" "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.3.tgz" + "version" "5.0.3" -postcss-discard-duplicates@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.3.tgz#10f202a4cfe9d407b73dfea7a477054d21ea0c1f" - integrity sha512-vPtm1Mf+kp7iAENTG7jI1MN1lk+fBqL5y+qxyi4v3H+lzsXEdfS3dwUZD45KVhgzDEgduur8ycB4hMegyMTeRw== +"postcss-discard-duplicates@^5.0.3": + "integrity" "sha512-vPtm1Mf+kp7iAENTG7jI1MN1lk+fBqL5y+qxyi4v3H+lzsXEdfS3dwUZD45KVhgzDEgduur8ycB4hMegyMTeRw==" + "resolved" "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.3.tgz" + "version" "5.0.3" -postcss-discard-empty@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.3.tgz#ec185af4a3710b88933b0ff751aa157b6041dd6a" - integrity sha512-xGJugpaXKakwKI7sSdZjUuN4V3zSzb2Y0LOlmTajFbNinEjTfVs9PFW2lmKBaC/E64WwYppfqLD03P8l9BuueA== +"postcss-discard-empty@^5.0.3": + "integrity" "sha512-xGJugpaXKakwKI7sSdZjUuN4V3zSzb2Y0LOlmTajFbNinEjTfVs9PFW2lmKBaC/E64WwYppfqLD03P8l9BuueA==" + "resolved" "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.3.tgz" + "version" "5.0.3" -postcss-discard-overridden@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.4.tgz#cc999d6caf18ea16eff8b2b58f48ec3ddee35c9c" - integrity sha512-3j9QH0Qh1KkdxwiZOW82cId7zdwXVQv/gRXYDnwx5pBtR1sTkU4cXRK9lp5dSdiM0r0OICO/L8J6sV1/7m0kHg== +"postcss-discard-overridden@^5.0.4": + "integrity" "sha512-3j9QH0Qh1KkdxwiZOW82cId7zdwXVQv/gRXYDnwx5pBtR1sTkU4cXRK9lp5dSdiM0r0OICO/L8J6sV1/7m0kHg==" + "resolved" "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.4.tgz" + "version" "5.0.4" -postcss-discard-unused@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-5.0.3.tgz#89fd3ebdbed8320df77a4ad503bd83cff52409f5" - integrity sha512-WO6FJxL5fGnuE77ZbTcZ/nRZJ4+TOqNaqLBLWgkR4e+WdmHn77OHPyQmsRv7eOB2rLKL6tsq2bs1GwoKXD/++Q== +"postcss-discard-unused@^5.0.3": + "integrity" "sha512-WO6FJxL5fGnuE77ZbTcZ/nRZJ4+TOqNaqLBLWgkR4e+WdmHn77OHPyQmsRv7eOB2rLKL6tsq2bs1GwoKXD/++Q==" + "resolved" "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-5.0.3.tgz" + "version" "5.0.3" dependencies: - postcss-selector-parser "^6.0.5" + "postcss-selector-parser" "^6.0.5" -postcss-loader@^6.1.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz#0895f7346b1702103d30fdc66e4d494a93c008ef" - integrity sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q== +"postcss-loader@^6.1.1": + "integrity" "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==" + "resolved" "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz" + "version" "6.2.1" dependencies: - cosmiconfig "^7.0.0" - klona "^2.0.5" - semver "^7.3.5" + "cosmiconfig" "^7.0.0" + "klona" "^2.0.5" + "semver" "^7.3.5" -postcss-merge-idents@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-5.0.3.tgz#04f333f32767bd7b7b002f0032da347ec3c8c484" - integrity sha512-Z4LCzh2WzMn69KaS2FaJcrIeDQ170V13QHq+0hnBEFKJJkD+y5qndZ/bl3AhpddrSrXWIVR+xAwjmHQIJI2Eog== +"postcss-merge-idents@^5.0.3": + "integrity" "sha512-Z4LCzh2WzMn69KaS2FaJcrIeDQ170V13QHq+0hnBEFKJJkD+y5qndZ/bl3AhpddrSrXWIVR+xAwjmHQIJI2Eog==" + "resolved" "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-5.0.3.tgz" + "version" "5.0.3" dependencies: - cssnano-utils "^3.0.2" - postcss-value-parser "^4.2.0" + "cssnano-utils" "^3.0.2" + "postcss-value-parser" "^4.2.0" -postcss-merge-longhand@^5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.6.tgz#090e60d5d3b3caad899f8774f8dccb33217d2166" - integrity sha512-rkmoPwQO6ymJSmWsX6l2hHeEBQa7C4kJb9jyi5fZB1sE8nSCv7sqchoYPixRwX/yvLoZP2y6FA5kcjiByeJqDg== +"postcss-merge-longhand@^5.0.6": + "integrity" "sha512-rkmoPwQO6ymJSmWsX6l2hHeEBQa7C4kJb9jyi5fZB1sE8nSCv7sqchoYPixRwX/yvLoZP2y6FA5kcjiByeJqDg==" + "resolved" "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.6.tgz" + "version" "5.0.6" dependencies: - postcss-value-parser "^4.2.0" - stylehacks "^5.0.3" + "postcss-value-parser" "^4.2.0" + "stylehacks" "^5.0.3" -postcss-merge-rules@^5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.6.tgz#26b37411fe1e80202fcef61cab027265b8925f2b" - integrity sha512-nzJWJ9yXWp8AOEpn/HFAW72WKVGD2bsLiAmgw4hDchSij27bt6TF+sIK0cJUBAYT3SGcjtGGsOR89bwkkMuMgQ== +"postcss-merge-rules@^5.0.6": + "integrity" "sha512-nzJWJ9yXWp8AOEpn/HFAW72WKVGD2bsLiAmgw4hDchSij27bt6TF+sIK0cJUBAYT3SGcjtGGsOR89bwkkMuMgQ==" + "resolved" "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.6.tgz" + "version" "5.0.6" dependencies: - browserslist "^4.16.6" - caniuse-api "^3.0.0" - cssnano-utils "^3.0.2" - postcss-selector-parser "^6.0.5" + "browserslist" "^4.16.6" + "caniuse-api" "^3.0.0" + "cssnano-utils" "^3.0.2" + "postcss-selector-parser" "^6.0.5" -postcss-minify-font-values@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.4.tgz#627d824406b0712243221891f40a44fffe1467fd" - integrity sha512-RN6q3tyuEesvyCYYFCRGJ41J1XFvgV+dvYGHr0CeHv8F00yILlN8Slf4t8XW4IghlfZYCeyRrANO6HpJ948ieA== +"postcss-minify-font-values@^5.0.4": + "integrity" "sha512-RN6q3tyuEesvyCYYFCRGJ41J1XFvgV+dvYGHr0CeHv8F00yILlN8Slf4t8XW4IghlfZYCeyRrANO6HpJ948ieA==" + "resolved" "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-minify-gradients@^5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.6.tgz#b07cef51a93f075e94053fd972ff1cba2eaf6503" - integrity sha512-E/dT6oVxB9nLGUTiY/rG5dX9taugv9cbLNTFad3dKxOO+BQg25Q/xo2z2ddG+ZB1CbkZYaVwx5blY8VC7R/43A== +"postcss-minify-gradients@^5.0.6": + "integrity" "sha512-E/dT6oVxB9nLGUTiY/rG5dX9taugv9cbLNTFad3dKxOO+BQg25Q/xo2z2ddG+ZB1CbkZYaVwx5blY8VC7R/43A==" + "resolved" "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.6.tgz" + "version" "5.0.6" dependencies: - colord "^2.9.1" - cssnano-utils "^3.0.2" - postcss-value-parser "^4.2.0" + "colord" "^2.9.1" + "cssnano-utils" "^3.0.2" + "postcss-value-parser" "^4.2.0" -postcss-minify-params@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.5.tgz#86cb624358cd45c21946f8c317893f0449396646" - integrity sha512-YBNuq3Rz5LfLFNHb9wrvm6t859b8qIqfXsWeK7wROm3jSKNpO1Y5e8cOyBv6Acji15TgSrAwb3JkVNCqNyLvBg== +"postcss-minify-params@^5.0.5": + "integrity" "sha512-YBNuq3Rz5LfLFNHb9wrvm6t859b8qIqfXsWeK7wROm3jSKNpO1Y5e8cOyBv6Acji15TgSrAwb3JkVNCqNyLvBg==" + "resolved" "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.5.tgz" + "version" "5.0.5" dependencies: - browserslist "^4.16.6" - cssnano-utils "^3.0.2" - postcss-value-parser "^4.2.0" + "browserslist" "^4.16.6" + "cssnano-utils" "^3.0.2" + "postcss-value-parser" "^4.2.0" -postcss-minify-selectors@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.3.tgz#6ac12d52aa661fd509469d87ab2cebb0a1e3a1b5" - integrity sha512-9RJfTiQEKA/kZhMaEXND893nBqmYQ8qYa/G+uPdVnXF6D/FzpfI6kwBtWEcHx5FqDbA79O9n6fQJfrIj6M8jvQ== +"postcss-minify-selectors@^5.1.3": + "integrity" "sha512-9RJfTiQEKA/kZhMaEXND893nBqmYQ8qYa/G+uPdVnXF6D/FzpfI6kwBtWEcHx5FqDbA79O9n6fQJfrIj6M8jvQ==" + "resolved" "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.3.tgz" + "version" "5.1.3" dependencies: - postcss-selector-parser "^6.0.5" + "postcss-selector-parser" "^6.0.5" -postcss-modules-extract-imports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" - integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== +"postcss-modules-extract-imports@^3.0.0": + "integrity" "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==" + "resolved" "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz" + "version" "3.0.0" -postcss-modules-local-by-default@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" - integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== +"postcss-modules-local-by-default@^4.0.0": + "integrity" "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==" + "resolved" "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz" + "version" "4.0.0" dependencies: - icss-utils "^5.0.0" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.1.0" + "icss-utils" "^5.0.0" + "postcss-selector-parser" "^6.0.2" + "postcss-value-parser" "^4.1.0" -postcss-modules-scope@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" - integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== +"postcss-modules-scope@^3.0.0": + "integrity" "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==" + "resolved" "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz" + "version" "3.0.0" dependencies: - postcss-selector-parser "^6.0.4" + "postcss-selector-parser" "^6.0.4" -postcss-modules-values@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" - integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== +"postcss-modules-values@^4.0.0": + "integrity" "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==" + "resolved" "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz" + "version" "4.0.0" dependencies: - icss-utils "^5.0.0" + "icss-utils" "^5.0.0" -postcss-normalize-charset@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.3.tgz#719fb9f9ca9835fcbd4fed8d6e0d72a79e7b5472" - integrity sha512-iKEplDBco9EfH7sx4ut7R2r/dwTnUqyfACf62Unc9UiyFuI7uUqZZtY+u+qp7g8Qszl/U28HIfcsI3pEABWFfA== +"postcss-normalize-charset@^5.0.3": + "integrity" "sha512-iKEplDBco9EfH7sx4ut7R2r/dwTnUqyfACf62Unc9UiyFuI7uUqZZtY+u+qp7g8Qszl/U28HIfcsI3pEABWFfA==" + "resolved" "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.3.tgz" + "version" "5.0.3" -postcss-normalize-display-values@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.3.tgz#94cc82e20c51cc4ffba6b36e9618adc1e50db8c1" - integrity sha512-FIV5FY/qs4Ja32jiDb5mVj5iWBlS3N8tFcw2yg98+8MkRgyhtnBgSC0lxU+16AMHbjX5fbSJgw5AXLMolonuRQ== +"postcss-normalize-display-values@^5.0.3": + "integrity" "sha512-FIV5FY/qs4Ja32jiDb5mVj5iWBlS3N8tFcw2yg98+8MkRgyhtnBgSC0lxU+16AMHbjX5fbSJgw5AXLMolonuRQ==" + "resolved" "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.3.tgz" + "version" "5.0.3" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-normalize-positions@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.4.tgz#4001f38c99675437b83277836fb4291887fcc6cc" - integrity sha512-qynirjBX0Lc73ROomZE3lzzmXXTu48/QiEzKgMeqh28+MfuHLsuqC9po4kj84igZqqFGovz8F8hf44hA3dPYmQ== +"postcss-normalize-positions@^5.0.4": + "integrity" "sha512-qynirjBX0Lc73ROomZE3lzzmXXTu48/QiEzKgMeqh28+MfuHLsuqC9po4kj84igZqqFGovz8F8hf44hA3dPYmQ==" + "resolved" "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-normalize-repeat-style@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.4.tgz#d005adf9ee45fae78b673031a376c0c871315145" - integrity sha512-Innt+wctD7YpfeDR7r5Ik6krdyppyAg2HBRpX88fo5AYzC1Ut/l3xaxACG0KsbX49cO2n5EB13clPwuYVt8cMA== +"postcss-normalize-repeat-style@^5.0.4": + "integrity" "sha512-Innt+wctD7YpfeDR7r5Ik6krdyppyAg2HBRpX88fo5AYzC1Ut/l3xaxACG0KsbX49cO2n5EB13clPwuYVt8cMA==" + "resolved" "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-normalize-string@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.4.tgz#b5e00a07597e7aa8a871817bfeac2bfaa59c3333" - integrity sha512-Dfk42l0+A1CDnVpgE606ENvdmksttLynEqTQf5FL3XGQOyqxjbo25+pglCUvziicTxjtI2NLUR6KkxyUWEVubQ== +"postcss-normalize-string@^5.0.4": + "integrity" "sha512-Dfk42l0+A1CDnVpgE606ENvdmksttLynEqTQf5FL3XGQOyqxjbo25+pglCUvziicTxjtI2NLUR6KkxyUWEVubQ==" + "resolved" "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-normalize-timing-functions@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.3.tgz#47210227bfcba5e52650d7a18654337090de7072" - integrity sha512-QRfjvFh11moN4PYnJ7hia4uJXeFotyK3t2jjg8lM9mswleGsNw2Lm3I5wO+l4k1FzK96EFwEVn8X8Ojrp2gP4g== +"postcss-normalize-timing-functions@^5.0.3": + "integrity" "sha512-QRfjvFh11moN4PYnJ7hia4uJXeFotyK3t2jjg8lM9mswleGsNw2Lm3I5wO+l4k1FzK96EFwEVn8X8Ojrp2gP4g==" + "resolved" "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.3.tgz" + "version" "5.0.3" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-normalize-unicode@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.4.tgz#02866096937005cdb2c17116c690f29505a1623d" - integrity sha512-W79Regn+a+eXTzB+oV/8XJ33s3pDyFTND2yDuUCo0Xa3QSy1HtNIfRVPXNubHxjhlqmMFADr3FSCHT84ITW3ig== +"postcss-normalize-unicode@^5.0.4": + "integrity" "sha512-W79Regn+a+eXTzB+oV/8XJ33s3pDyFTND2yDuUCo0Xa3QSy1HtNIfRVPXNubHxjhlqmMFADr3FSCHT84ITW3ig==" + "resolved" "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.4.tgz" + "version" "5.0.4" dependencies: - browserslist "^4.16.6" - postcss-value-parser "^4.2.0" + "browserslist" "^4.16.6" + "postcss-value-parser" "^4.2.0" -postcss-normalize-url@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.5.tgz#c39efc12ff119f6f45f0b4f516902b12c8080e3a" - integrity sha512-Ws3tX+PcekYlXh+ycAt0wyzqGthkvVtZ9SZLutMVvHARxcpu4o7vvXcNoiNKyjKuWecnjS6HDI3fjBuDr5MQxQ== +"postcss-normalize-url@^5.0.5": + "integrity" "sha512-Ws3tX+PcekYlXh+ycAt0wyzqGthkvVtZ9SZLutMVvHARxcpu4o7vvXcNoiNKyjKuWecnjS6HDI3fjBuDr5MQxQ==" + "resolved" "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.5.tgz" + "version" "5.0.5" dependencies: - normalize-url "^6.0.1" - postcss-value-parser "^4.2.0" + "normalize-url" "^6.0.1" + "postcss-value-parser" "^4.2.0" -postcss-normalize-whitespace@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.4.tgz#1d477e7da23fecef91fc4e37d462272c7b55c5ca" - integrity sha512-wsnuHolYZjMwWZJoTC9jeI2AcjA67v4UuidDrPN9RnX8KIZfE+r2Nd6XZRwHVwUiHmRvKQtxiqo64K+h8/imaw== +"postcss-normalize-whitespace@^5.0.4": + "integrity" "sha512-wsnuHolYZjMwWZJoTC9jeI2AcjA67v4UuidDrPN9RnX8KIZfE+r2Nd6XZRwHVwUiHmRvKQtxiqo64K+h8/imaw==" + "resolved" "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-ordered-values@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.5.tgz#e878af822a130c3f3709737e24cb815ca7c6d040" - integrity sha512-mfY7lXpq+8bDEHfP+muqibDPhZ5eP9zgBEF9XRvoQgXcQe2Db3G1wcvjbnfjXG6wYsl+0UIjikqq4ym1V2jGMQ== +"postcss-ordered-values@^5.0.5": + "integrity" "sha512-mfY7lXpq+8bDEHfP+muqibDPhZ5eP9zgBEF9XRvoQgXcQe2Db3G1wcvjbnfjXG6wYsl+0UIjikqq4ym1V2jGMQ==" + "resolved" "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.5.tgz" + "version" "5.0.5" dependencies: - cssnano-utils "^3.0.2" - postcss-value-parser "^4.2.0" + "cssnano-utils" "^3.0.2" + "postcss-value-parser" "^4.2.0" -postcss-reduce-idents@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-5.0.3.tgz#b632796275b4fa1a4040799969dd17167eaf4d8b" - integrity sha512-9bj9/Xhwiti0Z35kkguJX4G6yUYVw8S1kRLU4jFSCTEuHu4yJggf4rNUoVnT45lm/vU97Wd593CxspMDbHxy4w== +"postcss-reduce-idents@^5.0.3": + "integrity" "sha512-9bj9/Xhwiti0Z35kkguJX4G6yUYVw8S1kRLU4jFSCTEuHu4yJggf4rNUoVnT45lm/vU97Wd593CxspMDbHxy4w==" + "resolved" "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-5.0.3.tgz" + "version" "5.0.3" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-reduce-initial@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.3.tgz#68891594defd648253703bbd8f1093162f19568d" - integrity sha512-c88TkSnQ/Dnwgb4OZbKPOBbCaauwEjbECP5uAuFPOzQ+XdjNjRH7SG0dteXrpp1LlIFEKK76iUGgmw2V0xeieA== +"postcss-reduce-initial@^5.0.3": + "integrity" "sha512-c88TkSnQ/Dnwgb4OZbKPOBbCaauwEjbECP5uAuFPOzQ+XdjNjRH7SG0dteXrpp1LlIFEKK76iUGgmw2V0xeieA==" + "resolved" "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.0.3.tgz" + "version" "5.0.3" dependencies: - browserslist "^4.16.6" - caniuse-api "^3.0.0" + "browserslist" "^4.16.6" + "caniuse-api" "^3.0.0" -postcss-reduce-transforms@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.4.tgz#717e72d30befe857f7d2784dba10eb1157863712" - integrity sha512-VIJB9SFSaL8B/B7AXb7KHL6/GNNbbCHslgdzS9UDfBZYIA2nx8NLY7iD/BXFSO/1sRUILzBTfHCoW5inP37C5g== +"postcss-reduce-transforms@^5.0.4": + "integrity" "sha512-VIJB9SFSaL8B/B7AXb7KHL6/GNNbbCHslgdzS9UDfBZYIA2nx8NLY7iD/BXFSO/1sRUILzBTfHCoW5inP37C5g==" + "resolved" "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: - version "6.0.9" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f" - integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ== +"postcss-selector-parser@^6.0.2", "postcss-selector-parser@^6.0.4", "postcss-selector-parser@^6.0.5", "postcss-selector-parser@^6.0.9": + "integrity" "sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==" + "resolved" "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz" + "version" "6.0.9" dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" + "cssesc" "^3.0.0" + "util-deprecate" "^1.0.2" -postcss-sort-media-queries@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/postcss-sort-media-queries/-/postcss-sort-media-queries-4.2.1.tgz#a99bae69ef1098ee3b64a5fa94d258ec240d0355" - integrity sha512-9VYekQalFZ3sdgcTjXMa0dDjsfBVHXlraYJEMiOJ/2iMmI2JGCMavP16z3kWOaRu8NSaJCTgVpB/IVpH5yT9YQ== +"postcss-sort-media-queries@^4.1.0": + "integrity" "sha512-9VYekQalFZ3sdgcTjXMa0dDjsfBVHXlraYJEMiOJ/2iMmI2JGCMavP16z3kWOaRu8NSaJCTgVpB/IVpH5yT9YQ==" + "resolved" "https://registry.npmjs.org/postcss-sort-media-queries/-/postcss-sort-media-queries-4.2.1.tgz" + "version" "4.2.1" dependencies: - sort-css-media-queries "2.0.4" + "sort-css-media-queries" "2.0.4" -postcss-svgo@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.4.tgz#cfa8682f47b88f7cd75108ec499e133b43102abf" - integrity sha512-yDKHvULbnZtIrRqhZoA+rxreWpee28JSRH/gy9727u0UCgtpv1M/9WEWY3xySlFa0zQJcqf6oCBJPR5NwkmYpg== +"postcss-svgo@^5.0.4": + "integrity" "sha512-yDKHvULbnZtIrRqhZoA+rxreWpee28JSRH/gy9727u0UCgtpv1M/9WEWY3xySlFa0zQJcqf6oCBJPR5NwkmYpg==" + "resolved" "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" - svgo "^2.7.0" + "postcss-value-parser" "^4.2.0" + "svgo" "^2.7.0" -postcss-unique-selectors@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.4.tgz#08e188126b634ddfa615fb1d6c262bafdd64826e" - integrity sha512-5ampwoSDJCxDPoANBIlMgoBcYUHnhaiuLYJR5pj1DLnYQvMRVyFuTA5C3Bvt+aHtiqWpJkD/lXT50Vo1D0ZsAQ== +"postcss-unique-selectors@^5.0.4": + "integrity" "sha512-5ampwoSDJCxDPoANBIlMgoBcYUHnhaiuLYJR5pj1DLnYQvMRVyFuTA5C3Bvt+aHtiqWpJkD/lXT50Vo1D0ZsAQ==" + "resolved" "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-selector-parser "^6.0.5" + "postcss-selector-parser" "^6.0.5" -postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" - integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== +"postcss-value-parser@^4.1.0", "postcss-value-parser@^4.2.0": + "integrity" "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" + "resolved" "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" + "version" "4.2.0" -postcss-zindex@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-5.0.2.tgz#7e48aee54062c93418593035229ea06b92381251" - integrity sha512-KPQFjQu73H35HLHmE8Wv31ygfQoucxD52oRm4FPFv1emYhFMzUQdF8adaXCevFLIHPRp2rRYfbaDiEqZ4YjVtw== +"postcss-zindex@^5.0.2": + "integrity" "sha512-KPQFjQu73H35HLHmE8Wv31ygfQoucxD52oRm4FPFv1emYhFMzUQdF8adaXCevFLIHPRp2rRYfbaDiEqZ4YjVtw==" + "resolved" "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-5.0.2.tgz" + "version" "5.0.2" -postcss@^8.3.11, postcss@^8.3.5, postcss@^8.3.7, postcss@^8.4.5: - version "8.4.6" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.6.tgz#c5ff3c3c457a23864f32cb45ac9b741498a09ae1" - integrity sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA== +"postcss@^7.0.0 || ^8.0.1", "postcss@^8.0.9", "postcss@^8.1.0", "postcss@^8.2.15", "postcss@^8.2.2", "postcss@^8.3.11", "postcss@^8.3.5", "postcss@^8.3.7", "postcss@^8.4.4", "postcss@^8.4.5": + "integrity" "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==" + "resolved" "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz" + "version" "8.4.6" dependencies: - nanoid "^3.2.0" - picocolors "^1.0.0" - source-map-js "^1.0.2" + "nanoid" "^3.2.0" + "picocolors" "^1.0.0" + "source-map-js" "^1.0.2" -prepend-http@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= +"prepend-http@^2.0.0": + "integrity" "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" + "resolved" "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz" + "version" "2.0.0" -pretty-error@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6" - integrity sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw== +"pretty-error@^4.0.0": + "integrity" "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==" + "resolved" "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz" + "version" "4.0.0" dependencies: - lodash "^4.17.20" - renderkid "^3.0.0" + "lodash" "^4.17.20" + "renderkid" "^3.0.0" -pretty-time@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e" - integrity sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA== +"pretty-time@^1.1.0": + "integrity" "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==" + "resolved" "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz" + "version" "1.1.0" -prism-react-renderer@^1.2.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.1.tgz#88fc9d0df6bed06ca2b9097421349f8c2f24e30d" - integrity sha512-xUeDMEz074d0zc5y6rxiMp/dlC7C+5IDDlaEUlcBOFE2wddz7hz5PNupb087mPwTt7T9BrFmewObfCBuf/LKwQ== +"prism-react-renderer@^1.2.1": + "integrity" "sha512-xUeDMEz074d0zc5y6rxiMp/dlC7C+5IDDlaEUlcBOFE2wddz7hz5PNupb087mPwTt7T9BrFmewObfCBuf/LKwQ==" + "resolved" "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-1.3.1.tgz" + "version" "1.3.1" -prismjs@^1.23.0: - version "1.27.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057" - integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA== +"prismjs@^1.23.0": + "integrity" "sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==" + "resolved" "https://registry.npmjs.org/prismjs/-/prismjs-1.27.0.tgz" + "version" "1.27.0" -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== +"process-nextick-args@~2.0.0": + "integrity" "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + "resolved" "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz" + "version" "2.0.1" -promise@^7.1.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" - integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== +"promise@^7.1.1": + "integrity" "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==" + "resolved" "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz" + "version" "7.3.1" dependencies: - asap "~2.0.3" + "asap" "~2.0.3" -prompts@^2.4.1, prompts@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" - integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q== +"prompts@^2.4.1", "prompts@^2.4.2": + "integrity" "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==" + "resolved" "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz" + "version" "2.4.2" dependencies: - kleur "^3.0.3" - sisteransi "^1.0.5" + "kleur" "^3.0.3" + "sisteransi" "^1.0.5" -prop-types@^15.6.2, prop-types@^15.7.2: - version "15.8.1" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" - integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== +"prop-types@^15.0.0", "prop-types@^15.6.2", "prop-types@^15.7.2": + "integrity" "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==" + "resolved" "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz" + "version" "15.8.1" dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.13.1" + "loose-envify" "^1.4.0" + "object-assign" "^4.1.1" + "react-is" "^16.13.1" -property-information@^5.0.0, property-information@^5.3.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69" - integrity sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA== +"property-information@^5.0.0", "property-information@^5.3.0": + "integrity" "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==" + "resolved" "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz" + "version" "5.6.0" dependencies: - xtend "^4.0.0" + "xtend" "^4.0.0" -proxy-addr@~2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" - integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== +"proxy-addr@~2.0.7": + "integrity" "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==" + "resolved" "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz" + "version" "2.0.7" dependencies: - forwarded "0.2.0" - ipaddr.js "1.9.1" + "forwarded" "0.2.0" + "ipaddr.js" "1.9.1" -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== +"pump@^3.0.0": + "integrity" "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==" + "resolved" "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz" + "version" "3.0.0" dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" + "end-of-stream" "^1.1.0" + "once" "^1.3.1" -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= +"punycode@^1.3.2": + "integrity" "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "resolved" "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz" + "version" "1.4.1" -punycode@^1.3.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= +"punycode@^2.1.0": + "integrity" "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + "resolved" "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz" + "version" "2.1.1" -punycode@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== +"punycode@1.3.2": + "integrity" "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" + "resolved" "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz" + "version" "1.3.2" -pupa@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" - integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== +"pupa@^2.1.1": + "integrity" "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==" + "resolved" "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz" + "version" "2.1.1" dependencies: - escape-goat "^2.0.0" + "escape-goat" "^2.0.0" -pure-color@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz#1fe064fb0ac851f0de61320a8bf796836422f33e" - integrity sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4= +"pure-color@^1.2.0": + "integrity" "sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4=" + "resolved" "https://registry.npmjs.org/pure-color/-/pure-color-1.3.0.tgz" + "version" "1.3.0" -qs@6.9.7: - version "6.9.7" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe" - integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== +"qs@6.9.7": + "integrity" "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==" + "resolved" "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz" + "version" "6.9.7" -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= +"querystring@0.2.0": + "integrity" "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" + "resolved" "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz" + "version" "0.2.0" -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== +"queue-microtask@^1.2.2": + "integrity" "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" + "resolved" "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" + "version" "1.2.3" -queue@6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65" - integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA== +"queue@6.0.2": + "integrity" "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==" + "resolved" "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz" + "version" "6.0.2" dependencies: - inherits "~2.0.3" + "inherits" "~2.0.3" -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== +"randombytes@^2.1.0": + "integrity" "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==" + "resolved" "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz" + "version" "2.1.0" dependencies: - safe-buffer "^5.1.0" + "safe-buffer" "^5.1.0" -range-parser@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" - integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4= +"range-parser@^1.2.1", "range-parser@~1.2.1": + "integrity" "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + "resolved" "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz" + "version" "1.2.1" -range-parser@^1.2.1, range-parser@~1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" - integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== +"range-parser@1.2.0": + "integrity" "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=" + "resolved" "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz" + "version" "1.2.0" -raw-body@2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c" - integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g== +"raw-body@2.4.3": + "integrity" "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==" + "resolved" "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz" + "version" "2.4.3" dependencies: - bytes "3.1.2" - http-errors "1.8.1" - iconv-lite "0.4.24" - unpipe "1.0.0" + "bytes" "3.1.2" + "http-errors" "1.8.1" + "iconv-lite" "0.4.24" + "unpipe" "1.0.0" -rc@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== +"rc@^1.2.8": + "integrity" "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==" + "resolved" "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz" + "version" "1.2.8" dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" + "deep-extend" "^0.6.0" + "ini" "~1.3.0" + "minimist" "^1.2.0" + "strip-json-comments" "~2.0.1" -react-base16-styling@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.6.0.tgz#ef2156d66cf4139695c8a167886cb69ea660792c" - integrity sha1-7yFW1mz0E5aVyKFniGy2nqZgeSw= +"react-base16-styling@^0.6.0": + "integrity" "sha1-7yFW1mz0E5aVyKFniGy2nqZgeSw=" + "resolved" "https://registry.npmjs.org/react-base16-styling/-/react-base16-styling-0.6.0.tgz" + "version" "0.6.0" dependencies: - base16 "^1.0.0" - lodash.curry "^4.0.1" - lodash.flow "^3.3.0" - pure-color "^1.2.0" + "base16" "^1.0.0" + "lodash.curry" "^4.0.1" + "lodash.flow" "^3.3.0" + "pure-color" "^1.2.0" -react-dev-utils@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.0.tgz#4eab12cdb95692a077616770b5988f0adf806526" - integrity sha512-xBQkitdxozPxt1YZ9O1097EJiVpwHr9FoAuEVURCKV0Av8NBERovJauzP7bo1ThvuhZ4shsQ1AJiu4vQpoT1AQ== +"react-dev-utils@^12.0.0": + "integrity" "sha512-xBQkitdxozPxt1YZ9O1097EJiVpwHr9FoAuEVURCKV0Av8NBERovJauzP7bo1ThvuhZ4shsQ1AJiu4vQpoT1AQ==" + "resolved" "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.0.tgz" + "version" "12.0.0" dependencies: "@babel/code-frame" "^7.16.0" - address "^1.1.2" - browserslist "^4.18.1" - chalk "^4.1.2" - cross-spawn "^7.0.3" - detect-port-alt "^1.1.6" - escape-string-regexp "^4.0.0" - filesize "^8.0.6" - find-up "^5.0.0" - fork-ts-checker-webpack-plugin "^6.5.0" - global-modules "^2.0.0" - globby "^11.0.4" - gzip-size "^6.0.0" - immer "^9.0.7" - is-root "^2.1.0" - loader-utils "^3.2.0" - open "^8.4.0" - pkg-up "^3.1.0" - prompts "^2.4.2" - react-error-overlay "^6.0.10" - recursive-readdir "^2.2.2" - shell-quote "^1.7.3" - strip-ansi "^6.0.1" - text-table "^0.2.0" + "address" "^1.1.2" + "browserslist" "^4.18.1" + "chalk" "^4.1.2" + "cross-spawn" "^7.0.3" + "detect-port-alt" "^1.1.6" + "escape-string-regexp" "^4.0.0" + "filesize" "^8.0.6" + "find-up" "^5.0.0" + "fork-ts-checker-webpack-plugin" "^6.5.0" + "global-modules" "^2.0.0" + "globby" "^11.0.4" + "gzip-size" "^6.0.0" + "immer" "^9.0.7" + "is-root" "^2.1.0" + "loader-utils" "^3.2.0" + "open" "^8.4.0" + "pkg-up" "^3.1.0" + "prompts" "^2.4.2" + "react-error-overlay" "^6.0.10" + "recursive-readdir" "^2.2.2" + "shell-quote" "^1.7.3" + "strip-ansi" "^6.0.1" + "text-table" "^0.2.0" -react-dom@^16.10.2: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" - integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw== +"react-dom@*", "react-dom@^16.10.2", "react-dom@^16.8.4 || ^17.0.0", "react-dom@^17.0.0 || ^16.3.0 || ^15.5.4", "react-dom@>= 16.8.0 < 18.0.0": + "integrity" "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==" + "resolved" "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz" + "version" "16.14.0" dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.19.1" + "loose-envify" "^1.1.0" + "object-assign" "^4.1.1" + "prop-types" "^15.6.2" + "scheduler" "^0.19.1" -react-error-overlay@^6.0.10: - version "6.0.10" - resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.10.tgz#0fe26db4fa85d9dbb8624729580e90e7159a59a6" - integrity sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA== +"react-error-overlay@^6.0.10": + "integrity" "sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA==" + "resolved" "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.10.tgz" + "version" "6.0.10" -react-fast-compare@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" - integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== +"react-fast-compare@^3.1.1": + "integrity" "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==" + "resolved" "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz" + "version" "3.2.0" -react-helmet@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726" - integrity sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw== +"react-helmet@^6.1.0": + "integrity" "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==" + "resolved" "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz" + "version" "6.1.0" dependencies: - object-assign "^4.1.1" - prop-types "^15.7.2" - react-fast-compare "^3.1.1" - react-side-effect "^2.1.0" + "object-assign" "^4.1.1" + "prop-types" "^15.7.2" + "react-fast-compare" "^3.1.1" + "react-side-effect" "^2.1.0" -react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" - integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== +"react-is@^16.13.1", "react-is@^16.6.0", "react-is@^16.7.0": + "integrity" "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + "resolved" "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" + "version" "16.13.1" -react-json-view@^1.21.3: - version "1.21.3" - resolved "https://registry.yarnpkg.com/react-json-view/-/react-json-view-1.21.3.tgz#f184209ee8f1bf374fb0c41b0813cff54549c475" - integrity sha512-13p8IREj9/x/Ye4WI/JpjhoIwuzEgUAtgJZNBJckfzJt1qyh24BdTm6UQNGnyTq9dapQdrqvquZTo3dz1X6Cjw== +"react-json-view@^1.21.3": + "integrity" "sha512-13p8IREj9/x/Ye4WI/JpjhoIwuzEgUAtgJZNBJckfzJt1qyh24BdTm6UQNGnyTq9dapQdrqvquZTo3dz1X6Cjw==" + "resolved" "https://registry.npmjs.org/react-json-view/-/react-json-view-1.21.3.tgz" + "version" "1.21.3" dependencies: - flux "^4.0.1" - react-base16-styling "^0.6.0" - react-lifecycles-compat "^3.0.4" - react-textarea-autosize "^8.3.2" + "flux" "^4.0.1" + "react-base16-styling" "^0.6.0" + "react-lifecycles-compat" "^3.0.4" + "react-textarea-autosize" "^8.3.2" -react-lifecycles-compat@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" - integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== +"react-lifecycles-compat@^3.0.4": + "integrity" "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" + "resolved" "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz" + "version" "3.0.4" -react-loadable-ssr-addon-v5-slorber@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/react-loadable-ssr-addon-v5-slorber/-/react-loadable-ssr-addon-v5-slorber-1.0.1.tgz#2cdc91e8a744ffdf9e3556caabeb6e4278689883" - integrity sha512-lq3Lyw1lGku8zUEJPDxsNm1AfYHBrO9Y1+olAYwpUJ2IGFBskM0DMKok97A6LWUpHm+o7IvQBOWu9MLenp9Z+A== +"react-loadable-ssr-addon-v5-slorber@^1.0.1": + "integrity" "sha512-lq3Lyw1lGku8zUEJPDxsNm1AfYHBrO9Y1+olAYwpUJ2IGFBskM0DMKok97A6LWUpHm+o7IvQBOWu9MLenp9Z+A==" + "resolved" "https://registry.npmjs.org/react-loadable-ssr-addon-v5-slorber/-/react-loadable-ssr-addon-v5-slorber-1.0.1.tgz" + "version" "1.0.1" dependencies: "@babel/runtime" "^7.10.3" -react-popupbox@^2.0.8: - version "2.0.8" - resolved "https://registry.yarnpkg.com/react-popupbox/-/react-popupbox-2.0.8.tgz#9e0c96dcf4ddbbea8d03c28ee6c0634f0d51b791" - integrity sha512-5DT0SxLMIchKgnUkdPwTzvFhtTL5SOQd6n5dzUnnELiimjFE8eaQwL1n58NZUxs9oJsHXF3qQNvcgwEfn8VHrw== +"react-loadable@*", "react-loadable@npm:@docusaurus/react-loadable@5.5.2": + "integrity" "sha512-A3dYjdBGuy0IGT+wyLIGIKLRE+sAk1iNk0f1HjNDysO7u8lhL4N3VEm+FAubmJbAztn94F7MxBTPmnixbiyFdQ==" + "resolved" "https://registry.npmjs.org/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz" + "version" "5.5.2" dependencies: - deepmerge "^1.3.2" - react "^16.3.1" + "@types/react" "*" + "prop-types" "^15.6.2" -react-router-config@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/react-router-config/-/react-router-config-5.1.1.tgz#0f4263d1a80c6b2dc7b9c1902c9526478194a988" - integrity sha512-DuanZjaD8mQp1ppHjgnnUnyOlqYXZVjnov/JzFhjLEwd3Z4dYjMSnqrEzzGThH47vpCOqPPwJM2FtthLeJ8Pbg== +"react-popupbox@^2.0.8": + "integrity" "sha512-5DT0SxLMIchKgnUkdPwTzvFhtTL5SOQd6n5dzUnnELiimjFE8eaQwL1n58NZUxs9oJsHXF3qQNvcgwEfn8VHrw==" + "resolved" "https://registry.npmjs.org/react-popupbox/-/react-popupbox-2.0.8.tgz" + "version" "2.0.8" + dependencies: + "deepmerge" "^1.3.2" + "react" "^16.3.1" + +"react-router-config@^5.1.1": + "integrity" "sha512-DuanZjaD8mQp1ppHjgnnUnyOlqYXZVjnov/JzFhjLEwd3Z4dYjMSnqrEzzGThH47vpCOqPPwJM2FtthLeJ8Pbg==" + "resolved" "https://registry.npmjs.org/react-router-config/-/react-router-config-5.1.1.tgz" + "version" "5.1.1" dependencies: "@babel/runtime" "^7.1.2" -react-router-dom@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363" - integrity sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ== +"react-router-dom@^5.2.0": + "integrity" "sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ==" + "resolved" "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.0.tgz" + "version" "5.3.0" dependencies: "@babel/runtime" "^7.12.13" - history "^4.9.0" - loose-envify "^1.3.1" - prop-types "^15.6.2" - react-router "5.2.1" - tiny-invariant "^1.0.2" - tiny-warning "^1.0.0" + "history" "^4.9.0" + "loose-envify" "^1.3.1" + "prop-types" "^15.6.2" + "react-router" "5.2.1" + "tiny-invariant" "^1.0.2" + "tiny-warning" "^1.0.0" -react-router@5.2.1, react-router@^5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d" - integrity sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ== +"react-router@^5.2.0", "react-router@>=5", "react-router@5.2.1": + "integrity" "sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ==" + "resolved" "https://registry.npmjs.org/react-router/-/react-router-5.2.1.tgz" + "version" "5.2.1" dependencies: "@babel/runtime" "^7.12.13" - history "^4.9.0" - hoist-non-react-statics "^3.1.0" - loose-envify "^1.3.1" - mini-create-react-context "^0.4.0" - path-to-regexp "^1.7.0" - prop-types "^15.6.2" - react-is "^16.6.0" - tiny-invariant "^1.0.2" - tiny-warning "^1.0.0" + "history" "^4.9.0" + "hoist-non-react-statics" "^3.1.0" + "loose-envify" "^1.3.1" + "mini-create-react-context" "^0.4.0" + "path-to-regexp" "^1.7.0" + "prop-types" "^15.6.2" + "react-is" "^16.6.0" + "tiny-invariant" "^1.0.2" + "tiny-warning" "^1.0.0" -react-side-effect@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3" - integrity sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ== +"react-side-effect@^2.1.0": + "integrity" "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==" + "resolved" "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz" + "version" "2.1.1" -react-textarea-autosize@^8.3.2: - version "8.3.3" - resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz#f70913945369da453fd554c168f6baacd1fa04d8" - integrity sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ== +"react-textarea-autosize@^8.3.2": + "integrity" "sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ==" + "resolved" "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz" + "version" "8.3.3" dependencies: "@babel/runtime" "^7.10.2" - use-composed-ref "^1.0.0" - use-latest "^1.0.0" + "use-composed-ref" "^1.0.0" + "use-latest" "^1.0.0" -react@^16.10.2, react@^16.3.1: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" - integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g== +"react@*", "react@^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0", "react@^15.0.2 || ^16.0.0 || ^17.0.0", "react@^16.10.2", "react@^16.13.1", "react@^16.13.1 || ^17.0.0", "react@^16.14.0", "react@^16.3.0 || ^17.0.0", "react@^16.3.1", "react@^16.8.0 || ^17.0.0", "react@^16.8.4 || ^17.0.0", "react@^17.0.0 || ^16.3.0 || ^15.5.4", "react@>= 16.8.0 < 18.0.0", "react@>=0.14.9", "react@>=15", "react@>=16.3.0": + "integrity" "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==" + "resolved" "https://registry.npmjs.org/react/-/react-16.14.0.tgz" + "version" "16.14.0" dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" + "loose-envify" "^1.1.0" + "object-assign" "^4.1.1" + "prop-types" "^15.6.2" -readable-stream@^2.0.1: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== +"readable-stream@^2.0.1": + "integrity" "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==" + "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz" + "version" "2.3.7" dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" + "core-util-is" "~1.0.0" + "inherits" "~2.0.3" + "isarray" "~1.0.0" + "process-nextick-args" "~2.0.0" + "safe-buffer" "~5.1.1" + "string_decoder" "~1.1.1" + "util-deprecate" "~1.0.1" -readable-stream@^3.0.6, readable-stream@^3.1.1: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== +"readable-stream@^3.0.6", "readable-stream@^3.1.1": + "integrity" "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==" + "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz" + "version" "3.6.0" dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" + "inherits" "^2.0.3" + "string_decoder" "^1.1.1" + "util-deprecate" "^1.0.1" -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== +"readdirp@~3.6.0": + "integrity" "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==" + "resolved" "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz" + "version" "3.6.0" dependencies: - picomatch "^2.2.1" + "picomatch" "^2.2.1" -reading-time@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/reading-time/-/reading-time-1.5.0.tgz#d2a7f1b6057cb2e169beaf87113cc3411b5bc5bb" - integrity sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg== +"reading-time@^1.5.0": + "integrity" "sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg==" + "resolved" "https://registry.npmjs.org/reading-time/-/reading-time-1.5.0.tgz" + "version" "1.5.0" -rechoir@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" - integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= +"rechoir@^0.6.2": + "integrity" "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=" + "resolved" "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz" + "version" "0.6.2" dependencies: - resolve "^1.1.6" + "resolve" "^1.1.6" -recursive-readdir@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f" - integrity sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg== +"recursive-readdir@^2.2.2": + "integrity" "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==" + "resolved" "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz" + "version" "2.2.2" dependencies: - minimatch "3.0.4" + "minimatch" "3.0.4" -regenerate-unicode-properties@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56" - integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw== +"regenerate-unicode-properties@^10.0.1": + "integrity" "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==" + "resolved" "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz" + "version" "10.0.1" dependencies: - regenerate "^1.4.2" + "regenerate" "^1.4.2" -regenerate-unicode-properties@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" - integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA== +"regenerate-unicode-properties@^9.0.0": + "integrity" "sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==" + "resolved" "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz" + "version" "9.0.0" dependencies: - regenerate "^1.4.2" + "regenerate" "^1.4.2" -regenerate@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" - integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== +"regenerate@^1.4.2": + "integrity" "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" + "resolved" "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz" + "version" "1.4.2" -regenerator-runtime@^0.13.4: - version "0.13.9" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" - integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== +"regenerator-runtime@^0.13.4": + "integrity" "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + "resolved" "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz" + "version" "0.13.9" -regenerator-transform@^0.14.2: - version "0.14.5" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" - integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw== +"regenerator-transform@^0.14.2": + "integrity" "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==" + "resolved" "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz" + "version" "0.14.5" dependencies: "@babel/runtime" "^7.8.4" -regexp.prototype.flags@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307" - integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ== +"regexp.prototype.flags@^1.2.0": + "integrity" "sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==" + "resolved" "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz" + "version" "1.4.1" dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" + "call-bind" "^1.0.2" + "define-properties" "^1.1.3" -regexpu-core@^4.5.4: - version "4.8.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" - integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg== +"regexpu-core@^4.5.4": + "integrity" "sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==" + "resolved" "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz" + "version" "4.8.0" dependencies: - regenerate "^1.4.2" - regenerate-unicode-properties "^9.0.0" - regjsgen "^0.5.2" - regjsparser "^0.7.0" - unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.0.0" + "regenerate" "^1.4.2" + "regenerate-unicode-properties" "^9.0.0" + "regjsgen" "^0.5.2" + "regjsparser" "^0.7.0" + "unicode-match-property-ecmascript" "^2.0.0" + "unicode-match-property-value-ecmascript" "^2.0.0" -regexpu-core@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3" - integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw== +"regexpu-core@^5.0.1": + "integrity" "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==" + "resolved" "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz" + "version" "5.0.1" dependencies: - regenerate "^1.4.2" - regenerate-unicode-properties "^10.0.1" - regjsgen "^0.6.0" - regjsparser "^0.8.2" - unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.0.0" + "regenerate" "^1.4.2" + "regenerate-unicode-properties" "^10.0.1" + "regjsgen" "^0.6.0" + "regjsparser" "^0.8.2" + "unicode-match-property-ecmascript" "^2.0.0" + "unicode-match-property-value-ecmascript" "^2.0.0" -registry-auth-token@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" - integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== +"registry-auth-token@^4.0.0": + "integrity" "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==" + "resolved" "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz" + "version" "4.2.1" dependencies: - rc "^1.2.8" + "rc" "^1.2.8" -registry-url@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" - integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== +"registry-url@^5.0.0": + "integrity" "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==" + "resolved" "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz" + "version" "5.1.0" dependencies: - rc "^1.2.8" + "rc" "^1.2.8" -regjsgen@^0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" - integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== +"regjsgen@^0.5.2": + "integrity" "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==" + "resolved" "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz" + "version" "0.5.2" -regjsgen@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d" - integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA== +"regjsgen@^0.6.0": + "integrity" "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==" + "resolved" "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz" + "version" "0.6.0" -regjsparser@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968" - integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ== +"regjsparser@^0.7.0": + "integrity" "sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==" + "resolved" "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz" + "version" "0.7.0" dependencies: - jsesc "~0.5.0" + "jsesc" "~0.5.0" -regjsparser@^0.8.2: - version "0.8.4" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f" - integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA== +"regjsparser@^0.8.2": + "integrity" "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==" + "resolved" "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz" + "version" "0.8.4" dependencies: - jsesc "~0.5.0" + "jsesc" "~0.5.0" -rehype-parse@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/rehype-parse/-/rehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" - integrity sha512-0S3CpvpTAgGmnz8kiCyFLGuW5yA4OQhyNTm/nwPopZ7+PI11WnGl1TTWTGv/2hPEe/g2jRLlhVVSsoDH8waRug== +"rehype-parse@^6.0.2": + "integrity" "sha512-0S3CpvpTAgGmnz8kiCyFLGuW5yA4OQhyNTm/nwPopZ7+PI11WnGl1TTWTGv/2hPEe/g2jRLlhVVSsoDH8waRug==" + "resolved" "https://registry.npmjs.org/rehype-parse/-/rehype-parse-6.0.2.tgz" + "version" "6.0.2" dependencies: - hast-util-from-parse5 "^5.0.0" - parse5 "^5.0.0" - xtend "^4.0.0" + "hast-util-from-parse5" "^5.0.0" + "parse5" "^5.0.0" + "xtend" "^4.0.0" -relateurl@^0.2.7: - version "0.2.7" - resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" - integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= +"relateurl@^0.2.7": + "integrity" "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=" + "resolved" "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz" + "version" "0.2.7" -remark-admonitions@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/remark-admonitions/-/remark-admonitions-1.2.1.tgz#87caa1a442aa7b4c0cafa04798ed58a342307870" - integrity sha512-Ji6p68VDvD+H1oS95Fdx9Ar5WA2wcDA4kwrrhVU7fGctC6+d3uiMICu7w7/2Xld+lnU7/gi+432+rRbup5S8ow== +"remark-admonitions@^1.2.1": + "integrity" "sha512-Ji6p68VDvD+H1oS95Fdx9Ar5WA2wcDA4kwrrhVU7fGctC6+d3uiMICu7w7/2Xld+lnU7/gi+432+rRbup5S8ow==" + "resolved" "https://registry.npmjs.org/remark-admonitions/-/remark-admonitions-1.2.1.tgz" + "version" "1.2.1" dependencies: - rehype-parse "^6.0.2" - unified "^8.4.2" - unist-util-visit "^2.0.1" + "rehype-parse" "^6.0.2" + "unified" "^8.4.2" + "unist-util-visit" "^2.0.1" -remark-emoji@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/remark-emoji/-/remark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" - integrity sha512-P3cj9s5ggsUvWw5fS2uzCHJMGuXYRb0NnZqYlNecewXt8QBU9n5vW3DUUKOhepS8F9CwdMx9B8a3i7pqFWAI5w== +"remark-emoji@^2.1.0": + "integrity" "sha512-P3cj9s5ggsUvWw5fS2uzCHJMGuXYRb0NnZqYlNecewXt8QBU9n5vW3DUUKOhepS8F9CwdMx9B8a3i7pqFWAI5w==" + "resolved" "https://registry.npmjs.org/remark-emoji/-/remark-emoji-2.2.0.tgz" + "version" "2.2.0" dependencies: - emoticon "^3.2.0" - node-emoji "^1.10.0" - unist-util-visit "^2.0.3" + "emoticon" "^3.2.0" + "node-emoji" "^1.10.0" + "unist-util-visit" "^2.0.3" -remark-footnotes@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/remark-footnotes/-/remark-footnotes-2.0.0.tgz#9001c4c2ffebba55695d2dd80ffb8b82f7e6303f" - integrity sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ== +"remark-footnotes@2.0.0": + "integrity" "sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==" + "resolved" "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-2.0.0.tgz" + "version" "2.0.0" -remark-mdx-remove-exports@^1.6.22: - version "1.6.22" - resolved "https://registry.yarnpkg.com/remark-mdx-remove-exports/-/remark-mdx-remove-exports-1.6.22.tgz#9e34f3d02c9c54b02ca0a1fde946449338d06ecb" - integrity sha512-7g2uiTmTGfz5QyVb+toeX25frbk1Y6yd03RXGPtqx0+DVh86Gb7MkNYbk7H2X27zdZ3CQv1W/JqlFO0Oo8IxVA== +"remark-mdx-remove-exports@^1.6.22": + "integrity" "sha512-7g2uiTmTGfz5QyVb+toeX25frbk1Y6yd03RXGPtqx0+DVh86Gb7MkNYbk7H2X27zdZ3CQv1W/JqlFO0Oo8IxVA==" + "resolved" "https://registry.npmjs.org/remark-mdx-remove-exports/-/remark-mdx-remove-exports-1.6.22.tgz" + "version" "1.6.22" dependencies: - unist-util-remove "2.0.0" + "unist-util-remove" "2.0.0" -remark-mdx-remove-imports@^1.6.22: - version "1.6.22" - resolved "https://registry.yarnpkg.com/remark-mdx-remove-imports/-/remark-mdx-remove-imports-1.6.22.tgz#79f711c95359cff437a120d1fbdc1326ec455826" - integrity sha512-lmjAXD8Ltw0TsvBzb45S+Dxx7LTJAtDaMneMAv8LAUIPEyYoKkmGbmVsiF0/pY6mhM1Q16swCmu1TN+ie/vn/A== +"remark-mdx-remove-imports@^1.6.22": + "integrity" "sha512-lmjAXD8Ltw0TsvBzb45S+Dxx7LTJAtDaMneMAv8LAUIPEyYoKkmGbmVsiF0/pY6mhM1Q16swCmu1TN+ie/vn/A==" + "resolved" "https://registry.npmjs.org/remark-mdx-remove-imports/-/remark-mdx-remove-imports-1.6.22.tgz" + "version" "1.6.22" dependencies: - unist-util-remove "2.0.0" + "unist-util-remove" "2.0.0" -remark-mdx@1.6.22: - version "1.6.22" - resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd" - integrity sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ== +"remark-mdx@1.6.22": + "integrity" "sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ==" + "resolved" "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.22.tgz" + "version" "1.6.22" dependencies: "@babel/core" "7.12.9" "@babel/helper-plugin-utils" "7.10.4" "@babel/plugin-proposal-object-rest-spread" "7.12.1" "@babel/plugin-syntax-jsx" "7.12.1" "@mdx-js/util" "1.6.22" - is-alphabetical "1.0.4" - remark-parse "8.0.3" - unified "9.2.0" + "is-alphabetical" "1.0.4" + "remark-parse" "8.0.3" + "unified" "9.2.0" -remark-parse@8.0.3: - version "8.0.3" - resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" - integrity sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q== +"remark-parse@8.0.3": + "integrity" "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==" + "resolved" "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz" + "version" "8.0.3" dependencies: - ccount "^1.0.0" - collapse-white-space "^1.0.2" - is-alphabetical "^1.0.0" - is-decimal "^1.0.0" - is-whitespace-character "^1.0.0" - is-word-character "^1.0.0" - markdown-escapes "^1.0.0" - parse-entities "^2.0.0" - repeat-string "^1.5.4" - state-toggle "^1.0.0" - trim "0.0.1" - trim-trailing-lines "^1.0.0" - unherit "^1.0.4" - unist-util-remove-position "^2.0.0" - vfile-location "^3.0.0" - xtend "^4.0.1" + "ccount" "^1.0.0" + "collapse-white-space" "^1.0.2" + "is-alphabetical" "^1.0.0" + "is-decimal" "^1.0.0" + "is-whitespace-character" "^1.0.0" + "is-word-character" "^1.0.0" + "markdown-escapes" "^1.0.0" + "parse-entities" "^2.0.0" + "repeat-string" "^1.5.4" + "state-toggle" "^1.0.0" + "trim" "0.0.1" + "trim-trailing-lines" "^1.0.0" + "unherit" "^1.0.4" + "unist-util-remove-position" "^2.0.0" + "vfile-location" "^3.0.0" + "xtend" "^4.0.1" -remark-squeeze-paragraphs@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz#76eb0e085295131c84748c8e43810159c5653ead" - integrity sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw== +"remark-squeeze-paragraphs@4.0.0": + "integrity" "sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==" + "resolved" "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz" + "version" "4.0.0" dependencies: - mdast-squeeze-paragraphs "^4.0.0" + "mdast-squeeze-paragraphs" "^4.0.0" -remarkable-admonitions@^0.2.1: - version "0.2.2" - resolved "https://registry.yarnpkg.com/remarkable-admonitions/-/remarkable-admonitions-0.2.2.tgz#8765f9ec66be4f4c651a4e1cfb559dd7f920819c" - integrity sha512-CcMTEcLYmJLXX3IVMk4LyW4oFD2NQxh5FeLzn4k89TAPpyWIeVix/B/g/gDbZAUpCNY9l6heovR5NNIktf8X5A== +"remarkable-admonitions@^0.2.1": + "integrity" "sha512-CcMTEcLYmJLXX3IVMk4LyW4oFD2NQxh5FeLzn4k89TAPpyWIeVix/B/g/gDbZAUpCNY9l6heovR5NNIktf8X5A==" + "resolved" "https://registry.npmjs.org/remarkable-admonitions/-/remarkable-admonitions-0.2.2.tgz" + "version" "0.2.2" -renderkid@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a" - integrity sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg== +"renderkid@^3.0.0": + "integrity" "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==" + "resolved" "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz" + "version" "3.0.0" dependencies: - css-select "^4.1.3" - dom-converter "^0.2.0" - htmlparser2 "^6.1.0" - lodash "^4.17.21" - strip-ansi "^6.0.1" + "css-select" "^4.1.3" + "dom-converter" "^0.2.0" + "htmlparser2" "^6.1.0" + "lodash" "^4.17.21" + "strip-ansi" "^6.0.1" -repeat-string@^1.5.4: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= +"repeat-string@^1.5.4": + "integrity" "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + "resolved" "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz" + "version" "1.6.1" -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== +"require-from-string@^2.0.2": + "integrity" "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" + "resolved" "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz" + "version" "2.0.2" "require-like@>= 0.1.1": - version "0.1.2" - resolved "https://registry.yarnpkg.com/require-like/-/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa" - integrity sha1-rW8wwTvs15cBDEaK+ndcDAprR/o= + "integrity" "sha1-rW8wwTvs15cBDEaK+ndcDAprR/o=" + "resolved" "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz" + "version" "0.1.2" -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= +"requires-port@^1.0.0": + "integrity" "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" + "resolved" "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz" + "version" "1.0.0" -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" - integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== +"resolve-from@^4.0.0": + "integrity" "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + "resolved" "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz" + "version" "4.0.0" -resolve-pathname@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" - integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng== +"resolve-pathname@^3.0.0": + "integrity" "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==" + "resolved" "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz" + "version" "3.0.0" -resolve@^1.1.6, resolve@^1.14.2, resolve@^1.3.2: - version "1.22.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" - integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== +"resolve@^1.1.6", "resolve@^1.14.2", "resolve@^1.3.2": + "integrity" "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==" + "resolved" "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz" + "version" "1.22.0" dependencies: - is-core-module "^2.8.1" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" + "is-core-module" "^2.8.1" + "path-parse" "^1.0.7" + "supports-preserve-symlinks-flag" "^1.0.0" -responselike@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= +"responselike@^1.0.2": + "integrity" "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=" + "resolved" "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz" + "version" "1.0.2" dependencies: - lowercase-keys "^1.0.0" + "lowercase-keys" "^1.0.0" -retry@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" - integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== +"retry@^0.13.1": + "integrity" "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==" + "resolved" "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz" + "version" "0.13.1" -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== +"reusify@^1.0.4": + "integrity" "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==" + "resolved" "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz" + "version" "1.0.4" -rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== +"rimraf@^3.0.2": + "integrity" "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==" + "resolved" "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" + "version" "3.0.2" dependencies: - glob "^7.1.3" + "glob" "^7.1.3" -rtl-detect@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/rtl-detect/-/rtl-detect-1.0.4.tgz#40ae0ea7302a150b96bc75af7d749607392ecac6" - integrity sha512-EBR4I2VDSSYr7PkBmFy04uhycIpDKp+21p/jARYXlCSjQksTBQcJ0HFUPOO79EPPH5JS6VAhiIQbycf0O3JAxQ== +"rtl-detect@^1.0.4": + "integrity" "sha512-EBR4I2VDSSYr7PkBmFy04uhycIpDKp+21p/jARYXlCSjQksTBQcJ0HFUPOO79EPPH5JS6VAhiIQbycf0O3JAxQ==" + "resolved" "https://registry.npmjs.org/rtl-detect/-/rtl-detect-1.0.4.tgz" + "version" "1.0.4" -rtlcss@^3.3.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/rtlcss/-/rtlcss-3.5.0.tgz#c9eb91269827a102bac7ae3115dd5d049de636c3" - integrity sha512-wzgMaMFHQTnyi9YOwsx9LjOxYXJPzS8sYnFaKm6R5ysvTkwzHiB0vxnbHwchHQT65PTdBjDG21/kQBWI7q9O7A== +"rtlcss@^3.3.0": + "integrity" "sha512-wzgMaMFHQTnyi9YOwsx9LjOxYXJPzS8sYnFaKm6R5ysvTkwzHiB0vxnbHwchHQT65PTdBjDG21/kQBWI7q9O7A==" + "resolved" "https://registry.npmjs.org/rtlcss/-/rtlcss-3.5.0.tgz" + "version" "3.5.0" dependencies: - find-up "^5.0.0" - picocolors "^1.0.0" - postcss "^8.3.11" - strip-json-comments "^3.1.1" + "find-up" "^5.0.0" + "picocolors" "^1.0.0" + "postcss" "^8.3.11" + "strip-json-comments" "^3.1.1" -run-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== +"run-parallel@^1.1.9": + "integrity" "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==" + "resolved" "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz" + "version" "1.2.0" dependencies: - queue-microtask "^1.2.2" + "queue-microtask" "^1.2.2" -rxjs@^7.5.4: - version "7.5.4" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.4.tgz#3d6bd407e6b7ce9a123e76b1e770dc5761aa368d" - integrity sha512-h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ== +"rxjs@^7.5.4": + "integrity" "sha512-h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ==" + "resolved" "https://registry.npmjs.org/rxjs/-/rxjs-7.5.4.tgz" + "version" "7.5.4" dependencies: - tslib "^2.1.0" + "tslib" "^2.1.0" -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== +"safe-buffer@^5.0.1", "safe-buffer@^5.1.0", "safe-buffer@>=5.1.0", "safe-buffer@~5.2.0", "safe-buffer@5.2.1": + "integrity" "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" + "version" "5.2.1" -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +"safe-buffer@~5.1.0", "safe-buffer@~5.1.1": + "integrity" "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" + "version" "5.1.2" + +"safe-buffer@5.1.2": + "integrity" "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" + "version" "5.1.2" "safer-buffer@>= 2.1.2 < 3": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + "integrity" "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "resolved" "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" + "version" "2.1.2" -sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +"sax@^1.2.4": + "integrity" "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + "resolved" "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz" + "version" "1.2.4" -scheduler@^0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" - integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== +"scheduler@^0.19.1": + "integrity" "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==" + "resolved" "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz" + "version" "0.19.1" dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" + "loose-envify" "^1.1.0" + "object-assign" "^4.1.1" -schema-utils@2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" - integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A== - dependencies: - "@types/json-schema" "^7.0.4" - ajv "^6.12.2" - ajv-keywords "^3.4.1" - -schema-utils@^2.6.5: - version "2.7.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" - integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== +"schema-utils@^2.6.5": + "integrity" "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==" + "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz" + "version" "2.7.1" dependencies: "@types/json-schema" "^7.0.5" - ajv "^6.12.4" - ajv-keywords "^3.5.2" + "ajv" "^6.12.4" + "ajv-keywords" "^3.5.2" -schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== +"schema-utils@^3.0.0", "schema-utils@^3.1.0", "schema-utils@^3.1.1": + "integrity" "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==" + "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz" + "version" "3.1.1" dependencies: "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" + "ajv" "^6.12.5" + "ajv-keywords" "^3.5.2" -schema-utils@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" - integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== +"schema-utils@^4.0.0": + "integrity" "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==" + "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz" + "version" "4.0.0" dependencies: "@types/json-schema" "^7.0.9" - ajv "^8.8.0" - ajv-formats "^2.1.1" - ajv-keywords "^5.0.0" + "ajv" "^8.8.0" + "ajv-formats" "^2.1.1" + "ajv-keywords" "^5.0.0" -section-matter@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167" - integrity sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA== +"schema-utils@2.7.0": + "integrity" "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==" + "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz" + "version" "2.7.0" dependencies: - extend-shallow "^2.0.1" - kind-of "^6.0.0" + "@types/json-schema" "^7.0.4" + "ajv" "^6.12.2" + "ajv-keywords" "^3.4.1" -select-hose@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" - integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= - -selfsigned@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.0.tgz#e927cd5377cbb0a1075302cff8df1042cc2bce5b" - integrity sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ== +"section-matter@^1.0.0": + "integrity" "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==" + "resolved" "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz" + "version" "1.0.0" dependencies: - node-forge "^1.2.0" + "extend-shallow" "^2.0.1" + "kind-of" "^6.0.0" -semver-diff@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" - integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== +"select-hose@^2.0.0": + "integrity" "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=" + "resolved" "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz" + "version" "2.0.0" + +"selfsigned@^2.0.0": + "integrity" "sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ==" + "resolved" "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.0.tgz" + "version" "2.0.0" dependencies: - semver "^6.3.0" + "node-forge" "^1.2.0" -semver@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" - integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== - -semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== +"semver-diff@^3.1.1": + "integrity" "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==" + "resolved" "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz" + "version" "3.1.1" dependencies: - lru-cache "^6.0.0" + "semver" "^6.3.0" -send@0.17.2: - version "0.17.2" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" - integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww== +"semver@^5.4.1": + "integrity" "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "resolved" "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" + "version" "5.7.1" + +"semver@^6.0.0", "semver@^6.1.1", "semver@^6.1.2", "semver@^6.2.0", "semver@^6.3.0": + "integrity" "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "resolved" "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" + "version" "6.3.0" + +"semver@^7.3.2": + "integrity" "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==" + "resolved" "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz" + "version" "7.3.5" dependencies: - debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "1.8.1" - mime "1.6.0" - ms "2.1.3" - on-finished "~2.3.0" - range-parser "~1.2.1" - statuses "~1.5.0" + "lru-cache" "^6.0.0" -serialize-javascript@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== +"semver@^7.3.4": + "integrity" "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==" + "resolved" "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz" + "version" "7.3.5" dependencies: - randombytes "^2.1.0" + "lru-cache" "^6.0.0" -serve-handler@^6.1.3: - version "6.1.3" - resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.3.tgz#1bf8c5ae138712af55c758477533b9117f6435e8" - integrity sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w== +"semver@^7.3.5": + "integrity" "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==" + "resolved" "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz" + "version" "7.3.5" dependencies: - bytes "3.0.0" - content-disposition "0.5.2" - fast-url-parser "1.1.3" - mime-types "2.1.18" - minimatch "3.0.4" - path-is-inside "1.0.2" - path-to-regexp "2.2.1" - range-parser "1.2.0" + "lru-cache" "^6.0.0" -serve-index@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" - integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= +"semver@7.0.0": + "integrity" "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==" + "resolved" "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz" + "version" "7.0.0" + +"send@0.17.2": + "integrity" "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==" + "resolved" "https://registry.npmjs.org/send/-/send-0.17.2.tgz" + "version" "0.17.2" dependencies: - accepts "~1.3.4" - batch "0.6.1" - debug "2.6.9" - escape-html "~1.0.3" - http-errors "~1.6.2" - mime-types "~2.1.17" - parseurl "~1.3.2" + "debug" "2.6.9" + "depd" "~1.1.2" + "destroy" "~1.0.4" + "encodeurl" "~1.0.2" + "escape-html" "~1.0.3" + "etag" "~1.8.1" + "fresh" "0.5.2" + "http-errors" "1.8.1" + "mime" "1.6.0" + "ms" "2.1.3" + "on-finished" "~2.3.0" + "range-parser" "~1.2.1" + "statuses" "~1.5.0" -serve-static@1.14.2: - version "1.14.2" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa" - integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ== +"serialize-javascript@^6.0.0": + "integrity" "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==" + "resolved" "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz" + "version" "6.0.0" dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.17.2" + "randombytes" "^2.1.0" -setimmediate@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= - -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== - -setprototypeof@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" - integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== - -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== +"serve-handler@^6.1.3": + "integrity" "sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w==" + "resolved" "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.3.tgz" + "version" "6.1.3" dependencies: - kind-of "^6.0.2" + "bytes" "3.0.0" + "content-disposition" "0.5.2" + "fast-url-parser" "1.1.3" + "mime-types" "2.1.18" + "minimatch" "3.0.4" + "path-is-inside" "1.0.2" + "path-to-regexp" "2.2.1" + "range-parser" "1.2.0" -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== +"serve-index@^1.9.1": + "integrity" "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=" + "resolved" "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz" + "version" "1.9.1" dependencies: - shebang-regex "^3.0.0" + "accepts" "~1.3.4" + "batch" "0.6.1" + "debug" "2.6.9" + "escape-html" "~1.0.3" + "http-errors" "~1.6.2" + "mime-types" "~2.1.17" + "parseurl" "~1.3.2" -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -shell-quote@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" - integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== - -shelljs@^0.8.4: - version "0.8.5" - resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c" - integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow== +"serve-static@1.14.2": + "integrity" "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==" + "resolved" "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz" + "version" "1.14.2" dependencies: - glob "^7.0.0" - interpret "^1.0.0" - rechoir "^0.6.2" + "encodeurl" "~1.0.2" + "escape-html" "~1.0.3" + "parseurl" "~1.3.3" + "send" "0.17.2" -signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== +"setimmediate@^1.0.5": + "integrity" "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + "resolved" "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz" + "version" "1.0.5" -sirv@^1.0.7: - version "1.0.19" - resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49" - integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ== +"setprototypeof@1.1.0": + "integrity" "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" + "resolved" "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz" + "version" "1.1.0" + +"setprototypeof@1.2.0": + "integrity" "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + "resolved" "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz" + "version" "1.2.0" + +"shallow-clone@^3.0.0": + "integrity" "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==" + "resolved" "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz" + "version" "3.0.1" + dependencies: + "kind-of" "^6.0.2" + +"shebang-command@^2.0.0": + "integrity" "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==" + "resolved" "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz" + "version" "2.0.0" + dependencies: + "shebang-regex" "^3.0.0" + +"shebang-regex@^3.0.0": + "integrity" "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + "resolved" "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz" + "version" "3.0.0" + +"shell-quote@^1.7.3": + "integrity" "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==" + "resolved" "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz" + "version" "1.7.3" + +"shelljs@^0.8.4": + "integrity" "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==" + "resolved" "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz" + "version" "0.8.5" + dependencies: + "glob" "^7.0.0" + "interpret" "^1.0.0" + "rechoir" "^0.6.2" + +"signal-exit@^3.0.2", "signal-exit@^3.0.3": + "integrity" "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + "resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz" + "version" "3.0.7" + +"sirv@^1.0.7": + "integrity" "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==" + "resolved" "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz" + "version" "1.0.19" dependencies: "@polka/url" "^1.0.0-next.20" - mrmime "^1.0.0" - totalist "^1.0.0" + "mrmime" "^1.0.0" + "totalist" "^1.0.0" -sisteransi@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" - integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== +"sisteransi@^1.0.5": + "integrity" "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" + "resolved" "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz" + "version" "1.0.5" -sitemap@^7.0.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/sitemap/-/sitemap-7.1.1.tgz#eeed9ad6d95499161a3eadc60f8c6dce4bea2bef" - integrity sha512-mK3aFtjz4VdJN0igpIJrinf3EO8U8mxOPsTBzSsy06UtjZQJ3YY3o3Xa7zSc5nMqcMrRwlChHZ18Kxg0caiPBg== +"sitemap@^7.0.0": + "integrity" "sha512-mK3aFtjz4VdJN0igpIJrinf3EO8U8mxOPsTBzSsy06UtjZQJ3YY3o3Xa7zSc5nMqcMrRwlChHZ18Kxg0caiPBg==" + "resolved" "https://registry.npmjs.org/sitemap/-/sitemap-7.1.1.tgz" + "version" "7.1.1" dependencies: "@types/node" "^17.0.5" "@types/sax" "^1.2.1" - arg "^5.0.0" - sax "^1.2.4" + "arg" "^5.0.0" + "sax" "^1.2.4" -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== +"slash@^3.0.0": + "integrity" "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" + "resolved" "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz" + "version" "3.0.0" -slash@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" - integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== +"slash@^4.0.0": + "integrity" "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==" + "resolved" "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz" + "version" "4.0.0" -sockjs@^0.3.21: - version "0.3.24" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" - integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== +"sockjs@^0.3.21": + "integrity" "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==" + "resolved" "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz" + "version" "0.3.24" dependencies: - faye-websocket "^0.11.3" - uuid "^8.3.2" - websocket-driver "^0.7.4" + "faye-websocket" "^0.11.3" + "uuid" "^8.3.2" + "websocket-driver" "^0.7.4" -sort-css-media-queries@2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/sort-css-media-queries/-/sort-css-media-queries-2.0.4.tgz#b2badfa519cb4a938acbc6d3aaa913d4949dc908" - integrity sha512-PAIsEK/XupCQwitjv7XxoMvYhT7EAfyzI3hsy/MyDgTvc+Ft55ctdkctJLOy6cQejaIC+zjpUL4djFVm2ivOOw== +"sort-css-media-queries@2.0.4": + "integrity" "sha512-PAIsEK/XupCQwitjv7XxoMvYhT7EAfyzI3hsy/MyDgTvc+Ft55ctdkctJLOy6cQejaIC+zjpUL4djFVm2ivOOw==" + "resolved" "https://registry.npmjs.org/sort-css-media-queries/-/sort-css-media-queries-2.0.4.tgz" + "version" "2.0.4" -source-list-map@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" - integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== +"source-list-map@^2.0.0": + "integrity" "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==" + "resolved" "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz" + "version" "2.0.1" -source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== +"source-map-js@^1.0.2": + "integrity" "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" + "resolved" "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" + "version" "1.0.2" -source-map-support@~0.5.20: - version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== +"source-map-support@~0.5.20": + "integrity" "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==" + "resolved" "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz" + "version" "0.5.21" dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" + "buffer-from" "^1.0.0" + "source-map" "^0.6.0" -source-map@^0.5.0: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= +"source-map@^0.5.0": + "integrity" "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" + "version" "0.5.7" -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +"source-map@^0.6.0", "source-map@^0.6.1", "source-map@~0.6.0", "source-map@~0.6.1": + "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" + "version" "0.6.1" -sourcemap-codec@^1.4.4: - version "1.4.8" - resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" - integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== +"sourcemap-codec@^1.4.4": + "integrity" "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==" + "resolved" "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz" + "version" "1.4.8" -space-separated-tokens@^1.0.0: - version "1.1.5" - resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899" - integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA== +"space-separated-tokens@^1.0.0": + "integrity" "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==" + "resolved" "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz" + "version" "1.1.5" -spdy-transport@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" - integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== +"spdy-transport@^3.0.0": + "integrity" "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==" + "resolved" "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz" + "version" "3.0.0" dependencies: - debug "^4.1.0" - detect-node "^2.0.4" - hpack.js "^2.1.6" - obuf "^1.1.2" - readable-stream "^3.0.6" - wbuf "^1.7.3" + "debug" "^4.1.0" + "detect-node" "^2.0.4" + "hpack.js" "^2.1.6" + "obuf" "^1.1.2" + "readable-stream" "^3.0.6" + "wbuf" "^1.7.3" -spdy@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" - integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== +"spdy@^4.0.2": + "integrity" "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==" + "resolved" "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz" + "version" "4.0.2" dependencies: - debug "^4.1.0" - handle-thing "^2.0.0" - http-deceiver "^1.2.7" - select-hose "^2.0.0" - spdy-transport "^3.0.0" + "debug" "^4.1.0" + "handle-thing" "^2.0.0" + "http-deceiver" "^1.2.7" + "select-hose" "^2.0.0" + "spdy-transport" "^3.0.0" -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= +"sprintf-js@~1.0.2": + "integrity" "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "resolved" "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" + "version" "1.0.3" -stable@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" - integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== +"stable@^0.1.8": + "integrity" "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==" + "resolved" "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz" + "version" "0.1.8" -state-toggle@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" - integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ== +"state-toggle@^1.0.0": + "integrity" "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==" + "resolved" "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz" + "version" "1.0.3" -"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= +"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", "statuses@~1.5.0": + "integrity" "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + "resolved" "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz" + "version" "1.5.0" -std-env@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" - integrity sha512-mC1Ps9l77/97qeOZc+HrOL7TIaOboHqMZ24dGVQrlxFcpPpfCHpH+qfUT7Dz+6mlG8+JPA1KfBQo19iC/+Ngcw== +"std-env@^3.0.1": + "integrity" "sha512-mC1Ps9l77/97qeOZc+HrOL7TIaOboHqMZ24dGVQrlxFcpPpfCHpH+qfUT7Dz+6mlG8+JPA1KfBQo19iC/+Ngcw==" + "resolved" "https://registry.npmjs.org/std-env/-/std-env-3.0.1.tgz" + "version" "3.0.1" -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.2: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== +"string_decoder@^1.1.1": + "integrity" "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==" + "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" + "version" "1.3.0" dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" + "safe-buffer" "~5.2.0" -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== +"string_decoder@~1.1.1": + "integrity" "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==" + "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" + "version" "1.1.1" dependencies: - safe-buffer "~5.2.0" + "safe-buffer" "~5.1.0" -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== +"string-width@^4.0.0", "string-width@^4.1.0", "string-width@^4.2.2": + "integrity" "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==" + "resolved" "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" + "version" "4.2.3" dependencies: - safe-buffer "~5.1.0" + "emoji-regex" "^8.0.0" + "is-fullwidth-code-point" "^3.0.0" + "strip-ansi" "^6.0.1" -stringify-object@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" - integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw== +"stringify-object@^3.3.0": + "integrity" "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==" + "resolved" "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz" + "version" "3.3.0" dependencies: - get-own-enumerable-property-symbols "^3.0.0" - is-obj "^1.0.1" - is-regexp "^1.0.0" + "get-own-enumerable-property-symbols" "^3.0.0" + "is-obj" "^1.0.1" + "is-regexp" "^1.0.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== +"strip-ansi@^6.0.0", "strip-ansi@^6.0.1": + "integrity" "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==" + "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" + "version" "6.0.1" dependencies: - ansi-regex "^5.0.1" + "ansi-regex" "^5.0.1" -strip-ansi@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" - integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== +"strip-ansi@^7.0.0": + "integrity" "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==" + "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz" + "version" "7.0.1" dependencies: - ansi-regex "^6.0.1" + "ansi-regex" "^6.0.1" -strip-bom-string@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" - integrity sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI= +"strip-bom-string@^1.0.0": + "integrity" "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=" + "resolved" "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz" + "version" "1.0.0" -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== +"strip-final-newline@^2.0.0": + "integrity" "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" + "resolved" "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz" + "version" "2.0.0" -strip-json-comments@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== +"strip-json-comments@^3.1.1": + "integrity" "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==" + "resolved" "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" + "version" "3.1.1" -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= +"strip-json-comments@~2.0.1": + "integrity" "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + "resolved" "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz" + "version" "2.0.1" -style-to-object@0.3.0, style-to-object@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" - integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA== +"style-to-object@^0.3.0", "style-to-object@0.3.0": + "integrity" "sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==" + "resolved" "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz" + "version" "0.3.0" dependencies: - inline-style-parser "0.1.1" + "inline-style-parser" "0.1.1" -stylehacks@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.3.tgz#2ef3de567bfa2be716d29a93bf3d208c133e8d04" - integrity sha512-ENcUdpf4yO0E1rubu8rkxI+JGQk4CgjchynZ4bDBJDfqdy+uhTRSWb8/F3Jtu+Bw5MW45Po3/aQGeIyyxgQtxg== +"stylehacks@^5.0.3": + "integrity" "sha512-ENcUdpf4yO0E1rubu8rkxI+JGQk4CgjchynZ4bDBJDfqdy+uhTRSWb8/F3Jtu+Bw5MW45Po3/aQGeIyyxgQtxg==" + "resolved" "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.3.tgz" + "version" "5.0.3" dependencies: - browserslist "^4.16.6" - postcss-selector-parser "^6.0.4" + "browserslist" "^4.16.6" + "postcss-selector-parser" "^6.0.4" -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== +"supports-color@^5.3.0": + "integrity" "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==" + "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" + "version" "5.5.0" dependencies: - has-flag "^3.0.0" + "has-flag" "^3.0.0" -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== +"supports-color@^7.1.0": + "integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==" + "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz" + "version" "7.2.0" dependencies: - has-flag "^4.0.0" + "has-flag" "^4.0.0" -supports-color@^8.0.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== +"supports-color@^8.0.0": + "integrity" "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==" + "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" + "version" "8.1.1" dependencies: - has-flag "^4.0.0" + "has-flag" "^4.0.0" -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== +"supports-preserve-symlinks-flag@^1.0.0": + "integrity" "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" + "resolved" "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" + "version" "1.0.0" -svg-parser@^2.0.2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" - integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ== +"svg-parser@^2.0.2": + "integrity" "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==" + "resolved" "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz" + "version" "2.0.4" -svgo@^2.5.0, svgo@^2.7.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" - integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== +"svgo@^2.5.0", "svgo@^2.7.0": + "integrity" "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==" + "resolved" "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz" + "version" "2.8.0" dependencies: "@trysound/sax" "0.2.0" - commander "^7.2.0" - css-select "^4.1.3" - css-tree "^1.1.3" - csso "^4.2.0" - picocolors "^1.0.0" - stable "^0.1.8" + "commander" "^7.2.0" + "css-select" "^4.1.3" + "css-tree" "^1.1.3" + "csso" "^4.2.0" + "picocolors" "^1.0.0" + "stable" "^0.1.8" -tapable@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" - integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== +"tapable@^1.0.0": + "integrity" "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==" + "resolved" "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz" + "version" "1.1.3" -tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== +"tapable@^2.0.0", "tapable@^2.1.1", "tapable@^2.2.0": + "integrity" "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" + "resolved" "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz" + "version" "2.2.1" -terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.4: - version "5.3.1" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54" - integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g== +"terser-webpack-plugin@^5.1.3", "terser-webpack-plugin@^5.2.4": + "integrity" "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==" + "resolved" "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz" + "version" "5.3.1" dependencies: - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - source-map "^0.6.1" - terser "^5.7.2" + "jest-worker" "^27.4.5" + "schema-utils" "^3.1.1" + "serialize-javascript" "^6.0.0" + "source-map" "^0.6.1" + "terser" "^5.7.2" -terser@^5.10.0, terser@^5.7.2: - version "5.14.2" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" - integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA== +"terser@^5.10.0", "terser@^5.7.2": + "integrity" "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==" + "resolved" "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz" + "version" "5.14.2" dependencies: "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" + "acorn" "^8.5.0" + "commander" "^2.20.0" + "source-map-support" "~0.5.20" -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= +"text-table@^0.2.0": + "integrity" "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" + "resolved" "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" + "version" "0.2.0" -thunky@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" - integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== +"thunky@^1.0.2": + "integrity" "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" + "resolved" "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz" + "version" "1.1.0" -timsort@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" - integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= +"timsort@^0.3.0": + "integrity" "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" + "resolved" "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz" + "version" "0.3.0" -tiny-invariant@^1.0.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" - integrity sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg== +"tiny-invariant@^1.0.2": + "integrity" "sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg==" + "resolved" "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.2.0.tgz" + "version" "1.2.0" -tiny-warning@^1.0.0, tiny-warning@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" - integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== +"tiny-warning@^1.0.0", "tiny-warning@^1.0.3": + "integrity" "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" + "resolved" "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz" + "version" "1.0.3" -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= +"to-fast-properties@^2.0.0": + "integrity" "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" + "resolved" "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz" + "version" "2.0.0" -to-readable-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" - integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== +"to-readable-stream@^1.0.0": + "integrity" "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" + "resolved" "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz" + "version" "1.0.0" -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== +"to-regex-range@^5.0.1": + "integrity" "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==" + "resolved" "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" + "version" "5.0.1" dependencies: - is-number "^7.0.0" + "is-number" "^7.0.0" -toidentifier@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" - integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== +"toidentifier@1.0.1": + "integrity" "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" + "resolved" "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz" + "version" "1.0.1" -totalist@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df" - integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g== +"totalist@^1.0.0": + "integrity" "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==" + "resolved" "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz" + "version" "1.1.0" -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= +"tr46@~0.0.3": + "integrity" "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + "resolved" "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz" + "version" "0.0.3" -trim-trailing-lines@^1.0.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0" - integrity sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ== +"trim-trailing-lines@^1.0.0": + "integrity" "sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==" + "resolved" "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz" + "version" "1.1.4" -trim@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" - integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0= +"trim@0.0.1": + "integrity" "sha1-WFhUf2spB1fulczMZm+1AITEYN0=" + "resolved" "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz" + "version" "0.0.1" -trough@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" - integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== +"trough@^1.0.0": + "integrity" "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==" + "resolved" "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz" + "version" "1.0.5" -tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== +"tslib@^2.0.3", "tslib@^2.1.0", "tslib@^2.2.0", "tslib@^2.3.1": + "integrity" "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz" + "version" "2.3.1" -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== +"type-fest@^0.20.2": + "integrity" "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" + "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz" + "version" "0.20.2" -type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== +"type-is@~1.6.18": + "integrity" "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==" + "resolved" "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz" + "version" "1.6.18" dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" + "media-typer" "0.3.0" + "mime-types" "~2.1.24" -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== +"typedarray-to-buffer@^3.1.5": + "integrity" "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==" + "resolved" "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz" + "version" "3.1.5" dependencies: - is-typedarray "^1.0.0" + "is-typedarray" "^1.0.0" -ua-parser-js@^0.7.30: - version "0.7.33" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532" - integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw== +"typescript@>= 2.7": + "integrity" "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==" + "resolved" "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz" + "version" "4.9.5" -unherit@^1.0.4: - version "1.1.3" - resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" - integrity sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ== +"ua-parser-js@^0.7.30": + "integrity" "sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==" + "resolved" "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz" + "version" "0.7.33" + +"unherit@^1.0.4": + "integrity" "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==" + "resolved" "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz" + "version" "1.1.3" dependencies: - inherits "^2.0.0" - xtend "^4.0.0" + "inherits" "^2.0.0" + "xtend" "^4.0.0" -unicode-canonical-property-names-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" - integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== +"unicode-canonical-property-names-ecmascript@^2.0.0": + "integrity" "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==" + "resolved" "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz" + "version" "2.0.0" -unicode-match-property-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" - integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q== +"unicode-match-property-ecmascript@^2.0.0": + "integrity" "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==" + "resolved" "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz" + "version" "2.0.0" dependencies: - unicode-canonical-property-names-ecmascript "^2.0.0" - unicode-property-aliases-ecmascript "^2.0.0" + "unicode-canonical-property-names-ecmascript" "^2.0.0" + "unicode-property-aliases-ecmascript" "^2.0.0" -unicode-match-property-value-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" - integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw== +"unicode-match-property-value-ecmascript@^2.0.0": + "integrity" "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==" + "resolved" "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz" + "version" "2.0.0" -unicode-property-aliases-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" - integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ== +"unicode-property-aliases-ecmascript@^2.0.0": + "integrity" "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==" + "resolved" "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz" + "version" "2.0.0" -unified@9.2.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" - integrity sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg== +"unified@^8.4.2": + "integrity" "sha512-JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA==" + "resolved" "https://registry.npmjs.org/unified/-/unified-8.4.2.tgz" + "version" "8.4.2" dependencies: - bail "^1.0.0" - extend "^3.0.0" - is-buffer "^2.0.0" - is-plain-obj "^2.0.0" - trough "^1.0.0" - vfile "^4.0.0" + "bail" "^1.0.0" + "extend" "^3.0.0" + "is-plain-obj" "^2.0.0" + "trough" "^1.0.0" + "vfile" "^4.0.0" -unified@^8.4.2: - version "8.4.2" - resolved "https://registry.yarnpkg.com/unified/-/unified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" - integrity sha512-JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA== +"unified@9.2.0": + "integrity" "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==" + "resolved" "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz" + "version" "9.2.0" dependencies: - bail "^1.0.0" - extend "^3.0.0" - is-plain-obj "^2.0.0" - trough "^1.0.0" - vfile "^4.0.0" + "bail" "^1.0.0" + "extend" "^3.0.0" + "is-buffer" "^2.0.0" + "is-plain-obj" "^2.0.0" + "trough" "^1.0.0" + "vfile" "^4.0.0" -unique-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" - integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== +"unique-string@^2.0.0": + "integrity" "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==" + "resolved" "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz" + "version" "2.0.0" dependencies: - crypto-random-string "^2.0.0" + "crypto-random-string" "^2.0.0" -unist-builder@2.0.3, unist-builder@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" - integrity sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw== +"unist-builder@^2.0.0", "unist-builder@2.0.3": + "integrity" "sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==" + "resolved" "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz" + "version" "2.0.3" -unist-util-generated@^1.0.0: - version "1.1.6" - resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" - integrity sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg== +"unist-util-generated@^1.0.0": + "integrity" "sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==" + "resolved" "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.6.tgz" + "version" "1.1.6" -unist-util-is@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797" - integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg== +"unist-util-is@^4.0.0": + "integrity" "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==" + "resolved" "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz" + "version" "4.1.0" -unist-util-position@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" - integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA== +"unist-util-position@^3.0.0": + "integrity" "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==" + "resolved" "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz" + "version" "3.1.0" -unist-util-remove-position@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" - integrity sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA== +"unist-util-remove-position@^2.0.0": + "integrity" "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==" + "resolved" "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz" + "version" "2.0.1" dependencies: - unist-util-visit "^2.0.0" + "unist-util-visit" "^2.0.0" -unist-util-remove@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-2.0.0.tgz#32c2ad5578802f2ca62ab808173d505b2c898488" - integrity sha512-HwwWyNHKkeg/eXRnE11IpzY8JT55JNM1YCwwU9YNCnfzk6s8GhPXrVBBZWiwLeATJbI7euvoGSzcy9M29UeW3g== +"unist-util-remove@^2.0.0": + "integrity" "sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q==" + "resolved" "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.1.0.tgz" + "version" "2.1.0" dependencies: - unist-util-is "^4.0.0" + "unist-util-is" "^4.0.0" -unist-util-remove@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-2.1.0.tgz#b0b4738aa7ee445c402fda9328d604a02d010588" - integrity sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q== +"unist-util-remove@2.0.0": + "integrity" "sha512-HwwWyNHKkeg/eXRnE11IpzY8JT55JNM1YCwwU9YNCnfzk6s8GhPXrVBBZWiwLeATJbI7euvoGSzcy9M29UeW3g==" + "resolved" "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.0.0.tgz" + "version" "2.0.0" dependencies: - unist-util-is "^4.0.0" + "unist-util-is" "^4.0.0" -unist-util-stringify-position@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" - integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g== +"unist-util-stringify-position@^2.0.0": + "integrity" "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==" + "resolved" "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz" + "version" "2.0.3" dependencies: "@types/unist" "^2.0.2" -unist-util-visit-parents@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6" - integrity sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg== +"unist-util-visit-parents@^3.0.0": + "integrity" "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==" + "resolved" "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz" + "version" "3.1.1" dependencies: "@types/unist" "^2.0.0" - unist-util-is "^4.0.0" + "unist-util-is" "^4.0.0" -unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist-util-visit@^2.0.2, unist-util-visit@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" - integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q== +"unist-util-visit@^2.0.0", "unist-util-visit@^2.0.1", "unist-util-visit@^2.0.2", "unist-util-visit@^2.0.3", "unist-util-visit@2.0.3": + "integrity" "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==" + "resolved" "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz" + "version" "2.0.3" dependencies: "@types/unist" "^2.0.0" - unist-util-is "^4.0.0" - unist-util-visit-parents "^3.0.0" + "unist-util-is" "^4.0.0" + "unist-util-visit-parents" "^3.0.0" -universalify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" - integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== +"universalify@^2.0.0": + "integrity" "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" + "resolved" "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz" + "version" "2.0.0" -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= +"unpipe@~1.0.0", "unpipe@1.0.0": + "integrity" "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + "resolved" "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" + "version" "1.0.0" -update-notifier@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" - integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== +"update-browserslist-db@^1.0.10": + "integrity" "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==" + "resolved" "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz" + "version" "1.0.10" dependencies: - boxen "^5.0.0" - chalk "^4.1.0" - configstore "^5.0.1" - has-yarn "^2.1.0" - import-lazy "^2.1.0" - is-ci "^2.0.0" - is-installed-globally "^0.4.0" - is-npm "^5.0.0" - is-yarn-global "^0.3.0" - latest-version "^5.1.0" - pupa "^2.1.1" - semver "^7.3.4" - semver-diff "^3.1.1" - xdg-basedir "^4.0.0" + "escalade" "^3.1.1" + "picocolors" "^1.0.0" -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== +"update-notifier@^5.1.0": + "integrity" "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==" + "resolved" "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz" + "version" "5.1.0" dependencies: - punycode "^2.1.0" + "boxen" "^5.0.0" + "chalk" "^4.1.0" + "configstore" "^5.0.1" + "has-yarn" "^2.1.0" + "import-lazy" "^2.1.0" + "is-ci" "^2.0.0" + "is-installed-globally" "^0.4.0" + "is-npm" "^5.0.0" + "is-yarn-global" "^0.3.0" + "latest-version" "^5.1.0" + "pupa" "^2.1.1" + "semver" "^7.3.4" + "semver-diff" "^3.1.1" + "xdg-basedir" "^4.0.0" -url-loader@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2" - integrity sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA== +"uri-js@^4.2.2": + "integrity" "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==" + "resolved" "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz" + "version" "4.4.1" dependencies: - loader-utils "^2.0.0" - mime-types "^2.1.27" - schema-utils "^3.0.0" + "punycode" "^2.1.0" -url-parse-lax@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= +"url-loader@^4.1.1": + "integrity" "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==" + "resolved" "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz" + "version" "4.1.1" dependencies: - prepend-http "^2.0.0" + "loader-utils" "^2.0.0" + "mime-types" "^2.1.27" + "schema-utils" "^3.0.0" -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= +"url-parse-lax@^3.0.0": + "integrity" "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=" + "resolved" "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz" + "version" "3.0.0" dependencies: - punycode "1.3.2" - querystring "0.2.0" + "prepend-http" "^2.0.0" -use-composed-ref@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.2.1.tgz#9bdcb5ccd894289105da2325e1210079f56bf849" - integrity sha512-6+X1FLlIcjvFMAeAD/hcxDT8tmyrWnbSPMU0EnxQuDLIxokuFzWliXBiYZuGIx+mrAMLBw0WFfCkaPw8ebzAhw== - -use-isomorphic-layout-effect@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz#7bb6589170cd2987a152042f9084f9effb75c225" - integrity sha512-L7Evj8FGcwo/wpbv/qvSfrkHFtOpCzvM5yl2KVyDJoylVuSvzphiiasmjgQPttIGBAy2WKiBNR98q8w7PiNgKQ== - -use-latest@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/use-latest/-/use-latest-1.2.0.tgz#a44f6572b8288e0972ec411bdd0840ada366f232" - integrity sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw== +"url@^0.11.0": + "integrity" "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=" + "resolved" "https://registry.npmjs.org/url/-/url-0.11.0.tgz" + "version" "0.11.0" dependencies: - use-isomorphic-layout-effect "^1.0.0" + "punycode" "1.3.2" + "querystring" "0.2.0" -util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= +"use-composed-ref@^1.0.0": + "integrity" "sha512-6+X1FLlIcjvFMAeAD/hcxDT8tmyrWnbSPMU0EnxQuDLIxokuFzWliXBiYZuGIx+mrAMLBw0WFfCkaPw8ebzAhw==" + "resolved" "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.2.1.tgz" + "version" "1.2.1" -utila@~0.4: - version "0.4.0" - resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" - integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw= +"use-isomorphic-layout-effect@^1.0.0": + "integrity" "sha512-L7Evj8FGcwo/wpbv/qvSfrkHFtOpCzvM5yl2KVyDJoylVuSvzphiiasmjgQPttIGBAy2WKiBNR98q8w7PiNgKQ==" + "resolved" "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz" + "version" "1.1.1" -utility-types@^3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/utility-types/-/utility-types-3.10.0.tgz#ea4148f9a741015f05ed74fd615e1d20e6bed82b" - integrity sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg== +"use-latest@^1.0.0": + "integrity" "sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw==" + "resolved" "https://registry.npmjs.org/use-latest/-/use-latest-1.2.0.tgz" + "version" "1.2.0" + dependencies: + "use-isomorphic-layout-effect" "^1.0.0" -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= +"util-deprecate@^1.0.1", "util-deprecate@^1.0.2", "util-deprecate@~1.0.1": + "integrity" "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "resolved" "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + "version" "1.0.2" -uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +"utila@~0.4": + "integrity" "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=" + "resolved" "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz" + "version" "0.4.0" -value-equal@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" - integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== +"utility-types@^3.10.0": + "integrity" "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg==" + "resolved" "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz" + "version" "3.10.0" -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= +"utils-merge@1.0.1": + "integrity" "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + "resolved" "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz" + "version" "1.0.1" -vfile-location@^3.0.0, vfile-location@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.2.0.tgz#d8e41fbcbd406063669ebf6c33d56ae8721d0f3c" - integrity sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA== +"uuid@^8.3.2": + "integrity" "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + "resolved" "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz" + "version" "8.3.2" -vfile-message@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" - integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ== +"value-equal@^1.0.1": + "integrity" "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==" + "resolved" "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz" + "version" "1.0.1" + +"vary@~1.1.2": + "integrity" "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + "resolved" "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz" + "version" "1.1.2" + +"vfile-location@^3.0.0", "vfile-location@^3.2.0": + "integrity" "sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==" + "resolved" "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz" + "version" "3.2.0" + +"vfile-message@^2.0.0": + "integrity" "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==" + "resolved" "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz" + "version" "2.0.4" dependencies: "@types/unist" "^2.0.0" - unist-util-stringify-position "^2.0.0" + "unist-util-stringify-position" "^2.0.0" -vfile@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624" - integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA== +"vfile@^4.0.0": + "integrity" "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==" + "resolved" "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz" + "version" "4.2.1" dependencies: "@types/unist" "^2.0.0" - is-buffer "^2.0.0" - unist-util-stringify-position "^2.0.0" - vfile-message "^2.0.0" + "is-buffer" "^2.0.0" + "unist-util-stringify-position" "^2.0.0" + "vfile-message" "^2.0.0" -wait-on@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-6.0.1.tgz#16bbc4d1e4ebdd41c5b4e63a2e16dbd1f4e5601e" - integrity sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw== +"wait-on@^6.0.0": + "integrity" "sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==" + "resolved" "https://registry.npmjs.org/wait-on/-/wait-on-6.0.1.tgz" + "version" "6.0.1" dependencies: - axios "^0.25.0" - joi "^17.6.0" - lodash "^4.17.21" - minimist "^1.2.5" - rxjs "^7.5.4" + "axios" "^0.25.0" + "joi" "^17.6.0" + "lodash" "^4.17.21" + "minimist" "^1.2.5" + "rxjs" "^7.5.4" -watchpack@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25" - integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA== +"watchpack@^2.3.1": + "integrity" "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==" + "resolved" "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz" + "version" "2.3.1" dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" + "glob-to-regexp" "^0.4.1" + "graceful-fs" "^4.1.2" -wbuf@^1.1.0, wbuf@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" - integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== +"wbuf@^1.1.0", "wbuf@^1.7.3": + "integrity" "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==" + "resolved" "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz" + "version" "1.7.3" dependencies: - minimalistic-assert "^1.0.0" + "minimalistic-assert" "^1.0.0" -web-namespaces@^1.0.0, web-namespaces@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec" - integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw== +"web-namespaces@^1.0.0", "web-namespaces@^1.1.2": + "integrity" "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==" + "resolved" "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz" + "version" "1.1.4" -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= +"webidl-conversions@^3.0.0": + "integrity" "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + "resolved" "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz" + "version" "3.0.1" -webpack-bundle-analyzer@^4.4.2: - version "4.5.0" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" - integrity sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ== +"webpack-bundle-analyzer@^4.4.2": + "integrity" "sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==" + "resolved" "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz" + "version" "4.5.0" dependencies: - acorn "^8.0.4" - acorn-walk "^8.0.0" - chalk "^4.1.0" - commander "^7.2.0" - gzip-size "^6.0.0" - lodash "^4.17.20" - opener "^1.5.2" - sirv "^1.0.7" - ws "^7.3.1" + "acorn" "^8.0.4" + "acorn-walk" "^8.0.0" + "chalk" "^4.1.0" + "commander" "^7.2.0" + "gzip-size" "^6.0.0" + "lodash" "^4.17.20" + "opener" "^1.5.2" + "sirv" "^1.0.7" + "ws" "^7.3.1" -webpack-dev-middleware@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f" - integrity sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg== +"webpack-dev-middleware@^5.3.1": + "integrity" "sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==" + "resolved" "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz" + "version" "5.3.1" dependencies: - colorette "^2.0.10" - memfs "^3.4.1" - mime-types "^2.1.31" - range-parser "^1.2.1" - schema-utils "^4.0.0" + "colorette" "^2.0.10" + "memfs" "^3.4.1" + "mime-types" "^2.1.31" + "range-parser" "^1.2.1" + "schema-utils" "^4.0.0" -webpack-dev-server@^4.7.1: - version "4.7.4" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz#d0ef7da78224578384e795ac228d8efb63d5f945" - integrity sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A== +"webpack-dev-server@^4.7.1": + "integrity" "sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A==" + "resolved" "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz" + "version" "4.7.4" dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" @@ -7519,212 +7582,217 @@ webpack-dev-server@^4.7.1: "@types/serve-index" "^1.9.1" "@types/sockjs" "^0.3.33" "@types/ws" "^8.2.2" - ansi-html-community "^0.0.8" - bonjour "^3.5.0" - chokidar "^3.5.3" - colorette "^2.0.10" - compression "^1.7.4" - connect-history-api-fallback "^1.6.0" - default-gateway "^6.0.3" - del "^6.0.0" - express "^4.17.1" - graceful-fs "^4.2.6" - html-entities "^2.3.2" - http-proxy-middleware "^2.0.0" - ipaddr.js "^2.0.1" - open "^8.0.9" - p-retry "^4.5.0" - portfinder "^1.0.28" - schema-utils "^4.0.0" - selfsigned "^2.0.0" - serve-index "^1.9.1" - sockjs "^0.3.21" - spdy "^4.0.2" - strip-ansi "^7.0.0" - webpack-dev-middleware "^5.3.1" - ws "^8.4.2" + "ansi-html-community" "^0.0.8" + "bonjour" "^3.5.0" + "chokidar" "^3.5.3" + "colorette" "^2.0.10" + "compression" "^1.7.4" + "connect-history-api-fallback" "^1.6.0" + "default-gateway" "^6.0.3" + "del" "^6.0.0" + "express" "^4.17.1" + "graceful-fs" "^4.2.6" + "html-entities" "^2.3.2" + "http-proxy-middleware" "^2.0.0" + "ipaddr.js" "^2.0.1" + "open" "^8.0.9" + "p-retry" "^4.5.0" + "portfinder" "^1.0.28" + "schema-utils" "^4.0.0" + "selfsigned" "^2.0.0" + "serve-index" "^1.9.1" + "sockjs" "^0.3.21" + "spdy" "^4.0.2" + "strip-ansi" "^7.0.0" + "webpack-dev-middleware" "^5.3.1" + "ws" "^8.4.2" -webpack-merge@^5.8.0: - version "5.8.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" - integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== +"webpack-merge@^5.8.0": + "integrity" "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==" + "resolved" "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz" + "version" "5.8.0" dependencies: - clone-deep "^4.0.1" - wildcard "^2.0.0" + "clone-deep" "^4.0.1" + "wildcard" "^2.0.0" -webpack-sources@^1.1.0, webpack-sources@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" - integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== +"webpack-sources@^1.1.0", "webpack-sources@^1.4.3": + "integrity" "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==" + "resolved" "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz" + "version" "1.4.3" dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" + "source-list-map" "^2.0.0" + "source-map" "~0.6.1" -webpack-sources@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" - integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== +"webpack-sources@^3.2.3": + "integrity" "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==" + "resolved" "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz" + "version" "3.2.3" -webpack@^5.61.0: - version "5.69.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.69.1.tgz#8cfd92c192c6a52c99ab00529b5a0d33aa848dc5" - integrity sha512-+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A== +"webpack@^4.0.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", "webpack@^4.4.0 || ^5.0.0", "webpack@^5.0.0", "webpack@^5.1.0", "webpack@^5.20.0", "webpack@^5.61.0", "webpack@>= 4", "webpack@>=2", "webpack@>=4.41.1 || 5.x", "webpack@3 || 4 || 5", "webpack@5.x": + "integrity" "sha512-+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A==" + "resolved" "https://registry.npmjs.org/webpack/-/webpack-5.69.1.tgz" + "version" "5.69.1" dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^0.0.51" "@webassemblyjs/ast" "1.11.1" "@webassemblyjs/wasm-edit" "1.11.1" "@webassemblyjs/wasm-parser" "1.11.1" - acorn "^8.4.1" - acorn-import-assertions "^1.7.6" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.8.3" - es-module-lexer "^0.9.0" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" - json-parse-better-errors "^1.0.2" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.1.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" - watchpack "^2.3.1" - webpack-sources "^3.2.3" + "acorn" "^8.4.1" + "acorn-import-assertions" "^1.7.6" + "browserslist" "^4.14.5" + "chrome-trace-event" "^1.0.2" + "enhanced-resolve" "^5.8.3" + "es-module-lexer" "^0.9.0" + "eslint-scope" "5.1.1" + "events" "^3.2.0" + "glob-to-regexp" "^0.4.1" + "graceful-fs" "^4.2.9" + "json-parse-better-errors" "^1.0.2" + "loader-runner" "^4.2.0" + "mime-types" "^2.1.27" + "neo-async" "^2.6.2" + "schema-utils" "^3.1.0" + "tapable" "^2.1.1" + "terser-webpack-plugin" "^5.1.3" + "watchpack" "^2.3.1" + "webpack-sources" "^3.2.3" -webpackbar@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/webpackbar/-/webpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" - integrity sha512-BmFJo7veBDgQzfWXl/wwYXr/VFus0614qZ8i9znqcl9fnEdiVkdbi0TedLQ6xAK92HZHDJ0QmyQ0fmuZPAgCYQ== +"webpackbar@^5.0.2": + "integrity" "sha512-BmFJo7veBDgQzfWXl/wwYXr/VFus0614qZ8i9znqcl9fnEdiVkdbi0TedLQ6xAK92HZHDJ0QmyQ0fmuZPAgCYQ==" + "resolved" "https://registry.npmjs.org/webpackbar/-/webpackbar-5.0.2.tgz" + "version" "5.0.2" dependencies: - chalk "^4.1.0" - consola "^2.15.3" - pretty-time "^1.1.0" - std-env "^3.0.1" + "chalk" "^4.1.0" + "consola" "^2.15.3" + "pretty-time" "^1.1.0" + "std-env" "^3.0.1" -websocket-driver@>=0.5.1, websocket-driver@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" - integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== +"websocket-driver@^0.7.4", "websocket-driver@>=0.5.1": + "integrity" "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==" + "resolved" "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz" + "version" "0.7.4" dependencies: - http-parser-js ">=0.5.1" - safe-buffer ">=5.1.0" - websocket-extensions ">=0.1.1" + "http-parser-js" ">=0.5.1" + "safe-buffer" ">=5.1.0" + "websocket-extensions" ">=0.1.1" -websocket-extensions@>=0.1.1: - version "0.1.4" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" - integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== +"websocket-extensions@>=0.1.1": + "integrity" "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==" + "resolved" "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz" + "version" "0.1.4" -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= +"whatwg-url@^5.0.0": + "integrity" "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=" + "resolved" "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz" + "version" "5.0.0" dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" + "tr46" "~0.0.3" + "webidl-conversions" "^3.0.0" -which@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== +"which@^1.3.1": + "integrity" "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==" + "resolved" "https://registry.npmjs.org/which/-/which-1.3.1.tgz" + "version" "1.3.1" dependencies: - isexe "^2.0.0" + "isexe" "^2.0.0" -which@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== +"which@^2.0.1": + "integrity" "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==" + "resolved" "https://registry.npmjs.org/which/-/which-2.0.2.tgz" + "version" "2.0.2" dependencies: - isexe "^2.0.0" + "isexe" "^2.0.0" -widest-line@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" - integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== +"widest-line@^3.1.0": + "integrity" "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==" + "resolved" "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz" + "version" "3.1.0" dependencies: - string-width "^4.0.0" + "string-width" "^4.0.0" -wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== +"wildcard@^2.0.0": + "integrity" "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==" + "resolved" "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz" + "version" "2.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== +"wrap-ansi@^7.0.0": + "integrity" "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==" + "resolved" "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" + "version" "7.0.0" dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" + "ansi-styles" "^4.0.0" + "string-width" "^4.1.0" + "strip-ansi" "^6.0.0" -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= +"wrappy@1": + "integrity" "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "resolved" "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "version" "1.0.2" -write-file-atomic@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" - integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== +"write-file-atomic@^3.0.0": + "integrity" "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==" + "resolved" "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz" + "version" "3.0.3" dependencies: - imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" + "imurmurhash" "^0.1.4" + "is-typedarray" "^1.0.0" + "signal-exit" "^3.0.2" + "typedarray-to-buffer" "^3.1.5" -ws@^7.3.1: - version "7.5.7" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" - integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== +"ws@^7.3.1": + "integrity" "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==" + "resolved" "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz" + "version" "7.5.7" -ws@^8.4.2: - version "8.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" - integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== +"ws@^8.4.2": + "integrity" "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==" + "resolved" "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz" + "version" "8.5.0" -xdg-basedir@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" - integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== +"xdg-basedir@^4.0.0": + "integrity" "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" + "resolved" "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz" + "version" "4.0.0" -xml-js@^1.6.11: - version "1.6.11" - resolved "https://registry.yarnpkg.com/xml-js/-/xml-js-1.6.11.tgz#927d2f6947f7f1c19a316dd8eea3614e8b18f8e9" - integrity sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g== +"xml-js@^1.6.11": + "integrity" "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==" + "resolved" "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz" + "version" "1.6.11" dependencies: - sax "^1.2.4" + "sax" "^1.2.4" -xtend@^4.0.0, xtend@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== +"xtend@^4.0.0", "xtend@^4.0.1": + "integrity" "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" + "resolved" "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz" + "version" "4.0.2" -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== +"yallist@^3.0.2": + "integrity" "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + "resolved" "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz" + "version" "3.1.1" -yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: - version "1.10.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" - integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== +"yallist@^4.0.0": + "integrity" "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "resolved" "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" + "version" "4.0.0" -yarn@^1.17.3: - version "1.22.17" - resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.17.tgz#bf910747d22497b573131f7341c0e1d15c74036c" - integrity sha512-H0p241BXaH0UN9IeH//RT82tl5PfNraVpSpEoW+ET7lmopNC61eZ+A+IDvU8FM6Go5vx162SncDL8J1ZjRBriQ== +"yaml@^1.10.0", "yaml@^1.10.2", "yaml@^1.7.2": + "integrity" "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==" + "resolved" "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz" + "version" "1.10.2" -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== +"yarn@^1.17.3": + "integrity" "sha512-H0p241BXaH0UN9IeH//RT82tl5PfNraVpSpEoW+ET7lmopNC61eZ+A+IDvU8FM6Go5vx162SncDL8J1ZjRBriQ==" + "resolved" "https://registry.npmjs.org/yarn/-/yarn-1.22.17.tgz" + "version" "1.22.17" -zwitch@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" - integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw== +"yocto-queue@^0.1.0": + "integrity" "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" + "resolved" "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz" + "version" "0.1.0" + +"zwitch@^1.0.0": + "integrity" "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==" + "resolved" "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz" + "version" "1.0.5" From 66e05849da02a463791301a3ed6eddfe23e3341c Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 13 Mar 2023 16:22:14 +0100 Subject: [PATCH 874/912] replace last usages of Qt module --- openpype/hosts/maya/plugins/inventory/connect_geometry.py | 2 +- openpype/hosts/maya/plugins/inventory/connect_xgen.py | 2 +- openpype/hosts/maya/plugins/load/load_xgen.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/maya/plugins/inventory/connect_geometry.py b/openpype/hosts/maya/plugins/inventory/connect_geometry.py index a12487cf7e..03154b7afe 100644 --- a/openpype/hosts/maya/plugins/inventory/connect_geometry.py +++ b/openpype/hosts/maya/plugins/inventory/connect_geometry.py @@ -134,7 +134,7 @@ class ConnectGeometry(InventoryAction): bool """ - from Qt import QtWidgets + from qtpy import QtWidgets accept = QtWidgets.QMessageBox.Ok if show_cancel: diff --git a/openpype/hosts/maya/plugins/inventory/connect_xgen.py b/openpype/hosts/maya/plugins/inventory/connect_xgen.py index 933a1b4025..177971f176 100644 --- a/openpype/hosts/maya/plugins/inventory/connect_xgen.py +++ b/openpype/hosts/maya/plugins/inventory/connect_xgen.py @@ -149,7 +149,7 @@ class ConnectXgen(InventoryAction): bool """ - from Qt import QtWidgets + from qtpy import QtWidgets accept = QtWidgets.QMessageBox.Ok if show_cancel: diff --git a/openpype/hosts/maya/plugins/load/load_xgen.py b/openpype/hosts/maya/plugins/load/load_xgen.py index 1600cd49bd..7e6cabc77c 100644 --- a/openpype/hosts/maya/plugins/load/load_xgen.py +++ b/openpype/hosts/maya/plugins/load/load_xgen.py @@ -3,7 +3,7 @@ import os import maya.cmds as cmds import xgenm -from Qt import QtWidgets +from qtpy import QtWidgets import openpype.hosts.maya.api.plugin from openpype.hosts.maya.api.lib import ( From efc9c794748c38daac60d3e2e14e39eea16b6ec3 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 14 Mar 2023 16:23:55 +0100 Subject: [PATCH 875/912] updating website yarn.lock --- website/yarn.lock | 10884 ++++++++++++++++++++++---------------------- 1 file changed, 5476 insertions(+), 5408 deletions(-) diff --git a/website/yarn.lock b/website/yarn.lock index 559c58f931..2edf57abf4 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -3,56 +3,56 @@ "@algolia/autocomplete-core@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.5.2.tgz#ec0178e07b44fd74a057728ac157291b26cecf37" - integrity sha512-DY0bhyczFSS1b/CqJlTE/nQRtnTAHl6IemIkBy0nEWnhDzRDdtdx4p5Uuk3vwAFxwEEgi1WqKwgSSMx6DpNL4A== + "integrity" "sha512-DY0bhyczFSS1b/CqJlTE/nQRtnTAHl6IemIkBy0nEWnhDzRDdtdx4p5Uuk3vwAFxwEEgi1WqKwgSSMx6DpNL4A==" + "resolved" "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.5.2.tgz" + "version" "1.5.2" dependencies: "@algolia/autocomplete-shared" "1.5.2" "@algolia/autocomplete-preset-algolia@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.5.2.tgz#36c5638cc6dba6ea46a86e5a0314637ca40a77ca" - integrity sha512-3MRYnYQFJyovANzSX2CToS6/5cfVjbLLqFsZTKcvF3abhQzxbqwwaMBlJtt620uBUOeMzhdfasKhCc40+RHiZw== + "integrity" "sha512-3MRYnYQFJyovANzSX2CToS6/5cfVjbLLqFsZTKcvF3abhQzxbqwwaMBlJtt620uBUOeMzhdfasKhCc40+RHiZw==" + "resolved" "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.5.2.tgz" + "version" "1.5.2" dependencies: "@algolia/autocomplete-shared" "1.5.2" "@algolia/autocomplete-shared@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.5.2.tgz#e157f9ad624ab8fd940ff28bd2094cdf199cdd79" - integrity sha512-ylQAYv5H0YKMfHgVWX0j0NmL8XBcAeeeVQUmppnnMtzDbDnca6CzhKj3Q8eF9cHCgcdTDdb5K+3aKyGWA0obug== + "integrity" "sha512-ylQAYv5H0YKMfHgVWX0j0NmL8XBcAeeeVQUmppnnMtzDbDnca6CzhKj3Q8eF9cHCgcdTDdb5K+3aKyGWA0obug==" + "resolved" "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.5.2.tgz" + "version" "1.5.2" "@algolia/cache-browser-local-storage@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.12.1.tgz#23f4f219963b96918d0524acd09d4d646541d888" - integrity sha512-ERFFOnC9740xAkuO0iZTQqm2AzU7Dpz/s+g7o48GlZgx5p9GgNcsuK5eS0GoW/tAK+fnKlizCtlFHNuIWuvfsg== + "integrity" "sha512-ERFFOnC9740xAkuO0iZTQqm2AzU7Dpz/s+g7o48GlZgx5p9GgNcsuK5eS0GoW/tAK+fnKlizCtlFHNuIWuvfsg==" + "resolved" "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/cache-common" "4.12.1" "@algolia/cache-common@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.12.1.tgz#d3f1676ca9c404adce0f78d68f6381bedb44cd9c" - integrity sha512-UugTER3V40jT+e19Dmph5PKMeliYKxycNPwrPNADin0RcWNfT2QksK9Ff2N2W7UKraqMOzoeDb4LAJtxcK1a8Q== + "integrity" "sha512-UugTER3V40jT+e19Dmph5PKMeliYKxycNPwrPNADin0RcWNfT2QksK9Ff2N2W7UKraqMOzoeDb4LAJtxcK1a8Q==" + "resolved" "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.12.1.tgz" + "version" "4.12.1" "@algolia/cache-in-memory@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.12.1.tgz#0ef6aac2f8feab5b46fc130beb682bbd21b55244" - integrity sha512-U6iaunaxK1lHsAf02UWF58foKFEcrVLsHwN56UkCtwn32nlP9rz52WOcHsgk6TJrL8NDcO5swMjtOQ5XHESFLw== + "integrity" "sha512-U6iaunaxK1lHsAf02UWF58foKFEcrVLsHwN56UkCtwn32nlP9rz52WOcHsgk6TJrL8NDcO5swMjtOQ5XHESFLw==" + "resolved" "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/cache-common" "4.12.1" "@algolia/client-account@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.12.1.tgz#e838c9283db2fab32a425dd13c77da321d48fd8b" - integrity sha512-jGo4ConJNoMdTCR2zouO0jO/JcJmzOK6crFxMMLvdnB1JhmMbuIKluOTJVlBWeivnmcsqb7r0v7qTCPW5PAyxQ== + "integrity" "sha512-jGo4ConJNoMdTCR2zouO0jO/JcJmzOK6crFxMMLvdnB1JhmMbuIKluOTJVlBWeivnmcsqb7r0v7qTCPW5PAyxQ==" + "resolved" "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/client-common" "4.12.1" "@algolia/client-search" "4.12.1" "@algolia/transporter" "4.12.1" "@algolia/client-analytics@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.12.1.tgz#2976d658655a1590cf84cfb596aa75a204f6dec4" - integrity sha512-h1It7KXzIthlhuhfBk7LteYq72tym9maQDUsyRW0Gft8b6ZQahnRak9gcCvKwhcJ1vJoP7T7JrNYGiYSicTD9g== + "integrity" "sha512-h1It7KXzIthlhuhfBk7LteYq72tym9maQDUsyRW0Gft8b6ZQahnRak9gcCvKwhcJ1vJoP7T7JrNYGiYSicTD9g==" + "resolved" "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/client-common" "4.12.1" "@algolia/client-search" "4.12.1" @@ -60,99 +60,121 @@ "@algolia/transporter" "4.12.1" "@algolia/client-common@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.12.1.tgz#104ccefe96bda3ff926bc70c31ff6d17c41b6107" - integrity sha512-obnJ8eSbv+h94Grk83DTGQ3bqhViSWureV6oK1s21/KMGWbb3DkduHm+lcwFrMFkjSUSzosLBHV9EQUIBvueTw== + "integrity" "sha512-obnJ8eSbv+h94Grk83DTGQ3bqhViSWureV6oK1s21/KMGWbb3DkduHm+lcwFrMFkjSUSzosLBHV9EQUIBvueTw==" + "resolved" "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/requester-common" "4.12.1" "@algolia/transporter" "4.12.1" "@algolia/client-personalization@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.12.1.tgz#f63d1890f95de850e1c8e41c1d57adda521d9e7f" - integrity sha512-sMSnjjPjRgByGHYygV+5L/E8a6RgU7l2GbpJukSzJ9GRY37tHmBHuvahv8JjdCGJ2p7QDYLnQy5bN5Z02qjc7Q== + "integrity" "sha512-sMSnjjPjRgByGHYygV+5L/E8a6RgU7l2GbpJukSzJ9GRY37tHmBHuvahv8JjdCGJ2p7QDYLnQy5bN5Z02qjc7Q==" + "resolved" "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/client-common" "4.12.1" "@algolia/requester-common" "4.12.1" "@algolia/transporter" "4.12.1" -"@algolia/client-search@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.12.1.tgz#fcd7a974be5d39d5c336d7f2e89577ffa66aefdd" - integrity sha512-MwwKKprfY6X2nJ5Ki/ccXM2GDEePvVjZnnoOB2io3dLKW4fTqeSRlC5DRXeFD7UM0vOPPHr4ItV2aj19APKNVQ== +"@algolia/client-search@^4.9.1", "@algolia/client-search@4.12.1": + "integrity" "sha512-MwwKKprfY6X2nJ5Ki/ccXM2GDEePvVjZnnoOB2io3dLKW4fTqeSRlC5DRXeFD7UM0vOPPHr4ItV2aj19APKNVQ==" + "resolved" "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/client-common" "4.12.1" "@algolia/requester-common" "4.12.1" "@algolia/transporter" "4.12.1" "@algolia/events@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@algolia/events/-/events-4.0.1.tgz#fd39e7477e7bc703d7f893b556f676c032af3950" - integrity sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ== + "integrity" "sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ==" + "resolved" "https://registry.npmjs.org/@algolia/events/-/events-4.0.1.tgz" + "version" "4.0.1" "@algolia/logger-common@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.12.1.tgz#d6501b4d9d242956257ba8e10f6b4bbf6863baa4" - integrity sha512-fCgrzlXGATNqdFTxwx0GsyPXK+Uqrx1SZ3iuY2VGPPqdt1a20clAG2n2OcLHJpvaa6vMFPlJyWvbqAgzxdxBlQ== + "integrity" "sha512-fCgrzlXGATNqdFTxwx0GsyPXK+Uqrx1SZ3iuY2VGPPqdt1a20clAG2n2OcLHJpvaa6vMFPlJyWvbqAgzxdxBlQ==" + "resolved" "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.12.1.tgz" + "version" "4.12.1" "@algolia/logger-console@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.12.1.tgz#841edd39dd5c5530a69fc66084bfee3254dd0807" - integrity sha512-0owaEnq/davngQMYqxLA4KrhWHiXujQ1CU3FFnyUcMyBR7rGHI48zSOUpqnsAXrMBdSH6rH5BDkSUUFwsh8RkQ== + "integrity" "sha512-0owaEnq/davngQMYqxLA4KrhWHiXujQ1CU3FFnyUcMyBR7rGHI48zSOUpqnsAXrMBdSH6rH5BDkSUUFwsh8RkQ==" + "resolved" "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/logger-common" "4.12.1" "@algolia/requester-browser-xhr@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.12.1.tgz#2d0c18ee188d7cae0e4a930e5e89989e3c4a816b" - integrity sha512-OaMxDyG0TZG0oqz1lQh9e3woantAG1bLnuwq3fmypsrQxra4IQZiyn1x+kEb69D2TcXApI5gOgrD4oWhtEVMtw== + "integrity" "sha512-OaMxDyG0TZG0oqz1lQh9e3woantAG1bLnuwq3fmypsrQxra4IQZiyn1x+kEb69D2TcXApI5gOgrD4oWhtEVMtw==" + "resolved" "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/requester-common" "4.12.1" "@algolia/requester-common@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.12.1.tgz#95bb6539da7199da3e205341cea8f27267f7af29" - integrity sha512-XWIrWQNJ1vIrSuL/bUk3ZwNMNxl+aWz6dNboRW6+lGTcMIwc3NBFE90ogbZKhNrFRff8zI4qCF15tjW+Fyhpow== + "integrity" "sha512-XWIrWQNJ1vIrSuL/bUk3ZwNMNxl+aWz6dNboRW6+lGTcMIwc3NBFE90ogbZKhNrFRff8zI4qCF15tjW+Fyhpow==" + "resolved" "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.12.1.tgz" + "version" "4.12.1" "@algolia/requester-node-http@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.12.1.tgz#c9df97ff1daa7e58c5c2b1f28cf7163005edccb0" - integrity sha512-awBtwaD+s0hxkA1aehYn8F0t9wqGoBVWgY4JPHBmp1ChO3pK7RKnnvnv7QQa9vTlllX29oPt/BBVgMo1Z3n1Qg== + "integrity" "sha512-awBtwaD+s0hxkA1aehYn8F0t9wqGoBVWgY4JPHBmp1ChO3pK7RKnnvnv7QQa9vTlllX29oPt/BBVgMo1Z3n1Qg==" + "resolved" "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/requester-common" "4.12.1" "@algolia/transporter@4.12.1": - version "4.12.1" - resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.12.1.tgz#61b9829916c474f42e2d4a6eada0d6c138379945" - integrity sha512-BGeNgdEHc6dXIk2g8kdlOoQ6fQ6OIaKQcplEj7HPoi+XZUeAvRi3Pff3QWd7YmybWkjzd9AnTzieTASDWhL+sQ== + "integrity" "sha512-BGeNgdEHc6dXIk2g8kdlOoQ6fQ6OIaKQcplEj7HPoi+XZUeAvRi3Pff3QWd7YmybWkjzd9AnTzieTASDWhL+sQ==" + "resolved" "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/cache-common" "4.12.1" "@algolia/logger-common" "4.12.1" "@algolia/requester-common" "4.12.1" -"@ampproject/remapping@^2.1.0": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34" - integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg== +"@ampproject/remapping@^2.2.0": + "integrity" "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==" + "resolved" "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz" + "version" "2.2.0" dependencies: - "@jridgewell/trace-mapping" "^0.3.0" + "@jridgewell/gen-mapping" "^0.1.0" + "@jridgewell/trace-mapping" "^0.3.9" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" - integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.8.3": + "integrity" "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==" + "resolved" "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz" + "version" "7.18.6" dependencies: - "@babel/highlight" "^7.16.7" + "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34" - integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng== +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.20.5": + "integrity" "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==" + "resolved" "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz" + "version" "7.21.0" -"@babel/core@7.12.9": - version "7.12.9" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8" - integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ== +"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.12.0", "@babel/core@^7.13.0", "@babel/core@^7.15.5", "@babel/core@^7.16.0", "@babel/core@^7.4.0-0": + "integrity" "sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw==" + "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.21.3.tgz" + "version" "7.21.3" + dependencies: + "@ampproject/remapping" "^2.2.0" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.21.3" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-module-transforms" "^7.21.2" + "@babel/helpers" "^7.21.0" + "@babel/parser" "^7.21.3" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.3" + "@babel/types" "^7.21.3" + "convert-source-map" "^1.7.0" + "debug" "^4.1.0" + "gensync" "^1.0.0-beta.2" + "json5" "^2.2.2" + "semver" "^6.3.0" + +"@babel/core@^7.11.6", "@babel/core@7.12.9": + "integrity" "sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==" + "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz" + "version" "7.12.9" dependencies: "@babel/code-frame" "^7.10.4" "@babel/generator" "^7.12.5" @@ -162,74 +184,55 @@ "@babel/template" "^7.12.7" "@babel/traverse" "^7.12.9" "@babel/types" "^7.12.7" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.1" - json5 "^2.1.2" - lodash "^4.17.19" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" + "convert-source-map" "^1.7.0" + "debug" "^4.1.0" + "gensync" "^1.0.0-beta.1" + "json5" "^2.1.2" + "lodash" "^4.17.19" + "resolve" "^1.3.2" + "semver" "^5.4.1" + "source-map" "^0.5.0" -"@babel/core@^7.15.5", "@babel/core@^7.16.0": - version "7.17.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.5.tgz#6cd2e836058c28f06a4ca8ee7ed955bbf37c8225" - integrity sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA== +"@babel/generator@^7.12.5", "@babel/generator@^7.16.0", "@babel/generator@^7.21.3": + "integrity" "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==" + "resolved" "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz" + "version" "7.21.3" dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.3" - "@babel/helper-compilation-targets" "^7.16.7" - "@babel/helper-module-transforms" "^7.16.7" - "@babel/helpers" "^7.17.2" - "@babel/parser" "^7.17.3" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.3" - "@babel/types" "^7.17.0" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.1.2" - semver "^6.3.0" - -"@babel/generator@^7.12.5", "@babel/generator@^7.16.0", "@babel/generator@^7.17.3": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200" - integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg== - dependencies: - "@babel/types" "^7.17.0" - jsesc "^2.5.1" - source-map "^0.5.0" + "@babel/types" "^7.21.3" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + "jsesc" "^2.5.1" "@babel/helper-annotate-as-pure@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" - integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw== + "integrity" "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==" + "resolved" "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/types" "^7.16.7" "@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b" - integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA== + "integrity" "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==" + "resolved" "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-explode-assignable-expression" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b" - integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA== +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.20.7": + "integrity" "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==" + "resolved" "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz" + "version" "7.20.7" dependencies: - "@babel/compat-data" "^7.16.4" - "@babel/helper-validator-option" "^7.16.7" - browserslist "^4.17.5" - semver "^6.3.0" + "@babel/compat-data" "^7.20.5" + "@babel/helper-validator-option" "^7.18.6" + "browserslist" "^4.21.3" + "lru-cache" "^5.1.1" + "semver" "^6.3.0" "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7": - version "7.17.1" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz#9699f14a88833a7e055ce57dcd3ffdcd25186b21" - integrity sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ== + "integrity" "sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ==" + "resolved" "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz" + "version" "7.17.1" dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-environment-visitor" "^7.16.7" @@ -240,122 +243,112 @@ "@babel/helper-split-export-declaration" "^7.16.7" "@babel/helper-create-regexp-features-plugin@^7.16.7": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1" - integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA== + "integrity" "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==" + "resolved" "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz" + "version" "7.17.0" dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" - regexpu-core "^5.0.1" + "regexpu-core" "^5.0.1" "@babel/helper-define-polyfill-provider@^0.3.1": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665" - integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA== + "integrity" "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==" + "resolved" "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz" + "version" "0.3.1" dependencies: "@babel/helper-compilation-targets" "^7.13.0" "@babel/helper-module-imports" "^7.12.13" "@babel/helper-plugin-utils" "^7.13.0" "@babel/traverse" "^7.13.0" - debug "^4.1.1" - lodash.debounce "^4.0.8" - resolve "^1.14.2" - semver "^6.1.2" + "debug" "^4.1.1" + "lodash.debounce" "^4.0.8" + "resolve" "^1.14.2" + "semver" "^6.1.2" -"@babel/helper-environment-visitor@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" - integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== - dependencies: - "@babel/types" "^7.16.7" +"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.9": + "integrity" "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==" + "resolved" "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz" + "version" "7.18.9" "@babel/helper-explode-assignable-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a" - integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ== + "integrity" "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==" + "resolved" "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/types" "^7.16.7" -"@babel/helper-function-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" - integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA== +"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.21.0": + "integrity" "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==" + "resolved" "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz" + "version" "7.21.0" dependencies: - "@babel/helper-get-function-arity" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/types" "^7.16.7" + "@babel/template" "^7.20.7" + "@babel/types" "^7.21.0" -"@babel/helper-get-function-arity@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" - integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== +"@babel/helper-hoist-variables@^7.16.7", "@babel/helper-hoist-variables@^7.18.6": + "integrity" "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==" + "resolved" "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz" + "version" "7.18.6" dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-hoist-variables@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" - integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== - dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" "@babel/helper-member-expression-to-functions@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0" - integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q== + "integrity" "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==" + "resolved" "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/types" "^7.16.7" -"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" - integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== +"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6": + "integrity" "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==" + "resolved" "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz" + "version" "7.18.6" dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41" - integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng== +"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.21.2": + "integrity" "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==" + "resolved" "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz" + "version" "7.21.2" dependencies: - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-simple-access" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/helper-validator-identifier" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.16.7" - "@babel/types" "^7.16.7" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-simple-access" "^7.20.2" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.19.1" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.2" + "@babel/types" "^7.21.2" "@babel/helper-optimise-call-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2" - integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w== + "integrity" "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==" + "resolved" "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/types" "^7.16.7" -"@babel/helper-plugin-utils@7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" - integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== - "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" - integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== + "integrity" "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==" + "resolved" "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz" + "version" "7.16.7" + +"@babel/helper-plugin-utils@7.10.4": + "integrity" "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==" + "resolved" "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz" + "version" "7.10.4" "@babel/helper-remap-async-to-generator@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3" - integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw== + "integrity" "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==" + "resolved" "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz" + "version" "7.16.8" dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-wrap-function" "^7.16.8" "@babel/types" "^7.16.8" "@babel/helper-replace-supers@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1" - integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw== + "integrity" "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==" + "resolved" "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-environment-visitor" "^7.16.7" "@babel/helper-member-expression-to-functions" "^7.16.7" @@ -363,173 +356,169 @@ "@babel/traverse" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/helper-simple-access@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7" - integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g== +"@babel/helper-simple-access@^7.16.7", "@babel/helper-simple-access@^7.20.2": + "integrity" "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==" + "resolved" "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz" + "version" "7.20.2" dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.20.2" "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" - integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw== + "integrity" "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==" + "resolved" "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz" + "version" "7.16.0" dependencies: "@babel/types" "^7.16.0" -"@babel/helper-split-export-declaration@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" - integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== +"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.18.6": + "integrity" "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==" + "resolved" "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz" + "version" "7.18.6" dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" -"@babel/helper-validator-identifier@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" - integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== +"@babel/helper-string-parser@^7.19.4": + "integrity" "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==" + "resolved" "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz" + "version" "7.19.4" -"@babel/helper-validator-option@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" - integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== +"@babel/helper-validator-identifier@^7.16.7", "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": + "integrity" "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==" + "resolved" "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz" + "version" "7.19.1" + +"@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.18.6": + "integrity" "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==" + "resolved" "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz" + "version" "7.21.0" "@babel/helper-wrap-function@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200" - integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw== + "integrity" "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==" + "resolved" "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz" + "version" "7.16.8" dependencies: "@babel/helper-function-name" "^7.16.7" "@babel/template" "^7.16.7" "@babel/traverse" "^7.16.8" "@babel/types" "^7.16.8" -"@babel/helpers@^7.12.5", "@babel/helpers@^7.17.2": - version "7.17.2" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.2.tgz#23f0a0746c8e287773ccd27c14be428891f63417" - integrity sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ== +"@babel/helpers@^7.12.5", "@babel/helpers@^7.21.0": + "integrity" "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==" + "resolved" "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz" + "version" "7.21.0" dependencies: - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.0" - "@babel/types" "^7.17.0" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.0" + "@babel/types" "^7.21.0" -"@babel/highlight@^7.16.7": - version "7.16.10" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" - integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw== +"@babel/highlight@^7.18.6": + "integrity" "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==" + "resolved" "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz" + "version" "7.18.6" dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - chalk "^2.0.0" - js-tokens "^4.0.0" + "@babel/helper-validator-identifier" "^7.18.6" + "chalk" "^2.0.0" + "js-tokens" "^4.0.0" -"@babel/parser@^7.12.7", "@babel/parser@^7.16.4", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0" - integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA== +"@babel/parser@^7.12.7", "@babel/parser@^7.16.4", "@babel/parser@^7.20.7", "@babel/parser@^7.21.3": + "integrity" "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==" + "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz" + "version" "7.21.3" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050" - integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg== + "integrity" "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9" - integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw== + "integrity" "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-proposal-optional-chaining" "^7.16.7" "@babel/plugin-proposal-async-generator-functions@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8" - integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ== + "integrity" "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz" + "version" "7.16.8" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-remap-async-to-generator" "^7.16.8" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-proposal-class-properties@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0" - integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww== + "integrity" "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-create-class-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-proposal-class-static-block@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz#712357570b612106ef5426d13dc433ce0f200c2a" - integrity sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw== + "integrity" "sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-create-class-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-proposal-dynamic-import@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2" - integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg== + "integrity" "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-proposal-export-namespace-from@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163" - integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA== + "integrity" "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" "@babel/plugin-proposal-json-strings@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8" - integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ== + "integrity" "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-json-strings" "^7.8.3" "@babel/plugin-proposal-logical-assignment-operators@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea" - integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg== + "integrity" "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99" - integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ== + "integrity" "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" "@babel/plugin-proposal-numeric-separator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9" - integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw== + "integrity" "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069" - integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-transform-parameters" "^7.12.1" - "@babel/plugin-proposal-object-rest-spread@^7.16.7": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390" - integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw== + "integrity" "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz" + "version" "7.17.3" dependencies: "@babel/compat-data" "^7.17.0" "@babel/helper-compilation-targets" "^7.16.7" @@ -537,35 +526,44 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-transform-parameters" "^7.16.7" +"@babel/plugin-proposal-object-rest-spread@7.12.1": + "integrity" "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz" + "version" "7.12.1" + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + "@babel/plugin-transform-parameters" "^7.12.1" + "@babel/plugin-proposal-optional-catch-binding@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf" - integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA== + "integrity" "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-proposal-optional-chaining@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a" - integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA== + "integrity" "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-proposal-private-methods@^7.16.11": - version "7.16.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50" - integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw== + "integrity" "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz" + "version" "7.16.11" dependencies: "@babel/helper-create-class-features-plugin" "^7.16.10" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-proposal-private-property-in-object@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce" - integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ== + "integrity" "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-create-class-features-plugin" "^7.16.7" @@ -573,166 +571,166 @@ "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2" - integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg== + "integrity" "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-async-generators@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" - integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== + "integrity" "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz" + "version" "7.8.4" dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-class-properties@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" - integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== + "integrity" "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz" + "version" "7.12.13" dependencies: "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-class-static-block@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" - integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw== + "integrity" "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz" + "version" "7.14.5" dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-dynamic-import@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" - integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== + "integrity" "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz" + "version" "7.8.3" dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-export-namespace-from@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" - integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== + "integrity" "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz" + "version" "7.8.3" dependencies: "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-json-strings@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" - integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== + "integrity" "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz" + "version" "7.8.3" dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926" - integrity sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-jsx@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz#50b6571d13f764266a113d77c82b4a6508bbe665" - integrity sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q== + "integrity" "sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-syntax-jsx@7.12.1": + "integrity" "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz" + "version" "7.12.1" + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-logical-assignment-operators@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" - integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== + "integrity" "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz" + "version" "7.10.4" dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" - integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== + "integrity" "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz" + "version" "7.8.3" dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-numeric-separator@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" - integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== + "integrity" "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz" + "version" "7.10.4" dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-object-rest-spread@7.8.3", "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" - integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== +"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3", "@babel/plugin-syntax-object-rest-spread@7.8.3": + "integrity" "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz" + "version" "7.8.3" dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-optional-catch-binding@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" - integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== + "integrity" "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz" + "version" "7.8.3" dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" - integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== + "integrity" "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz" + "version" "7.8.3" dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-private-property-in-object@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" - integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== + "integrity" "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz" + "version" "7.14.5" dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-top-level-await@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" - integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== + "integrity" "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz" + "version" "7.14.5" dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8" - integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A== + "integrity" "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-arrow-functions@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154" - integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ== + "integrity" "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-async-to-generator@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808" - integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg== + "integrity" "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz" + "version" "7.16.8" dependencies: "@babel/helper-module-imports" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-remap-async-to-generator" "^7.16.8" "@babel/plugin-transform-block-scoped-functions@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620" - integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg== + "integrity" "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-block-scoping@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87" - integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ== + "integrity" "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-classes@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00" - integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ== + "integrity" "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-environment-visitor" "^7.16.7" @@ -741,174 +739,174 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-replace-supers" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" - globals "^11.1.0" + "globals" "^11.1.0" "@babel/plugin-transform-computed-properties@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470" - integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw== + "integrity" "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-destructuring@^7.16.7": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz#c445f75819641788a27a0a3a759d9df911df6abc" - integrity sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg== + "integrity" "sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz" + "version" "7.17.3" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241" - integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ== + "integrity" "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-duplicate-keys@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9" - integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw== + "integrity" "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-exponentiation-operator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b" - integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA== + "integrity" "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-for-of@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c" - integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg== + "integrity" "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-function-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf" - integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA== + "integrity" "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-compilation-targets" "^7.16.7" "@babel/helper-function-name" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1" - integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ== + "integrity" "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-member-expression-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384" - integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw== + "integrity" "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-modules-amd@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186" - integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g== + "integrity" "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-module-transforms" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" - babel-plugin-dynamic-import-node "^2.3.3" + "babel-plugin-dynamic-import-node" "^2.3.3" "@babel/plugin-transform-modules-commonjs@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe" - integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA== + "integrity" "sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz" + "version" "7.16.8" dependencies: "@babel/helper-module-transforms" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-simple-access" "^7.16.7" - babel-plugin-dynamic-import-node "^2.3.3" + "babel-plugin-dynamic-import-node" "^2.3.3" "@babel/plugin-transform-modules-systemjs@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7" - integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw== + "integrity" "sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-hoist-variables" "^7.16.7" "@babel/helper-module-transforms" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-validator-identifier" "^7.16.7" - babel-plugin-dynamic-import-node "^2.3.3" + "babel-plugin-dynamic-import-node" "^2.3.3" "@babel/plugin-transform-modules-umd@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618" - integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ== + "integrity" "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-module-transforms" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-named-capturing-groups-regex@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252" - integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw== + "integrity" "sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz" + "version" "7.16.8" dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/plugin-transform-new-target@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244" - integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg== + "integrity" "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-object-super@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94" - integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw== + "integrity" "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-replace-supers" "^7.16.7" "@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f" - integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw== + "integrity" "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-property-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55" - integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw== + "integrity" "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-react-constant-elements@^7.14.5": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.16.7.tgz#19e9e4c2df2f6c3e6b3aea11778297d81db8df62" - integrity sha512-lF+cfsyTgwWkcw715J88JhMYJ5GpysYNLhLP1PkvkhTRN7B3e74R/1KsDxFxhRpSn0UUD3IWM4GvdBR2PEbbQQ== + "integrity" "sha512-lF+cfsyTgwWkcw715J88JhMYJ5GpysYNLhLP1PkvkhTRN7B3e74R/1KsDxFxhRpSn0UUD3IWM4GvdBR2PEbbQQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-react-display-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz#7b6d40d232f4c0f550ea348593db3b21e2404340" - integrity sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg== + "integrity" "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-react-jsx-development@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz#43a00724a3ed2557ed3f276a01a929e6686ac7b8" - integrity sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A== + "integrity" "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/plugin-transform-react-jsx" "^7.16.7" "@babel/plugin-transform-react-jsx@^7.16.7": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz#eac1565da176ccb1a715dae0b4609858808008c1" - integrity sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ== + "integrity" "sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz" + "version" "7.17.3" dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-module-imports" "^7.16.7" @@ -917,103 +915,103 @@ "@babel/types" "^7.17.0" "@babel/plugin-transform-react-pure-annotations@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz#232bfd2f12eb551d6d7d01d13fe3f86b45eb9c67" - integrity sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA== + "integrity" "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-regenerator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb" - integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q== + "integrity" "sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz" + "version" "7.16.7" dependencies: - regenerator-transform "^0.14.2" + "regenerator-transform" "^0.14.2" "@babel/plugin-transform-reserved-words@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586" - integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg== + "integrity" "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-runtime@^7.16.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz#0a2e08b5e2b2d95c4b1d3b3371a2180617455b70" - integrity sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A== + "integrity" "sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz" + "version" "7.17.0" dependencies: "@babel/helper-module-imports" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" - babel-plugin-polyfill-corejs2 "^0.3.0" - babel-plugin-polyfill-corejs3 "^0.5.0" - babel-plugin-polyfill-regenerator "^0.3.0" - semver "^6.3.0" + "babel-plugin-polyfill-corejs2" "^0.3.0" + "babel-plugin-polyfill-corejs3" "^0.5.0" + "babel-plugin-polyfill-regenerator" "^0.3.0" + "semver" "^6.3.0" "@babel/plugin-transform-shorthand-properties@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a" - integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg== + "integrity" "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-spread@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44" - integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg== + "integrity" "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-transform-sticky-regex@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660" - integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw== + "integrity" "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-template-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab" - integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA== + "integrity" "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-typeof-symbol@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e" - integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ== + "integrity" "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-typescript@^7.16.7": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0" - integrity sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ== + "integrity" "sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz" + "version" "7.16.8" dependencies: "@babel/helper-create-class-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-typescript" "^7.16.7" "@babel/plugin-transform-unicode-escapes@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3" - integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q== + "integrity" "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-unicode-regex@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2" - integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q== + "integrity" "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/preset-env@^7.15.6", "@babel/preset-env@^7.16.4": - version "7.16.11" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982" - integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g== + "integrity" "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==" + "resolved" "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz" + "version" "7.16.11" dependencies: "@babel/compat-data" "^7.16.8" "@babel/helper-compilation-targets" "^7.16.7" @@ -1084,27 +1082,27 @@ "@babel/plugin-transform-unicode-regex" "^7.16.7" "@babel/preset-modules" "^0.1.5" "@babel/types" "^7.16.8" - babel-plugin-polyfill-corejs2 "^0.3.0" - babel-plugin-polyfill-corejs3 "^0.5.0" - babel-plugin-polyfill-regenerator "^0.3.0" - core-js-compat "^3.20.2" - semver "^6.3.0" + "babel-plugin-polyfill-corejs2" "^0.3.0" + "babel-plugin-polyfill-corejs3" "^0.5.0" + "babel-plugin-polyfill-regenerator" "^0.3.0" + "core-js-compat" "^3.20.2" + "semver" "^6.3.0" "@babel/preset-modules@^0.1.5": - version "0.1.5" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" - integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA== + "integrity" "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==" + "resolved" "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz" + "version" "0.1.5" dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" "@babel/plugin-transform-dotall-regex" "^7.4.4" "@babel/types" "^7.4.4" - esutils "^2.0.2" + "esutils" "^2.0.2" "@babel/preset-react@^7.14.5", "@babel/preset-react@^7.16.0": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.7.tgz#4c18150491edc69c183ff818f9f2aecbe5d93852" - integrity sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA== + "integrity" "sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==" + "resolved" "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-validator-option" "^7.16.7" @@ -1114,81 +1112,82 @@ "@babel/plugin-transform-react-pure-annotations" "^7.16.7" "@babel/preset-typescript@^7.15.0", "@babel/preset-typescript@^7.16.0": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz#ab114d68bb2020afc069cd51b37ff98a046a70b9" - integrity sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ== + "integrity" "sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ==" + "resolved" "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz" + "version" "7.16.7" dependencies: "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-validator-option" "^7.16.7" "@babel/plugin-transform-typescript" "^7.16.7" "@babel/runtime-corejs3@^7.16.3": - version "7.17.2" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.2.tgz#fdca2cd05fba63388babe85d349b6801b008fd13" - integrity sha512-NcKtr2epxfIrNM4VOmPKO46TvDMCBhgi2CrSHaEarrz+Plk2K5r9QemmOFTGpZaoKnWoGH5MO+CzeRsih/Fcgg== + "integrity" "sha512-NcKtr2epxfIrNM4VOmPKO46TvDMCBhgi2CrSHaEarrz+Plk2K5r9QemmOFTGpZaoKnWoGH5MO+CzeRsih/Fcgg==" + "resolved" "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.17.2.tgz" + "version" "7.17.2" dependencies: - core-js-pure "^3.20.2" - regenerator-runtime "^0.13.4" + "core-js-pure" "^3.20.2" + "regenerator-runtime" "^0.13.4" "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.16.3", "@babel/runtime@^7.8.4": - version "7.17.2" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941" - integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw== + "integrity" "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==" + "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz" + "version" "7.17.2" dependencies: - regenerator-runtime "^0.13.4" + "regenerator-runtime" "^0.13.4" -"@babel/template@^7.12.7", "@babel/template@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" - integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== +"@babel/template@^7.12.7", "@babel/template@^7.16.7", "@babel/template@^7.20.7": + "integrity" "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==" + "resolved" "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz" + "version" "7.20.7" dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/parser" "^7.16.7" - "@babel/types" "^7.16.7" + "@babel/code-frame" "^7.18.6" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" -"@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.3", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" - integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== +"@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.3", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.3": + "integrity" "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==" + "resolved" "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz" + "version" "7.21.3" dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.3" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.3" - "@babel/types" "^7.17.0" - debug "^4.1.0" - globals "^11.1.0" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.21.3" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.21.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.21.3" + "@babel/types" "^7.21.3" + "debug" "^4.1.0" + "globals" "^11.1.0" -"@babel/types@^7.12.7", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" - integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== +"@babel/types@^7.12.7", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.3", "@babel/types@^7.4.4": + "integrity" "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==" + "resolved" "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz" + "version" "7.21.3" dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - to-fast-properties "^2.0.0" + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" + "to-fast-properties" "^2.0.0" "@docsearch/css@3.0.0-alpha.50": - version "3.0.0-alpha.50" - resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.0.0-alpha.50.tgz#794c6a8d301840a49b55f5b331c7be84b9723643" - integrity sha512-QeWFCQOtS9D+Fi20liKsPXF2j/xWKh52e+P2Z1UATIdPMqmH6zoB2lcUz+cgv6PPVgWUtECeR6VSSUm71LT94w== + "integrity" "sha512-QeWFCQOtS9D+Fi20liKsPXF2j/xWKh52e+P2Z1UATIdPMqmH6zoB2lcUz+cgv6PPVgWUtECeR6VSSUm71LT94w==" + "resolved" "https://registry.npmjs.org/@docsearch/css/-/css-3.0.0-alpha.50.tgz" + "version" "3.0.0-alpha.50" "@docsearch/react@^3.0.0-alpha.39": - version "3.0.0-alpha.50" - resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.0.0-alpha.50.tgz#a7dc547836c2b221fd3aa8eb87bfb47a579ef141" - integrity sha512-oDGV1zZCRYv7MWsh6CyQVthYTRc3b4q+6kKwNYb1/g/Wf/4nJHutpxolFLHdEUDhrJ4Xi8wxwQG+lEwAVBTHPg== + "integrity" "sha512-oDGV1zZCRYv7MWsh6CyQVthYTRc3b4q+6kKwNYb1/g/Wf/4nJHutpxolFLHdEUDhrJ4Xi8wxwQG+lEwAVBTHPg==" + "resolved" "https://registry.npmjs.org/@docsearch/react/-/react-3.0.0-alpha.50.tgz" + "version" "3.0.0-alpha.50" dependencies: "@algolia/autocomplete-core" "1.5.2" "@algolia/autocomplete-preset-algolia" "1.5.2" "@docsearch/css" "3.0.0-alpha.50" - algoliasearch "^4.0.0" + "algoliasearch" "^4.0.0" "@docusaurus/core@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-2.0.0-beta.15.tgz#1a3f8361803767072e56c77d60332c87e59f1ad0" - integrity sha512-zXhhD0fApMSvq/9Pkm9DQxa//hGOXVCq9yMHiXOkI5D1tLec7PxtnaC5cLfGHljkN9cKIfRDYUVcG1gHymVfpA== + "integrity" "sha512-zXhhD0fApMSvq/9Pkm9DQxa//hGOXVCq9yMHiXOkI5D1tLec7PxtnaC5cLfGHljkN9cKIfRDYUVcG1gHymVfpA==" + "resolved" "https://registry.npmjs.org/@docusaurus/core/-/core-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@babel/core" "^7.16.0" "@babel/generator" "^7.16.0" @@ -1209,103 +1208,103 @@ "@docusaurus/utils-validation" "2.0.0-beta.15" "@slorber/static-site-generator-webpack-plugin" "^4.0.0" "@svgr/webpack" "^6.0.0" - autoprefixer "^10.3.5" - babel-loader "^8.2.2" - babel-plugin-dynamic-import-node "2.3.0" - boxen "^5.0.1" - chokidar "^3.5.2" - clean-css "^5.1.5" - commander "^5.1.0" - copy-webpack-plugin "^10.2.0" - core-js "^3.18.0" - css-loader "^6.5.1" - css-minimizer-webpack-plugin "^3.3.1" - cssnano "^5.0.8" - del "^6.0.0" - detect-port "^1.3.0" - escape-html "^1.0.3" - eta "^1.12.3" - file-loader "^6.2.0" - fs-extra "^10.0.0" - html-minifier-terser "^6.0.2" - html-tags "^3.1.0" - html-webpack-plugin "^5.4.0" - import-fresh "^3.3.0" - is-root "^2.1.0" - leven "^3.1.0" - lodash "^4.17.20" - mini-css-extract-plugin "^1.6.0" - nprogress "^0.2.0" - postcss "^8.3.7" - postcss-loader "^6.1.1" - prompts "^2.4.1" - react-dev-utils "^12.0.0" - react-helmet "^6.1.0" - react-loadable "npm:@docusaurus/react-loadable@5.5.2" - react-loadable-ssr-addon-v5-slorber "^1.0.1" - react-router "^5.2.0" - react-router-config "^5.1.1" - react-router-dom "^5.2.0" - remark-admonitions "^1.2.1" - rtl-detect "^1.0.4" - semver "^7.3.4" - serve-handler "^6.1.3" - shelljs "^0.8.4" - strip-ansi "^6.0.0" - terser-webpack-plugin "^5.2.4" - tslib "^2.3.1" - update-notifier "^5.1.0" - url-loader "^4.1.1" - wait-on "^6.0.0" - webpack "^5.61.0" - webpack-bundle-analyzer "^4.4.2" - webpack-dev-server "^4.7.1" - webpack-merge "^5.8.0" - webpackbar "^5.0.2" + "autoprefixer" "^10.3.5" + "babel-loader" "^8.2.2" + "babel-plugin-dynamic-import-node" "2.3.0" + "boxen" "^5.0.1" + "chokidar" "^3.5.2" + "clean-css" "^5.1.5" + "commander" "^5.1.0" + "copy-webpack-plugin" "^10.2.0" + "core-js" "^3.18.0" + "css-loader" "^6.5.1" + "css-minimizer-webpack-plugin" "^3.3.1" + "cssnano" "^5.0.8" + "del" "^6.0.0" + "detect-port" "^1.3.0" + "escape-html" "^1.0.3" + "eta" "^1.12.3" + "file-loader" "^6.2.0" + "fs-extra" "^10.0.0" + "html-minifier-terser" "^6.0.2" + "html-tags" "^3.1.0" + "html-webpack-plugin" "^5.4.0" + "import-fresh" "^3.3.0" + "is-root" "^2.1.0" + "leven" "^3.1.0" + "lodash" "^4.17.20" + "mini-css-extract-plugin" "^1.6.0" + "nprogress" "^0.2.0" + "postcss" "^8.3.7" + "postcss-loader" "^6.1.1" + "prompts" "^2.4.1" + "react-dev-utils" "^12.0.0" + "react-helmet" "^6.1.0" + "react-loadable" "npm:@docusaurus/react-loadable@5.5.2" + "react-loadable-ssr-addon-v5-slorber" "^1.0.1" + "react-router" "^5.2.0" + "react-router-config" "^5.1.1" + "react-router-dom" "^5.2.0" + "remark-admonitions" "^1.2.1" + "rtl-detect" "^1.0.4" + "semver" "^7.3.4" + "serve-handler" "^6.1.3" + "shelljs" "^0.8.4" + "strip-ansi" "^6.0.0" + "terser-webpack-plugin" "^5.2.4" + "tslib" "^2.3.1" + "update-notifier" "^5.1.0" + "url-loader" "^4.1.1" + "wait-on" "^6.0.0" + "webpack" "^5.61.0" + "webpack-bundle-analyzer" "^4.4.2" + "webpack-dev-server" "^4.7.1" + "webpack-merge" "^5.8.0" + "webpackbar" "^5.0.2" "@docusaurus/cssnano-preset@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.15.tgz#033c52815c428f0f66c87eaff93ea12554ea89df" - integrity sha512-55aYURbB5dqrx64lStNcZxDx5R6bKkAawlCB7mDKx3r+Qnp3ofGW7UExLQSCbTu3axT1vJCF5D7H6ljTRYJLtA== + "integrity" "sha512-55aYURbB5dqrx64lStNcZxDx5R6bKkAawlCB7mDKx3r+Qnp3ofGW7UExLQSCbTu3axT1vJCF5D7H6ljTRYJLtA==" + "resolved" "https://registry.npmjs.org/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: - cssnano-preset-advanced "^5.1.4" - postcss "^8.3.7" - postcss-sort-media-queries "^4.1.0" + "cssnano-preset-advanced" "^5.1.4" + "postcss" "^8.3.7" + "postcss-sort-media-queries" "^4.1.0" "@docusaurus/logger@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.0.0-beta.15.tgz#6d17a05fb292d15fdc43b5fa90fd2a49ad5d40ce" - integrity sha512-5bDSHCyLfMtz6QnFfICdL5mgxbGfC7DW1V+/Q17nRdpZSPZgsNKK/Esp0zdDi1oxAyEpXMXx64nLaHL7joJxIg== + "integrity" "sha512-5bDSHCyLfMtz6QnFfICdL5mgxbGfC7DW1V+/Q17nRdpZSPZgsNKK/Esp0zdDi1oxAyEpXMXx64nLaHL7joJxIg==" + "resolved" "https://registry.npmjs.org/@docusaurus/logger/-/logger-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: - chalk "^4.1.2" - tslib "^2.3.1" + "chalk" "^4.1.2" + "tslib" "^2.3.1" "@docusaurus/mdx-loader@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.15.tgz#da23745bc73c93338dd330dad6bbc9d9fe325553" - integrity sha512-MVpytjDDao7hmPF1QSs9B5zoTgevZjiqjnX3FM1yjqdCv+chyUo0gnmYHjeG/4Gqu7jucp+dDdp6yQpzs4g09A== + "integrity" "sha512-MVpytjDDao7hmPF1QSs9B5zoTgevZjiqjnX3FM1yjqdCv+chyUo0gnmYHjeG/4Gqu7jucp+dDdp6yQpzs4g09A==" + "resolved" "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@babel/parser" "^7.16.4" "@babel/traverse" "^7.16.3" "@docusaurus/logger" "2.0.0-beta.15" "@docusaurus/utils" "2.0.0-beta.15" "@mdx-js/mdx" "^1.6.21" - escape-html "^1.0.3" - file-loader "^6.2.0" - fs-extra "^10.0.0" - image-size "^1.0.1" - mdast-util-to-string "^2.0.0" - remark-emoji "^2.1.0" - stringify-object "^3.3.0" - tslib "^2.3.1" - unist-util-visit "^2.0.2" - url-loader "^4.1.1" - webpack "^5.61.0" + "escape-html" "^1.0.3" + "file-loader" "^6.2.0" + "fs-extra" "^10.0.0" + "image-size" "^1.0.1" + "mdast-util-to-string" "^2.0.0" + "remark-emoji" "^2.1.0" + "stringify-object" "^3.3.0" + "tslib" "^2.3.1" + "unist-util-visit" "^2.0.2" + "url-loader" "^4.1.1" + "webpack" "^5.61.0" "@docusaurus/plugin-content-blog@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-beta.15.tgz#6d4bf532ad3dedb4f9fd6398b0fbe481af5b77a9" - integrity sha512-VtEwkgkoNIS8JFPe+huBeBuJ8HG8Lq1JNYM/ItwQg/cwGAgP8EgwbEuKDn428oZKEI2PpgAuf5Gv4AzJWIes9A== + "integrity" "sha512-VtEwkgkoNIS8JFPe+huBeBuJ8HG8Lq1JNYM/ItwQg/cwGAgP8EgwbEuKDn428oZKEI2PpgAuf5Gv4AzJWIes9A==" + "resolved" "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/logger" "2.0.0-beta.15" @@ -1313,98 +1312,98 @@ "@docusaurus/utils" "2.0.0-beta.15" "@docusaurus/utils-common" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" - cheerio "^1.0.0-rc.10" - feed "^4.2.2" - fs-extra "^10.0.0" - lodash "^4.17.20" - reading-time "^1.5.0" - remark-admonitions "^1.2.1" - tslib "^2.3.1" - utility-types "^3.10.0" - webpack "^5.61.0" + "cheerio" "^1.0.0-rc.10" + "feed" "^4.2.2" + "fs-extra" "^10.0.0" + "lodash" "^4.17.20" + "reading-time" "^1.5.0" + "remark-admonitions" "^1.2.1" + "tslib" "^2.3.1" + "utility-types" "^3.10.0" + "webpack" "^5.61.0" "@docusaurus/plugin-content-docs@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-beta.15.tgz#9486bba8abd2a6284e749718bf56743d8e4446f1" - integrity sha512-HSwNZdUKz4rpJiGbFjl/OFhSleeZUSZ6E6lk98i4iL1A5u6fIm4CHsT53yp4UUOse+lFrePTFZsyqwMA4nZZYA== + "integrity" "sha512-HSwNZdUKz4rpJiGbFjl/OFhSleeZUSZ6E6lk98i4iL1A5u6fIm4CHsT53yp4UUOse+lFrePTFZsyqwMA4nZZYA==" + "resolved" "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/logger" "2.0.0-beta.15" "@docusaurus/mdx-loader" "2.0.0-beta.15" "@docusaurus/utils" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" - combine-promises "^1.1.0" - fs-extra "^10.0.0" - import-fresh "^3.2.2" - js-yaml "^4.0.0" - lodash "^4.17.20" - remark-admonitions "^1.2.1" - shelljs "^0.8.4" - tslib "^2.3.1" - utility-types "^3.10.0" - webpack "^5.61.0" + "combine-promises" "^1.1.0" + "fs-extra" "^10.0.0" + "import-fresh" "^3.2.2" + "js-yaml" "^4.0.0" + "lodash" "^4.17.20" + "remark-admonitions" "^1.2.1" + "shelljs" "^0.8.4" + "tslib" "^2.3.1" + "utility-types" "^3.10.0" + "webpack" "^5.61.0" "@docusaurus/plugin-content-pages@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-beta.15.tgz#e488f7dcdd45cd1d46e8c2c5ff5275327a6a3c65" - integrity sha512-N7YhW5RiOY6J228z4lOoP//qX0Q48cRtxDONZ/Ohd9C5OI2vS6TD8iQuDqOIYHxH+BshjNSsKvbJ+SMIQDwysg== + "integrity" "sha512-N7YhW5RiOY6J228z4lOoP//qX0Q48cRtxDONZ/Ohd9C5OI2vS6TD8iQuDqOIYHxH+BshjNSsKvbJ+SMIQDwysg==" + "resolved" "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/mdx-loader" "2.0.0-beta.15" "@docusaurus/utils" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" - fs-extra "^10.0.0" - globby "^11.0.2" - remark-admonitions "^1.2.1" - tslib "^2.3.1" - webpack "^5.61.0" + "fs-extra" "^10.0.0" + "globby" "^11.0.2" + "remark-admonitions" "^1.2.1" + "tslib" "^2.3.1" + "webpack" "^5.61.0" "@docusaurus/plugin-debug@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-beta.15.tgz#b75d706d4f9fc4146f84015097bd837d1afb7c6b" - integrity sha512-Jth11jB/rVqPwCGdkVKSUWeXZPAr/NyPn+yeknTBk2LgQKBJ3YU5dNG0uyt0Ay+UYT01TkousPJkXhLuy4Qrsw== + "integrity" "sha512-Jth11jB/rVqPwCGdkVKSUWeXZPAr/NyPn+yeknTBk2LgQKBJ3YU5dNG0uyt0Ay+UYT01TkousPJkXhLuy4Qrsw==" + "resolved" "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/utils" "2.0.0-beta.15" - fs-extra "^10.0.0" - react-json-view "^1.21.3" - tslib "^2.3.1" + "fs-extra" "^10.0.0" + "react-json-view" "^1.21.3" + "tslib" "^2.3.1" "@docusaurus/plugin-google-analytics@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-beta.15.tgz#6ffebe76d9caac5383cfb78d2baa5883c9c2df6c" - integrity sha512-ELAnxNYiC2i7gfu/ViurNIdm1/DdnbEfVDmpffS9niQhOREM1U3jpxkz/ff1GIC6heOLyHTtini/CZBDoroVGw== + "integrity" "sha512-ELAnxNYiC2i7gfu/ViurNIdm1/DdnbEfVDmpffS9niQhOREM1U3jpxkz/ff1GIC6heOLyHTtini/CZBDoroVGw==" + "resolved" "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" - tslib "^2.3.1" + "tslib" "^2.3.1" "@docusaurus/plugin-google-gtag@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-beta.15.tgz#4db3330d302653e8541dc3cb86a4dbfef0cc96f8" - integrity sha512-E5Rm3+dN7i3A9V5uq5sl9xTNA3aXsLwTZEA2SpOkY571dCpd+sfVvz1lR+KRY9Fy6ZHk8PqrNImgCWfIerRuZQ== + "integrity" "sha512-E5Rm3+dN7i3A9V5uq5sl9xTNA3aXsLwTZEA2SpOkY571dCpd+sfVvz1lR+KRY9Fy6ZHk8PqrNImgCWfIerRuZQ==" + "resolved" "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" - tslib "^2.3.1" + "tslib" "^2.3.1" "@docusaurus/plugin-sitemap@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-beta.15.tgz#0cc083d9e76041897e81b4b82bcd0ccbfa65d6e5" - integrity sha512-PBjeQb2Qpe4uPdRefWL/eXCeYjrgNB/UArExYeUuP4wiY1dpw2unGNCvFUxv4hzJGmARoTLsnRkeYkUim809LQ== + "integrity" "sha512-PBjeQb2Qpe4uPdRefWL/eXCeYjrgNB/UArExYeUuP4wiY1dpw2unGNCvFUxv4hzJGmARoTLsnRkeYkUim809LQ==" + "resolved" "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/utils" "2.0.0-beta.15" "@docusaurus/utils-common" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" - fs-extra "^10.0.0" - sitemap "^7.0.0" - tslib "^2.3.1" + "fs-extra" "^10.0.0" + "sitemap" "^7.0.0" + "tslib" "^2.3.1" "@docusaurus/preset-classic@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-2.0.0-beta.15.tgz#13d2f3c4fa7c055af35541ae5e93453450efb208" - integrity sha512-3NZIXWTAzk+kOgiB8uAbD+FZv3VFR1qkU6+TW24DRenjRnXof3CkRuldhI1QI0hILm1fuJ319QRkakV8FFtXyA== + "integrity" "sha512-3NZIXWTAzk+kOgiB8uAbD+FZv3VFR1qkU6+TW24DRenjRnXof3CkRuldhI1QI0hILm1fuJ319QRkakV8FFtXyA==" + "resolved" "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/plugin-content-blog" "2.0.0-beta.15" @@ -1418,18 +1417,18 @@ "@docusaurus/theme-common" "2.0.0-beta.15" "@docusaurus/theme-search-algolia" "2.0.0-beta.15" -"@docusaurus/react-loadable@5.5.2", "react-loadable@npm:@docusaurus/react-loadable@5.5.2": - version "5.5.2" - resolved "https://registry.yarnpkg.com/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz#81aae0db81ecafbdaee3651f12804580868fa6ce" - integrity sha512-A3dYjdBGuy0IGT+wyLIGIKLRE+sAk1iNk0f1HjNDysO7u8lhL4N3VEm+FAubmJbAztn94F7MxBTPmnixbiyFdQ== +"@docusaurus/react-loadable@5.5.2": + "integrity" "sha512-A3dYjdBGuy0IGT+wyLIGIKLRE+sAk1iNk0f1HjNDysO7u8lhL4N3VEm+FAubmJbAztn94F7MxBTPmnixbiyFdQ==" + "resolved" "https://registry.npmjs.org/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz" + "version" "5.5.2" dependencies: "@types/react" "*" - prop-types "^15.6.2" + "prop-types" "^15.6.2" "@docusaurus/theme-classic@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-2.0.0-beta.15.tgz#35d04232f2d5fcb2007675339b0e6d0e8681be95" - integrity sha512-WwNRcQvMtQ7KDhOEHFKFHxXCdoZwLg66hT3vhqNIFMfGQuPzOP91MX5LUSo1QWHhlrD3H3Og+r7Ik/fy2bf5lQ== + "integrity" "sha512-WwNRcQvMtQ7KDhOEHFKFHxXCdoZwLg66hT3vhqNIFMfGQuPzOP91MX5LUSo1QWHhlrD3H3Og+r7Ik/fy2bf5lQ==" + "resolved" "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/core" "2.0.0-beta.15" "@docusaurus/plugin-content-blog" "2.0.0-beta.15" @@ -1441,33 +1440,33 @@ "@docusaurus/utils-common" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" "@mdx-js/react" "^1.6.21" - clsx "^1.1.1" - copy-text-to-clipboard "^3.0.1" - infima "0.2.0-alpha.37" - lodash "^4.17.20" - postcss "^8.3.7" - prism-react-renderer "^1.2.1" - prismjs "^1.23.0" - react-router-dom "^5.2.0" - rtlcss "^3.3.0" + "clsx" "^1.1.1" + "copy-text-to-clipboard" "^3.0.1" + "infima" "0.2.0-alpha.37" + "lodash" "^4.17.20" + "postcss" "^8.3.7" + "prism-react-renderer" "^1.2.1" + "prismjs" "^1.23.0" + "react-router-dom" "^5.2.0" + "rtlcss" "^3.3.0" "@docusaurus/theme-common@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-2.0.0-beta.15.tgz#5bd338d483e2c19d6d74d133572988241518398a" - integrity sha512-+pvarmzcyECE4nWxw+dCMKRIoes0NegrRuM9+nRsUrS/E5ywsF539kpupKIEqaMjq6AuM0CJtDoHxHHPNe0KaQ== + "integrity" "sha512-+pvarmzcyECE4nWxw+dCMKRIoes0NegrRuM9+nRsUrS/E5ywsF539kpupKIEqaMjq6AuM0CJtDoHxHHPNe0KaQ==" + "resolved" "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/plugin-content-blog" "2.0.0-beta.15" "@docusaurus/plugin-content-docs" "2.0.0-beta.15" "@docusaurus/plugin-content-pages" "2.0.0-beta.15" - clsx "^1.1.1" - parse-numeric-range "^1.3.0" - tslib "^2.3.1" - utility-types "^3.10.0" + "clsx" "^1.1.1" + "parse-numeric-range" "^1.3.0" + "tslib" "^2.3.1" + "utility-types" "^3.10.0" "@docusaurus/theme-search-algolia@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-beta.15.tgz#c3ad7fd8e27fcb3e072990031c08768c602cb9a4" - integrity sha512-XrrQKyjOPzmEuOcdsaAn1tzNJkNMA3PC86PwPZUaah0cYPpBGptcJYDlIW4VHIrCBfkQvhvmg/B3qKF6bMMi8g== + "integrity" "sha512-XrrQKyjOPzmEuOcdsaAn1tzNJkNMA3PC86PwPZUaah0cYPpBGptcJYDlIW4VHIrCBfkQvhvmg/B3qKF6bMMi8g==" + "resolved" "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docsearch/react" "^3.0.0-alpha.39" "@docusaurus/core" "2.0.0-beta.15" @@ -1476,268 +1475,268 @@ "@docusaurus/theme-translations" "2.0.0-beta.15" "@docusaurus/utils" "2.0.0-beta.15" "@docusaurus/utils-validation" "2.0.0-beta.15" - algoliasearch "^4.10.5" - algoliasearch-helper "^3.5.5" - clsx "^1.1.1" - eta "^1.12.3" - lodash "^4.17.20" - tslib "^2.3.1" - utility-types "^3.10.0" + "algoliasearch" "^4.10.5" + "algoliasearch-helper" "^3.5.5" + "clsx" "^1.1.1" + "eta" "^1.12.3" + "lodash" "^4.17.20" + "tslib" "^2.3.1" + "utility-types" "^3.10.0" "@docusaurus/theme-translations@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-2.0.0-beta.15.tgz#658397ab4c0d7784043e3cec52cef7ae09d2fb59" - integrity sha512-Lu2JDsnZaB2BcJe8Hpq5nrbS7+7bd09jT08b9vztQyvzR8PgzsthnzlLN4ilOeamRIuYJKo1pUGm0EsQBOP6Nw== + "integrity" "sha512-Lu2JDsnZaB2BcJe8Hpq5nrbS7+7bd09jT08b9vztQyvzR8PgzsthnzlLN4ilOeamRIuYJKo1pUGm0EsQBOP6Nw==" + "resolved" "https://registry.npmjs.org/@docusaurus/theme-translations/-/theme-translations-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: - fs-extra "^10.0.0" - tslib "^2.3.1" + "fs-extra" "^10.0.0" + "tslib" "^2.3.1" "@docusaurus/utils-common@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-2.0.0-beta.15.tgz#5549b329fc750bd5e9f24952c9e3ff7cf1f63e08" - integrity sha512-kIGlSIvbE/oniUpUjI8GOkSpH8o4NXbYqAh9dqPn+TJ0KbEFY3fc80gzZQU+9SunCwJMJbIxIGevX9Ry+nackw== + "integrity" "sha512-kIGlSIvbE/oniUpUjI8GOkSpH8o4NXbYqAh9dqPn+TJ0KbEFY3fc80gzZQU+9SunCwJMJbIxIGevX9Ry+nackw==" + "resolved" "https://registry.npmjs.org/@docusaurus/utils-common/-/utils-common-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: - tslib "^2.3.1" + "tslib" "^2.3.1" "@docusaurus/utils-validation@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.15.tgz#c664bc021194db9254eb45e6b48cb7c2af269041" - integrity sha512-1oOVBCkRrsTXSYrBTsMdnj3a/R56zrx11rjF4xo0+dmm8C01Xw4msFtc3uA7VLX0HQvgHsk8xPzU5GERNdsNpg== + "integrity" "sha512-1oOVBCkRrsTXSYrBTsMdnj3a/R56zrx11rjF4xo0+dmm8C01Xw4msFtc3uA7VLX0HQvgHsk8xPzU5GERNdsNpg==" + "resolved" "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/logger" "2.0.0-beta.15" "@docusaurus/utils" "2.0.0-beta.15" - joi "^17.4.2" - tslib "^2.3.1" + "joi" "^17.4.2" + "tslib" "^2.3.1" "@docusaurus/utils@2.0.0-beta.15": - version "2.0.0-beta.15" - resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.0.0-beta.15.tgz#60868046700d5585cfa6ffc57c5f3fbed00b61fc" - integrity sha512-xkoPmFxCBkDqbZR4U3SE752OcXtWTGgZnc/pZWxItzb1IYRGNZHrzdIr7CnI7rppriuZzsyivDGiC4Ud9MWhkA== + "integrity" "sha512-xkoPmFxCBkDqbZR4U3SE752OcXtWTGgZnc/pZWxItzb1IYRGNZHrzdIr7CnI7rppriuZzsyivDGiC4Ud9MWhkA==" + "resolved" "https://registry.npmjs.org/@docusaurus/utils/-/utils-2.0.0-beta.15.tgz" + "version" "2.0.0-beta.15" dependencies: "@docusaurus/logger" "2.0.0-beta.15" "@mdx-js/runtime" "^1.6.22" "@svgr/webpack" "^6.0.0" - file-loader "^6.2.0" - fs-extra "^10.0.0" - github-slugger "^1.4.0" - globby "^11.0.4" - gray-matter "^4.0.3" - js-yaml "^4.0.0" - lodash "^4.17.20" - micromatch "^4.0.4" - remark-mdx-remove-exports "^1.6.22" - remark-mdx-remove-imports "^1.6.22" - resolve-pathname "^3.0.0" - tslib "^2.3.1" - url-loader "^4.1.1" + "file-loader" "^6.2.0" + "fs-extra" "^10.0.0" + "github-slugger" "^1.4.0" + "globby" "^11.0.4" + "gray-matter" "^4.0.3" + "js-yaml" "^4.0.0" + "lodash" "^4.17.20" + "micromatch" "^4.0.4" + "remark-mdx-remove-exports" "^1.6.22" + "remark-mdx-remove-imports" "^1.6.22" + "resolve-pathname" "^3.0.0" + "tslib" "^2.3.1" + "url-loader" "^4.1.1" "@hapi/hoek@^9.0.0": - version "9.2.1" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" - integrity sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw== + "integrity" "sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw==" + "resolved" "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.1.tgz" + "version" "9.2.1" "@hapi/topo@^5.0.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012" - integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg== + "integrity" "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==" + "resolved" "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz" + "version" "5.1.0" dependencies: "@hapi/hoek" "^9.0.0" -"@jridgewell/gen-mapping@^0.3.0": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" - integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== +"@jridgewell/gen-mapping@^0.1.0": + "integrity" "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==" + "resolved" "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz" + "version" "0.1.1" + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": + "integrity" "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==" + "resolved" "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz" + "version" "0.3.2" dependencies: "@jridgewell/set-array" "^1.0.1" "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/resolve-uri@^3.0.3": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" - integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== +"@jridgewell/resolve-uri@3.1.0": + "integrity" "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==" + "resolved" "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz" + "version" "3.1.0" -"@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== +"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": + "integrity" "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==" + "resolved" "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz" + "version" "1.1.2" "@jridgewell/source-map@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" - integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== + "integrity" "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==" + "resolved" "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz" + "version" "0.3.2" dependencies: "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.14" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" - integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@1.4.14": + "integrity" "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" + "resolved" "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz" + "version" "1.4.14" -"@jridgewell/trace-mapping@^0.3.0": - version "0.3.4" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3" - integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ== +"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": + "integrity" "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==" + "resolved" "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz" + "version" "0.3.17" dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/resolve-uri" "3.1.0" + "@jridgewell/sourcemap-codec" "1.4.14" -"@jridgewell/trace-mapping@^0.3.9": - version "0.3.14" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed" - integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@mdx-js/mdx@1.6.22", "@mdx-js/mdx@^1.6.21": - version "1.6.22" - resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" - integrity sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA== +"@mdx-js/mdx@^1.6.21", "@mdx-js/mdx@1.6.22": + "integrity" "sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA==" + "resolved" "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.22.tgz" + "version" "1.6.22" dependencies: "@babel/core" "7.12.9" "@babel/plugin-syntax-jsx" "7.12.1" "@babel/plugin-syntax-object-rest-spread" "7.8.3" "@mdx-js/util" "1.6.22" - babel-plugin-apply-mdx-type-prop "1.6.22" - babel-plugin-extract-import-names "1.6.22" - camelcase-css "2.0.1" - detab "2.0.4" - hast-util-raw "6.0.1" - lodash.uniq "4.5.0" - mdast-util-to-hast "10.0.1" - remark-footnotes "2.0.0" - remark-mdx "1.6.22" - remark-parse "8.0.3" - remark-squeeze-paragraphs "4.0.0" - style-to-object "0.3.0" - unified "9.2.0" - unist-builder "2.0.3" - unist-util-visit "2.0.3" + "babel-plugin-apply-mdx-type-prop" "1.6.22" + "babel-plugin-extract-import-names" "1.6.22" + "camelcase-css" "2.0.1" + "detab" "2.0.4" + "hast-util-raw" "6.0.1" + "lodash.uniq" "4.5.0" + "mdast-util-to-hast" "10.0.1" + "remark-footnotes" "2.0.0" + "remark-mdx" "1.6.22" + "remark-parse" "8.0.3" + "remark-squeeze-paragraphs" "4.0.0" + "style-to-object" "0.3.0" + "unified" "9.2.0" + "unist-builder" "2.0.3" + "unist-util-visit" "2.0.3" -"@mdx-js/react@1.6.22", "@mdx-js/react@^1.6.21": - version "1.6.22" - resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" - integrity sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg== +"@mdx-js/react@^1.6.21", "@mdx-js/react@1.6.22": + "integrity" "sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg==" + "resolved" "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.22.tgz" + "version" "1.6.22" "@mdx-js/runtime@^1.6.22": - version "1.6.22" - resolved "https://registry.yarnpkg.com/@mdx-js/runtime/-/runtime-1.6.22.tgz#3edd388bf68a519ffa1aaf9c446b548165102345" - integrity sha512-p17spaO2+55VLCuxXA3LVHC4phRx60NR2XMdZ+qgVU1lKvEX4y88dmFNOzGDCPLJ03IZyKrJ/rPWWRiBrd9JrQ== + "integrity" "sha512-p17spaO2+55VLCuxXA3LVHC4phRx60NR2XMdZ+qgVU1lKvEX4y88dmFNOzGDCPLJ03IZyKrJ/rPWWRiBrd9JrQ==" + "resolved" "https://registry.npmjs.org/@mdx-js/runtime/-/runtime-1.6.22.tgz" + "version" "1.6.22" dependencies: "@mdx-js/mdx" "1.6.22" "@mdx-js/react" "1.6.22" - buble-jsx-only "^0.19.8" + "buble-jsx-only" "^0.19.8" "@mdx-js/util@1.6.22": - version "1.6.22" - resolved "https://registry.yarnpkg.com/@mdx-js/util/-/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" - integrity sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA== + "integrity" "sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==" + "resolved" "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.22.tgz" + "version" "1.6.22" "@nodelib/fs.scandir@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" - integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + "integrity" "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==" + "resolved" "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" + "version" "2.1.5" dependencies: "@nodelib/fs.stat" "2.0.5" - run-parallel "^1.1.9" + "run-parallel" "^1.1.9" -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" - integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== +"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5": + "integrity" "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==" + "resolved" "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" + "version" "2.0.5" "@nodelib/fs.walk@^1.2.3": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" - integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + "integrity" "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==" + "resolved" "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz" + "version" "1.2.8" dependencies: "@nodelib/fs.scandir" "2.1.5" - fastq "^1.6.0" + "fastq" "^1.6.0" "@polka/url@^1.0.0-next.20": - version "1.0.0-next.21" - resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" - integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== + "integrity" "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==" + "resolved" "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz" + "version" "1.0.0-next.21" "@sideway/address@^4.1.3": - version "4.1.3" - resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.3.tgz#d93cce5d45c5daec92ad76db492cc2ee3c64ab27" - integrity sha512-8ncEUtmnTsMmL7z1YPB47kPUq7LpKWJNFPsRzHiIajGC5uXlWGn+AmkYPcHNl8S4tcEGx+cnORnNYaw2wvL+LQ== + "integrity" "sha512-8ncEUtmnTsMmL7z1YPB47kPUq7LpKWJNFPsRzHiIajGC5uXlWGn+AmkYPcHNl8S4tcEGx+cnORnNYaw2wvL+LQ==" + "resolved" "https://registry.npmjs.org/@sideway/address/-/address-4.1.3.tgz" + "version" "4.1.3" dependencies: "@hapi/hoek" "^9.0.0" "@sideway/formula@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" - integrity sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg== + "integrity" "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==" + "resolved" "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz" + "version" "3.0.1" "@sideway/pinpoint@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df" - integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== + "integrity" "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" + "resolved" "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz" + "version" "2.0.0" "@sindresorhus/is@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" - integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== + "integrity" "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" + "resolved" "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz" + "version" "0.14.0" "@slorber/static-site-generator-webpack-plugin@^4.0.0": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.1.tgz#0c8852146441aaa683693deaa5aee2f991d94841" - integrity sha512-PSv4RIVO1Y3kvHxjvqeVisk3E9XFoO04uwYBDWe217MFqKspplYswTuKLiJu0aLORQWzuQjfVsSlLPojwfYsLw== + "integrity" "sha512-PSv4RIVO1Y3kvHxjvqeVisk3E9XFoO04uwYBDWe217MFqKspplYswTuKLiJu0aLORQWzuQjfVsSlLPojwfYsLw==" + "resolved" "https://registry.npmjs.org/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.1.tgz" + "version" "4.0.1" dependencies: - bluebird "^3.7.1" - cheerio "^0.22.0" - eval "^0.1.4" - url "^0.11.0" - webpack-sources "^1.4.3" + "bluebird" "^3.7.1" + "cheerio" "^0.22.0" + "eval" "^0.1.4" + "url" "^0.11.0" + "webpack-sources" "^1.4.3" "@svgr/babel-plugin-add-jsx-attribute@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.0.0.tgz#bd6d1ff32a31b82b601e73672a789cc41e84fe18" - integrity sha512-MdPdhdWLtQsjd29Wa4pABdhWbaRMACdM1h31BY+c6FghTZqNGT7pEYdBoaGeKtdTOBC/XNFQaKVj+r/Ei2ryWA== + "integrity" "sha512-MdPdhdWLtQsjd29Wa4pABdhWbaRMACdM1h31BY+c6FghTZqNGT7pEYdBoaGeKtdTOBC/XNFQaKVj+r/Ei2ryWA==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.0.0.tgz" + "version" "6.0.0" "@svgr/babel-plugin-remove-jsx-attribute@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-6.0.0.tgz#58654908beebfa069681a83332544b17e5237e89" - integrity sha512-aVdtfx9jlaaxc3unA6l+M9YRnKIZjOhQPthLKqmTXC8UVkBLDRGwPKo+r8n3VZN8B34+yVajzPTZ+ptTSuZZCw== + "integrity" "sha512-aVdtfx9jlaaxc3unA6l+M9YRnKIZjOhQPthLKqmTXC8UVkBLDRGwPKo+r8n3VZN8B34+yVajzPTZ+ptTSuZZCw==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-6.0.0.tgz" + "version" "6.0.0" "@svgr/babel-plugin-remove-jsx-empty-expression@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-6.0.0.tgz#d06dd6e8a8f603f92f9979bb9990a1f85a4f57ba" - integrity sha512-Ccj42ApsePD451AZJJf1QzTD1B/BOU392URJTeXFxSK709i0KUsGtbwyiqsKu7vsYxpTM0IA5clAKDyf9RCZyA== + "integrity" "sha512-Ccj42ApsePD451AZJJf1QzTD1B/BOU392URJTeXFxSK709i0KUsGtbwyiqsKu7vsYxpTM0IA5clAKDyf9RCZyA==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-6.0.0.tgz" + "version" "6.0.0" "@svgr/babel-plugin-replace-jsx-attribute-value@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.0.0.tgz#0b85837577b02c31c09c758a12932820f5245cee" - integrity sha512-88V26WGyt1Sfd1emBYmBJRWMmgarrExpKNVmI9vVozha4kqs6FzQJ/Kp5+EYli1apgX44518/0+t9+NU36lThQ== + "integrity" "sha512-88V26WGyt1Sfd1emBYmBJRWMmgarrExpKNVmI9vVozha4kqs6FzQJ/Kp5+EYli1apgX44518/0+t9+NU36lThQ==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.0.0.tgz" + "version" "6.0.0" "@svgr/babel-plugin-svg-dynamic-title@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.0.0.tgz#28236ec26f7ab9d486a487d36ae52d58ba15676f" - integrity sha512-F7YXNLfGze+xv0KMQxrl2vkNbI9kzT9oDK55/kUuymh1ACyXkMV+VZWX1zEhSTfEKh7VkHVZGmVtHg8eTZ6PRg== + "integrity" "sha512-F7YXNLfGze+xv0KMQxrl2vkNbI9kzT9oDK55/kUuymh1ACyXkMV+VZWX1zEhSTfEKh7VkHVZGmVtHg8eTZ6PRg==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.0.0.tgz" + "version" "6.0.0" "@svgr/babel-plugin-svg-em-dimensions@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.0.0.tgz#40267c5dea1b43c4f83a0eb6169e08b43d8bafce" - integrity sha512-+rghFXxdIqJNLQK08kwPBD3Z22/0b2tEZ9lKiL/yTfuyj1wW8HUXu4bo/XkogATIYuXSghVQOOCwURXzHGKyZA== + "integrity" "sha512-+rghFXxdIqJNLQK08kwPBD3Z22/0b2tEZ9lKiL/yTfuyj1wW8HUXu4bo/XkogATIYuXSghVQOOCwURXzHGKyZA==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.0.0.tgz" + "version" "6.0.0" "@svgr/babel-plugin-transform-react-native-svg@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.0.0.tgz#eb688d0a5f539e34d268d8a516e81f5d7fede7c9" - integrity sha512-VaphyHZ+xIKv5v0K0HCzyfAaLhPGJXSk2HkpYfXIOKb7DjLBv0soHDxNv6X0vr2titsxE7klb++u7iOf7TSrFQ== + "integrity" "sha512-VaphyHZ+xIKv5v0K0HCzyfAaLhPGJXSk2HkpYfXIOKb7DjLBv0soHDxNv6X0vr2titsxE7klb++u7iOf7TSrFQ==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.0.0.tgz" + "version" "6.0.0" "@svgr/babel-plugin-transform-svg-component@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.2.0.tgz#7ba61d9fc1fb42b0ba1a04e4630019fa7e993c4f" - integrity sha512-bhYIpsORb++wpsp91fymbFkf09Z/YEKR0DnFjxvN+8JHeCUD2unnh18jIMKnDJTWtvpTaGYPXELVe4OOzFI0xg== + "integrity" "sha512-bhYIpsORb++wpsp91fymbFkf09Z/YEKR0DnFjxvN+8JHeCUD2unnh18jIMKnDJTWtvpTaGYPXELVe4OOzFI0xg==" + "resolved" "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.2.0.tgz" + "version" "6.2.0" "@svgr/babel-preset@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-6.2.0.tgz#1d3ad8c7664253a4be8e4a0f0e6872f30d8af627" - integrity sha512-4WQNY0J71JIaL03DRn0vLiz87JXx0b9dYm2aA8XHlQJQoixMl4r/soYHm8dsaJZ3jWtkCiOYy48dp9izvXhDkQ== + "integrity" "sha512-4WQNY0J71JIaL03DRn0vLiz87JXx0b9dYm2aA8XHlQJQoixMl4r/soYHm8dsaJZ3jWtkCiOYy48dp9izvXhDkQ==" + "resolved" "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-6.2.0.tgz" + "version" "6.2.0" dependencies: "@svgr/babel-plugin-add-jsx-attribute" "^6.0.0" "@svgr/babel-plugin-remove-jsx-attribute" "^6.0.0" @@ -1748,46 +1747,46 @@ "@svgr/babel-plugin-transform-react-native-svg" "^6.0.0" "@svgr/babel-plugin-transform-svg-component" "^6.2.0" -"@svgr/core@^6.2.1": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@svgr/core/-/core-6.2.1.tgz#195de807a9f27f9e0e0d678e01084b05c54fdf61" - integrity sha512-NWufjGI2WUyrg46mKuySfviEJ6IxHUOm/8a3Ph38VCWSp+83HBraCQrpEM3F3dB6LBs5x8OElS8h3C0oOJaJAA== +"@svgr/core@^6.0.0", "@svgr/core@^6.2.1": + "integrity" "sha512-NWufjGI2WUyrg46mKuySfviEJ6IxHUOm/8a3Ph38VCWSp+83HBraCQrpEM3F3dB6LBs5x8OElS8h3C0oOJaJAA==" + "resolved" "https://registry.npmjs.org/@svgr/core/-/core-6.2.1.tgz" + "version" "6.2.1" dependencies: "@svgr/plugin-jsx" "^6.2.1" - camelcase "^6.2.0" - cosmiconfig "^7.0.1" + "camelcase" "^6.2.0" + "cosmiconfig" "^7.0.1" "@svgr/hast-util-to-babel-ast@^6.2.1": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.2.1.tgz#ae065567b74cbe745afae617053adf9a764bea25" - integrity sha512-pt7MMkQFDlWJVy9ULJ1h+hZBDGFfSCwlBNW1HkLnVi7jUhyEXUaGYWi1x6bM2IXuAR9l265khBT4Av4lPmaNLQ== + "integrity" "sha512-pt7MMkQFDlWJVy9ULJ1h+hZBDGFfSCwlBNW1HkLnVi7jUhyEXUaGYWi1x6bM2IXuAR9l265khBT4Av4lPmaNLQ==" + "resolved" "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.2.1.tgz" + "version" "6.2.1" dependencies: "@babel/types" "^7.15.6" - entities "^3.0.1" + "entities" "^3.0.1" "@svgr/plugin-jsx@^6.2.1": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-6.2.1.tgz#5668f1d2aa18c2f1bb7a1fc9f682d3f9aed263bd" - integrity sha512-u+MpjTsLaKo6r3pHeeSVsh9hmGRag2L7VzApWIaS8imNguqoUwDq/u6U/NDmYs/KAsrmtBjOEaAAPbwNGXXp1g== + "integrity" "sha512-u+MpjTsLaKo6r3pHeeSVsh9hmGRag2L7VzApWIaS8imNguqoUwDq/u6U/NDmYs/KAsrmtBjOEaAAPbwNGXXp1g==" + "resolved" "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-6.2.1.tgz" + "version" "6.2.1" dependencies: "@babel/core" "^7.15.5" "@svgr/babel-preset" "^6.2.0" "@svgr/hast-util-to-babel-ast" "^6.2.1" - svg-parser "^2.0.2" + "svg-parser" "^2.0.2" "@svgr/plugin-svgo@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-6.2.0.tgz#4cbe6a33ccccdcae4e3b63ded64cc1cbe1faf48c" - integrity sha512-oDdMQONKOJEbuKwuy4Np6VdV6qoaLLvoY86hjvQEgU82Vx1MSWRyYms6Sl0f+NtqxLI/rDVufATbP/ev996k3Q== + "integrity" "sha512-oDdMQONKOJEbuKwuy4Np6VdV6qoaLLvoY86hjvQEgU82Vx1MSWRyYms6Sl0f+NtqxLI/rDVufATbP/ev996k3Q==" + "resolved" "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-6.2.0.tgz" + "version" "6.2.0" dependencies: - cosmiconfig "^7.0.1" - deepmerge "^4.2.2" - svgo "^2.5.0" + "cosmiconfig" "^7.0.1" + "deepmerge" "^4.2.2" + "svgo" "^2.5.0" "@svgr/webpack@^6.0.0": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-6.2.1.tgz#ef5d51c1b6be4e7537fb9f76b3f2b2e22b63c58d" - integrity sha512-h09ngMNd13hnePwgXa+Y5CgOjzlCvfWLHg+MBnydEedAnuLRzUHUJmGS3o2OsrhxTOOqEsPOFt5v/f6C5Qulcw== + "integrity" "sha512-h09ngMNd13hnePwgXa+Y5CgOjzlCvfWLHg+MBnydEedAnuLRzUHUJmGS3o2OsrhxTOOqEsPOFt5v/f6C5Qulcw==" + "resolved" "https://registry.npmjs.org/@svgr/webpack/-/webpack-6.2.1.tgz" + "version" "6.2.1" dependencies: "@babel/core" "^7.15.5" "@babel/plugin-transform-react-constant-elements" "^7.14.5" @@ -1799,81 +1798,81 @@ "@svgr/plugin-svgo" "^6.2.0" "@szmarczak/http-timer@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" - integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== + "integrity" "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==" + "resolved" "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz" + "version" "1.1.2" dependencies: - defer-to-connect "^1.0.1" + "defer-to-connect" "^1.0.1" "@trysound/sax@0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" - integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== + "integrity" "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==" + "resolved" "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz" + "version" "0.2.0" "@types/body-parser@*": - version "1.19.2" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" - integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== + "integrity" "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==" + "resolved" "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz" + "version" "1.19.2" dependencies: "@types/connect" "*" "@types/node" "*" "@types/bonjour@^3.5.9": - version "3.5.10" - resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" - integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw== + "integrity" "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==" + "resolved" "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz" + "version" "3.5.10" dependencies: "@types/node" "*" "@types/connect-history-api-fallback@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" - integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw== + "integrity" "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==" + "resolved" "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz" + "version" "1.3.5" dependencies: "@types/express-serve-static-core" "*" "@types/node" "*" "@types/connect@*": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== + "integrity" "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==" + "resolved" "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz" + "version" "3.4.35" dependencies: "@types/node" "*" "@types/eslint-scope@^3.7.3": - version "3.7.3" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224" - integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g== + "integrity" "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==" + "resolved" "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz" + "version" "3.7.3" dependencies: "@types/eslint" "*" "@types/estree" "*" "@types/eslint@*": - version "8.4.1" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304" - integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA== + "integrity" "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==" + "resolved" "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz" + "version" "8.4.1" dependencies: "@types/estree" "*" "@types/json-schema" "*" "@types/estree@*", "@types/estree@^0.0.51": - version "0.0.51" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" - integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== + "integrity" "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==" + "resolved" "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz" + "version" "0.0.51" "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": - version "4.17.28" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" - integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig== + "integrity" "sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==" + "resolved" "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz" + "version" "4.17.28" dependencies: "@types/node" "*" "@types/qs" "*" "@types/range-parser" "*" "@types/express@*", "@types/express@^4.17.13": - version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" - integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== + "integrity" "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==" + "resolved" "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz" + "version" "4.17.13" dependencies: "@types/body-parser" "*" "@types/express-serve-static-core" "^4.17.18" @@ -1881,172 +1880,172 @@ "@types/serve-static" "*" "@types/hast@^2.0.0": - version "2.3.4" - resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz#8aa5ef92c117d20d974a82bdfb6a648b08c0bafc" - integrity sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g== + "integrity" "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==" + "resolved" "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz" + "version" "2.3.4" dependencies: "@types/unist" "*" "@types/html-minifier-terser@^6.0.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35" - integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg== + "integrity" "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==" + "resolved" "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz" + "version" "6.1.0" "@types/http-proxy@^1.17.8": - version "1.17.8" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55" - integrity sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA== + "integrity" "sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==" + "resolved" "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz" + "version" "1.17.8" dependencies: "@types/node" "*" "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" - integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== + "integrity" "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==" + "resolved" "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz" + "version" "7.0.9" "@types/mdast@^3.0.0": - version "3.0.10" - resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" - integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA== + "integrity" "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==" + "resolved" "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz" + "version" "3.0.10" dependencies: "@types/unist" "*" "@types/mime@^1": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" - integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== + "integrity" "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==" + "resolved" "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz" + "version" "1.3.2" "@types/node@*", "@types/node@^17.0.5": - version "17.0.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.18.tgz#3b4fed5cfb58010e3a2be4b6e74615e4847f1074" - integrity sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA== + "integrity" "sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==" + "resolved" "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz" + "version" "17.0.18" "@types/parse-json@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" - integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + "integrity" "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" + "resolved" "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz" + "version" "4.0.0" "@types/parse5@^5.0.0": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109" - integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw== + "integrity" "sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==" + "resolved" "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz" + "version" "5.0.3" "@types/prop-types@*": - version "15.7.4" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" - integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== + "integrity" "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==" + "resolved" "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz" + "version" "15.7.4" "@types/qs@*": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== + "integrity" "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==" + "resolved" "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz" + "version" "6.9.7" "@types/range-parser@*": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" - integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== + "integrity" "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==" + "resolved" "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz" + "version" "1.2.4" -"@types/react@*": - version "17.0.39" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.39.tgz#d0f4cde092502a6db00a1cded6e6bf2abb7633ce" - integrity sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug== +"@types/react@*", "@types/react@>= 16.8.0 < 18.0.0": + "integrity" "sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug==" + "resolved" "https://registry.npmjs.org/@types/react/-/react-17.0.39.tgz" + "version" "17.0.39" dependencies: "@types/prop-types" "*" "@types/scheduler" "*" - csstype "^3.0.2" + "csstype" "^3.0.2" "@types/retry@^0.12.0": - version "0.12.1" - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" - integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g== + "integrity" "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==" + "resolved" "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz" + "version" "0.12.1" "@types/sax@^1.2.1": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/sax/-/sax-1.2.4.tgz#8221affa7f4f3cb21abd22f244cfabfa63e6a69e" - integrity sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw== + "integrity" "sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw==" + "resolved" "https://registry.npmjs.org/@types/sax/-/sax-1.2.4.tgz" + "version" "1.2.4" dependencies: "@types/node" "*" "@types/scheduler@*": - version "0.16.2" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" - integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + "integrity" "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==" + "resolved" "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz" + "version" "0.16.2" "@types/serve-index@^1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" - integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg== + "integrity" "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==" + "resolved" "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz" + "version" "1.9.1" dependencies: "@types/express" "*" "@types/serve-static@*": - version "1.13.10" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" - integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== + "integrity" "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==" + "resolved" "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz" + "version" "1.13.10" dependencies: "@types/mime" "^1" "@types/node" "*" "@types/sockjs@^0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" - integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw== + "integrity" "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==" + "resolved" "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz" + "version" "0.3.33" dependencies: "@types/node" "*" "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" - integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ== + "integrity" "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==" + "resolved" "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz" + "version" "2.0.6" "@types/ws@^8.2.2": - version "8.2.2" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.2.2.tgz#7c5be4decb19500ae6b3d563043cd407bf366c21" - integrity sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg== + "integrity" "sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==" + "resolved" "https://registry.npmjs.org/@types/ws/-/ws-8.2.2.tgz" + "version" "8.2.2" dependencies: "@types/node" "*" "@webassemblyjs/ast@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" - integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== + "integrity" "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/helper-numbers" "1.11.1" "@webassemblyjs/helper-wasm-bytecode" "1.11.1" "@webassemblyjs/floating-point-hex-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" - integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== + "integrity" "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz" + "version" "1.11.1" "@webassemblyjs/helper-api-error@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" - integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== + "integrity" "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz" + "version" "1.11.1" "@webassemblyjs/helper-buffer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" - integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== + "integrity" "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz" + "version" "1.11.1" "@webassemblyjs/helper-numbers@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" - integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== + "integrity" "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/floating-point-hex-parser" "1.11.1" "@webassemblyjs/helper-api-error" "1.11.1" "@xtuc/long" "4.2.2" "@webassemblyjs/helper-wasm-bytecode@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" - integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== + "integrity" "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz" + "version" "1.11.1" "@webassemblyjs/helper-wasm-section@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" - integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== + "integrity" "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/ast" "1.11.1" "@webassemblyjs/helper-buffer" "1.11.1" @@ -2054,28 +2053,28 @@ "@webassemblyjs/wasm-gen" "1.11.1" "@webassemblyjs/ieee754@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" - integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== + "integrity" "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz" + "version" "1.11.1" dependencies: "@xtuc/ieee754" "^1.2.0" "@webassemblyjs/leb128@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" - integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== + "integrity" "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz" + "version" "1.11.1" dependencies: "@xtuc/long" "4.2.2" "@webassemblyjs/utf8@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" - integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== + "integrity" "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz" + "version" "1.11.1" "@webassemblyjs/wasm-edit@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" - integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== + "integrity" "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/ast" "1.11.1" "@webassemblyjs/helper-buffer" "1.11.1" @@ -2087,9 +2086,9 @@ "@webassemblyjs/wast-printer" "1.11.1" "@webassemblyjs/wasm-gen@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" - integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== + "integrity" "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/ast" "1.11.1" "@webassemblyjs/helper-wasm-bytecode" "1.11.1" @@ -2098,9 +2097,9 @@ "@webassemblyjs/utf8" "1.11.1" "@webassemblyjs/wasm-opt@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" - integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== + "integrity" "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/ast" "1.11.1" "@webassemblyjs/helper-buffer" "1.11.1" @@ -2108,9 +2107,9 @@ "@webassemblyjs/wasm-parser" "1.11.1" "@webassemblyjs/wasm-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" - integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== + "integrity" "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/ast" "1.11.1" "@webassemblyjs/helper-api-error" "1.11.1" @@ -2120,124 +2119,124 @@ "@webassemblyjs/utf8" "1.11.1" "@webassemblyjs/wast-printer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" - integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== + "integrity" "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==" + "resolved" "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz" + "version" "1.11.1" dependencies: "@webassemblyjs/ast" "1.11.1" "@xtuc/long" "4.2.2" "@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== + "integrity" "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==" + "resolved" "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz" + "version" "1.2.0" "@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== + "integrity" "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" + "resolved" "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz" + "version" "4.2.2" -accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: - version "1.3.8" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" - integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== +"accepts@~1.3.4", "accepts@~1.3.5", "accepts@~1.3.8": + "integrity" "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==" + "resolved" "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz" + "version" "1.3.8" dependencies: - mime-types "~2.1.34" - negotiator "0.6.3" + "mime-types" "~2.1.34" + "negotiator" "0.6.3" -acorn-dynamic-import@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" - integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw== +"acorn-dynamic-import@^4.0.0": + "integrity" "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==" + "resolved" "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz" + "version" "4.0.0" -acorn-import-assertions@^1.7.6: - version "1.8.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" - integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== +"acorn-import-assertions@^1.7.6": + "integrity" "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==" + "resolved" "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz" + "version" "1.8.0" -acorn-jsx@^5.0.1: - version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" - integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== +"acorn-jsx@^5.0.1": + "integrity" "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" + "resolved" "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz" + "version" "5.3.2" -acorn-walk@^8.0.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" - integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== +"acorn-walk@^8.0.0": + "integrity" "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==" + "resolved" "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz" + "version" "8.2.0" -acorn@^6.1.1: - version "6.4.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" - integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== +"acorn@^6.0.0", "acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^6.1.1": + "integrity" "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==" + "resolved" "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz" + "version" "6.4.2" -acorn@^8.0.4, acorn@^8.4.1, acorn@^8.5.0: - version "8.7.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" - integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== +"acorn@^8", "acorn@^8.0.4", "acorn@^8.4.1", "acorn@^8.5.0": + "integrity" "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==" + "resolved" "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz" + "version" "8.7.1" -address@^1.0.1, address@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" - integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA== +"address@^1.0.1", "address@^1.1.2": + "integrity" "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==" + "resolved" "https://registry.npmjs.org/address/-/address-1.1.2.tgz" + "version" "1.1.2" -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== +"aggregate-error@^3.0.0": + "integrity" "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==" + "resolved" "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz" + "version" "3.1.0" dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" + "clean-stack" "^2.0.0" + "indent-string" "^4.0.0" -ajv-formats@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" - integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== +"ajv-formats@^2.1.1": + "integrity" "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==" + "resolved" "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz" + "version" "2.1.1" dependencies: - ajv "^8.0.0" + "ajv" "^8.0.0" -ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== +"ajv-keywords@^3.4.1", "ajv-keywords@^3.5.2": + "integrity" "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==" + "resolved" "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz" + "version" "3.5.2" -ajv-keywords@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" - integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== +"ajv-keywords@^5.0.0": + "integrity" "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==" + "resolved" "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz" + "version" "5.1.0" dependencies: - fast-deep-equal "^3.1.3" + "fast-deep-equal" "^3.1.3" -ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== +"ajv@^6.12.2", "ajv@^6.12.4", "ajv@^6.12.5", "ajv@^6.9.1": + "integrity" "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==" + "resolved" "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" + "version" "6.12.6" dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" + "fast-deep-equal" "^3.1.1" + "fast-json-stable-stringify" "^2.0.0" + "json-schema-traverse" "^0.4.1" + "uri-js" "^4.2.2" -ajv@^8.0.0, ajv@^8.8.0: - version "8.10.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d" - integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw== +"ajv@^8.0.0", "ajv@^8.8.0", "ajv@^8.8.2": + "integrity" "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==" + "resolved" "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz" + "version" "8.10.0" dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" + "fast-deep-equal" "^3.1.1" + "json-schema-traverse" "^1.0.0" + "require-from-string" "^2.0.2" + "uri-js" "^4.2.2" -algoliasearch-helper@^3.5.5: - version "3.7.0" - resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-3.7.0.tgz#c0a0493df84d850360f664ad7a9d4fc78a94fd78" - integrity sha512-XJ3QfERBLfeVCyTVx80gon7r3/rgm/CE8Ha1H7cbablRe/X7SfYQ14g/eO+MhjVKIQp+gy9oC6G5ilmLwS1k6w== +"algoliasearch-helper@^3.5.5": + "integrity" "sha512-XJ3QfERBLfeVCyTVx80gon7r3/rgm/CE8Ha1H7cbablRe/X7SfYQ14g/eO+MhjVKIQp+gy9oC6G5ilmLwS1k6w==" + "resolved" "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.7.0.tgz" + "version" "3.7.0" dependencies: "@algolia/events" "^4.0.1" -algoliasearch@^4.0.0, algoliasearch@^4.10.5: - version "4.12.1" - resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.12.1.tgz#574a2c5424c4b6681c026928fb810be2d2ec3924" - integrity sha512-c0dM1g3zZBJrkzE5GA/Nu1y3fFxx3LCzxKzcmp2dgGS8P4CjszB/l3lsSh2MSrrK1Hn/KV4BlbBMXtYgG1Bfrw== +"algoliasearch@^4.0.0", "algoliasearch@^4.10.5", "algoliasearch@^4.9.1", "algoliasearch@>= 3.1 < 5": + "integrity" "sha512-c0dM1g3zZBJrkzE5GA/Nu1y3fFxx3LCzxKzcmp2dgGS8P4CjszB/l3lsSh2MSrrK1Hn/KV4BlbBMXtYgG1Bfrw==" + "resolved" "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.12.1.tgz" + "version" "4.12.1" dependencies: "@algolia/cache-browser-local-storage" "4.12.1" "@algolia/cache-common" "4.12.1" @@ -2254,2429 +2253,2448 @@ algoliasearch@^4.0.0, algoliasearch@^4.10.5: "@algolia/requester-node-http" "4.12.1" "@algolia/transporter" "4.12.1" -ansi-align@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" - integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== +"ansi-align@^3.0.0": + "integrity" "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==" + "resolved" "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz" + "version" "3.0.1" dependencies: - string-width "^4.1.0" + "string-width" "^4.1.0" -ansi-html-community@^0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" - integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== +"ansi-html-community@^0.0.8": + "integrity" "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==" + "resolved" "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz" + "version" "0.0.8" -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== +"ansi-regex@^5.0.1": + "integrity" "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz" + "version" "5.0.1" -ansi-regex@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" - integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== +"ansi-regex@^6.0.1": + "integrity" "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==" + "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz" + "version" "6.0.1" -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== +"ansi-styles@^3.2.1": + "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==" + "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz" + "version" "3.2.1" dependencies: - color-convert "^1.9.0" + "color-convert" "^1.9.0" -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== +"ansi-styles@^4.0.0", "ansi-styles@^4.1.0": + "integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==" + "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz" + "version" "4.3.0" dependencies: - color-convert "^2.0.1" + "color-convert" "^2.0.1" -anymatch@~3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== +"anymatch@~3.1.2": + "integrity" "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==" + "resolved" "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz" + "version" "3.1.2" dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" + "normalize-path" "^3.0.0" + "picomatch" "^2.0.4" -arg@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" - integrity sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA== +"arg@^5.0.0": + "integrity" "sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==" + "resolved" "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz" + "version" "5.0.1" -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== +"argparse@^1.0.7": + "integrity" "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==" + "resolved" "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz" + "version" "1.0.10" dependencies: - sprintf-js "~1.0.2" + "sprintf-js" "~1.0.2" -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== +"argparse@^2.0.1": + "integrity" "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "resolved" "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz" + "version" "2.0.1" -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= +"array-flatten@^2.1.0": + "integrity" "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==" + "resolved" "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz" + "version" "2.1.2" -array-flatten@^2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== +"array-flatten@1.1.1": + "integrity" "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + "resolved" "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz" + "version" "1.1.1" -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== +"array-union@^2.1.0": + "integrity" "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==" + "resolved" "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz" + "version" "2.1.0" -array-union@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975" - integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw== +"array-union@^3.0.1": + "integrity" "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==" + "resolved" "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz" + "version" "3.0.1" -asap@~2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" - integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= +"asap@~2.0.3": + "integrity" "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + "resolved" "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz" + "version" "2.0.6" -async@^2.6.2: - version "2.6.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" - integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== +"async@^2.6.2": + "integrity" "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==" + "resolved" "https://registry.npmjs.org/async/-/async-2.6.4.tgz" + "version" "2.6.4" dependencies: - lodash "^4.17.14" + "lodash" "^4.17.14" -at-least-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" - integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== +"at-least-node@^1.0.0": + "integrity" "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==" + "resolved" "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz" + "version" "1.0.0" -autoprefixer@^10.3.5, autoprefixer@^10.3.7: - version "10.4.2" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.2.tgz#25e1df09a31a9fba5c40b578936b90d35c9d4d3b" - integrity sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ== +"autoprefixer@^10.3.5", "autoprefixer@^10.3.7": + "integrity" "sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==" + "resolved" "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.2.tgz" + "version" "10.4.2" dependencies: - browserslist "^4.19.1" - caniuse-lite "^1.0.30001297" - fraction.js "^4.1.2" - normalize-range "^0.1.2" - picocolors "^1.0.0" - postcss-value-parser "^4.2.0" + "browserslist" "^4.19.1" + "caniuse-lite" "^1.0.30001297" + "fraction.js" "^4.1.2" + "normalize-range" "^0.1.2" + "picocolors" "^1.0.0" + "postcss-value-parser" "^4.2.0" -axios@^0.25.0: - version "0.25.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a" - integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g== +"axios@^0.25.0": + "integrity" "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==" + "resolved" "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz" + "version" "0.25.0" dependencies: - follow-redirects "^1.14.7" + "follow-redirects" "^1.14.7" -babel-loader@^8.2.2: - version "8.2.3" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" - integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw== +"babel-loader@^8.2.2": + "integrity" "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==" + "resolved" "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz" + "version" "8.2.3" dependencies: - find-cache-dir "^3.3.1" - loader-utils "^1.4.0" - make-dir "^3.1.0" - schema-utils "^2.6.5" + "find-cache-dir" "^3.3.1" + "loader-utils" "^1.4.0" + "make-dir" "^3.1.0" + "schema-utils" "^2.6.5" -babel-plugin-apply-mdx-type-prop@1.6.22: - version "1.6.22" - resolved "https://registry.yarnpkg.com/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" - integrity sha512-VefL+8o+F/DfK24lPZMtJctrCVOfgbqLAGZSkxwhazQv4VxPg3Za/i40fu22KR2m8eEda+IfSOlPLUSIiLcnCQ== +"babel-plugin-apply-mdx-type-prop@1.6.22": + "integrity" "sha512-VefL+8o+F/DfK24lPZMtJctrCVOfgbqLAGZSkxwhazQv4VxPg3Za/i40fu22KR2m8eEda+IfSOlPLUSIiLcnCQ==" + "resolved" "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.22.tgz" + "version" "1.6.22" dependencies: "@babel/helper-plugin-utils" "7.10.4" "@mdx-js/util" "1.6.22" -babel-plugin-dynamic-import-node@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" - integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ== +"babel-plugin-dynamic-import-node@^2.3.3": + "integrity" "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==" + "resolved" "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz" + "version" "2.3.3" dependencies: - object.assign "^4.1.0" + "object.assign" "^4.1.0" -babel-plugin-dynamic-import-node@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" - integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== +"babel-plugin-dynamic-import-node@2.3.0": + "integrity" "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==" + "resolved" "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz" + "version" "2.3.0" dependencies: - object.assign "^4.1.0" + "object.assign" "^4.1.0" -babel-plugin-extract-import-names@1.6.22: - version "1.6.22" - resolved "https://registry.yarnpkg.com/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc" - integrity sha512-yJ9BsJaISua7d8zNT7oRG1ZLBJCIdZ4PZqmH8qa9N5AK01ifk3fnkc98AXhtzE7UkfCsEumvoQWgoYLhOnJ7jQ== +"babel-plugin-extract-import-names@1.6.22": + "integrity" "sha512-yJ9BsJaISua7d8zNT7oRG1ZLBJCIdZ4PZqmH8qa9N5AK01ifk3fnkc98AXhtzE7UkfCsEumvoQWgoYLhOnJ7jQ==" + "resolved" "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.22.tgz" + "version" "1.6.22" dependencies: "@babel/helper-plugin-utils" "7.10.4" -babel-plugin-polyfill-corejs2@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5" - integrity sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w== +"babel-plugin-polyfill-corejs2@^0.3.0": + "integrity" "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==" + "resolved" "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz" + "version" "0.3.1" dependencies: "@babel/compat-data" "^7.13.11" "@babel/helper-define-polyfill-provider" "^0.3.1" - semver "^6.1.1" + "semver" "^6.1.1" -babel-plugin-polyfill-corejs3@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72" - integrity sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ== +"babel-plugin-polyfill-corejs3@^0.5.0": + "integrity" "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==" + "resolved" "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz" + "version" "0.5.2" dependencies: "@babel/helper-define-polyfill-provider" "^0.3.1" - core-js-compat "^3.21.0" + "core-js-compat" "^3.21.0" -babel-plugin-polyfill-regenerator@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990" - integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A== +"babel-plugin-polyfill-regenerator@^0.3.0": + "integrity" "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==" + "resolved" "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz" + "version" "0.3.1" dependencies: "@babel/helper-define-polyfill-provider" "^0.3.1" -bail@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" - integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ== +"bail@^1.0.0": + "integrity" "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==" + "resolved" "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz" + "version" "1.0.5" -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== +"balanced-match@^1.0.0": + "integrity" "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "resolved" "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" + "version" "1.0.2" -base16@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz#e297f60d7ec1014a7a971a39ebc8a98c0b681e70" - integrity sha1-4pf2DX7BAUp6lxo568ipjAtoHnA= +"base16@^1.0.0": + "integrity" "sha1-4pf2DX7BAUp6lxo568ipjAtoHnA=" + "resolved" "https://registry.npmjs.org/base16/-/base16-1.0.0.tgz" + "version" "1.0.0" -batch@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= +"batch@0.6.1": + "integrity" "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=" + "resolved" "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz" + "version" "0.6.1" -big.js@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" - integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== +"big.js@^5.2.2": + "integrity" "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==" + "resolved" "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz" + "version" "5.2.2" -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== +"binary-extensions@^2.0.0": + "integrity" "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" + "resolved" "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" + "version" "2.2.0" -bluebird@^3.7.1: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== +"bluebird@^3.7.1": + "integrity" "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + "resolved" "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz" + "version" "3.7.2" -body-parser@1.19.2: - version "1.19.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e" - integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw== +"body-parser@1.19.2": + "integrity" "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==" + "resolved" "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz" + "version" "1.19.2" dependencies: - bytes "3.1.2" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.8.1" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.9.7" - raw-body "2.4.3" - type-is "~1.6.18" + "bytes" "3.1.2" + "content-type" "~1.0.4" + "debug" "2.6.9" + "depd" "~1.1.2" + "http-errors" "1.8.1" + "iconv-lite" "0.4.24" + "on-finished" "~2.3.0" + "qs" "6.9.7" + "raw-body" "2.4.3" + "type-is" "~1.6.18" -bonjour@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" - integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= +"bonjour@^3.5.0": + "integrity" "sha1-jokKGD2O6aI5OzhExpGkK897yfU=" + "resolved" "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz" + "version" "3.5.0" dependencies: - array-flatten "^2.1.0" - deep-equal "^1.0.1" - dns-equal "^1.0.0" - dns-txt "^2.0.2" - multicast-dns "^6.0.1" - multicast-dns-service-types "^1.1.0" + "array-flatten" "^2.1.0" + "deep-equal" "^1.0.1" + "dns-equal" "^1.0.0" + "dns-txt" "^2.0.2" + "multicast-dns" "^6.0.1" + "multicast-dns-service-types" "^1.1.0" -boolbase@^1.0.0, boolbase@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" - integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= +"boolbase@^1.0.0", "boolbase@~1.0.0": + "integrity" "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" + "resolved" "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz" + "version" "1.0.0" -boxen@^5.0.0, boxen@^5.0.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" - integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== +"boxen@^5.0.0", "boxen@^5.0.1": + "integrity" "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==" + "resolved" "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz" + "version" "5.1.2" dependencies: - ansi-align "^3.0.0" - camelcase "^6.2.0" - chalk "^4.1.0" - cli-boxes "^2.2.1" - string-width "^4.2.2" - type-fest "^0.20.2" - widest-line "^3.1.0" - wrap-ansi "^7.0.0" + "ansi-align" "^3.0.0" + "camelcase" "^6.2.0" + "chalk" "^4.1.0" + "cli-boxes" "^2.2.1" + "string-width" "^4.2.2" + "type-fest" "^0.20.2" + "widest-line" "^3.1.0" + "wrap-ansi" "^7.0.0" -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== +"brace-expansion@^1.1.7": + "integrity" "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==" + "resolved" "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" + "version" "1.1.11" dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" + "balanced-match" "^1.0.0" + "concat-map" "0.0.1" -braces@^3.0.1, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== +"braces@^3.0.1", "braces@~3.0.2": + "integrity" "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==" + "resolved" "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz" + "version" "3.0.2" dependencies: - fill-range "^7.0.1" + "fill-range" "^7.0.1" -browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.18.1, browserslist@^4.19.1: - version "4.19.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3" - integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A== +"browserslist@^4.0.0", "browserslist@^4.14.5", "browserslist@^4.16.6", "browserslist@^4.18.1", "browserslist@^4.19.1", "browserslist@^4.21.3", "browserslist@>= 4.21.0": + "integrity" "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==" + "resolved" "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz" + "version" "4.21.5" dependencies: - caniuse-lite "^1.0.30001286" - electron-to-chromium "^1.4.17" - escalade "^3.1.1" - node-releases "^2.0.1" - picocolors "^1.0.0" + "caniuse-lite" "^1.0.30001449" + "electron-to-chromium" "^1.4.284" + "node-releases" "^2.0.8" + "update-browserslist-db" "^1.0.10" -buble-jsx-only@^0.19.8: - version "0.19.8" - resolved "https://registry.yarnpkg.com/buble-jsx-only/-/buble-jsx-only-0.19.8.tgz#6e3524aa0f1c523de32496ac9aceb9cc2b493867" - integrity sha512-7AW19pf7PrKFnGTEDzs6u9+JZqQwM1VnLS19OlqYDhXomtFFknnoQJAPHeg84RMFWAvOhYrG7harizJNwUKJsA== +"buble-jsx-only@^0.19.8": + "integrity" "sha512-7AW19pf7PrKFnGTEDzs6u9+JZqQwM1VnLS19OlqYDhXomtFFknnoQJAPHeg84RMFWAvOhYrG7harizJNwUKJsA==" + "resolved" "https://registry.npmjs.org/buble-jsx-only/-/buble-jsx-only-0.19.8.tgz" + "version" "0.19.8" dependencies: - acorn "^6.1.1" - acorn-dynamic-import "^4.0.0" - acorn-jsx "^5.0.1" - chalk "^2.4.2" - magic-string "^0.25.3" - minimist "^1.2.0" - regexpu-core "^4.5.4" + "acorn" "^6.1.1" + "acorn-dynamic-import" "^4.0.0" + "acorn-jsx" "^5.0.1" + "chalk" "^2.4.2" + "magic-string" "^0.25.3" + "minimist" "^1.2.0" + "regexpu-core" "^4.5.4" -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== +"buffer-from@^1.0.0": + "integrity" "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" + "resolved" "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz" + "version" "1.1.2" -buffer-indexof@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" - integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== +"buffer-indexof@^1.0.0": + "integrity" "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==" + "resolved" "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz" + "version" "1.1.1" -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= +"bytes@3.0.0": + "integrity" "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" + "resolved" "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz" + "version" "3.0.0" -bytes@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" - integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== +"bytes@3.1.2": + "integrity" "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" + "resolved" "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz" + "version" "3.1.2" -cacheable-request@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" - integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== +"cacheable-request@^6.0.0": + "integrity" "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==" + "resolved" "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz" + "version" "6.1.0" dependencies: - clone-response "^1.0.2" - get-stream "^5.1.0" - http-cache-semantics "^4.0.0" - keyv "^3.0.0" - lowercase-keys "^2.0.0" - normalize-url "^4.1.0" - responselike "^1.0.2" + "clone-response" "^1.0.2" + "get-stream" "^5.1.0" + "http-cache-semantics" "^4.0.0" + "keyv" "^3.0.0" + "lowercase-keys" "^2.0.0" + "normalize-url" "^4.1.0" + "responselike" "^1.0.2" -call-bind@^1.0.0, call-bind@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== +"call-bind@^1.0.0", "call-bind@^1.0.2": + "integrity" "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==" + "resolved" "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz" + "version" "1.0.2" dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" + "function-bind" "^1.1.1" + "get-intrinsic" "^1.0.2" -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== +"callsites@^3.0.0": + "integrity" "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" + "resolved" "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz" + "version" "3.1.0" -camel-case@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" - integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== +"camel-case@^4.1.2": + "integrity" "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==" + "resolved" "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz" + "version" "4.1.2" dependencies: - pascal-case "^3.1.2" - tslib "^2.0.3" + "pascal-case" "^3.1.2" + "tslib" "^2.0.3" -camelcase-css@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" - integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== +"camelcase-css@2.0.1": + "integrity" "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==" + "resolved" "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz" + "version" "2.0.1" -camelcase@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" - integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== +"camelcase@^6.2.0": + "integrity" "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==" + "resolved" "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz" + "version" "6.3.0" -caniuse-api@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" - integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== +"caniuse-api@^3.0.0": + "integrity" "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==" + "resolved" "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz" + "version" "3.0.0" dependencies: - browserslist "^4.0.0" - caniuse-lite "^1.0.0" - lodash.memoize "^4.1.2" - lodash.uniq "^4.5.0" + "browserslist" "^4.0.0" + "caniuse-lite" "^1.0.0" + "lodash.memoize" "^4.1.2" + "lodash.uniq" "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001297: - version "1.0.30001312" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz#e11eba4b87e24d22697dae05455d5aea28550d5f" - integrity sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ== +"caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30001297", "caniuse-lite@^1.0.30001449": + "integrity" "sha512-ewtFBSfWjEmxUgNBSZItFSmVtvk9zkwkl1OfRZlKA8slltRN+/C/tuGVrF9styXkN36Yu3+SeJ1qkXxDEyNZ5w==" + "resolved" "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001466.tgz" + "version" "1.0.30001466" -ccount@^1.0.0, ccount@^1.0.3: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043" - integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg== +"ccount@^1.0.0", "ccount@^1.0.3": + "integrity" "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==" + "resolved" "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz" + "version" "1.1.0" -chalk@^2.0.0, chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== +"chalk@^2.0.0": + "integrity" "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==" + "resolved" "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" + "version" "2.4.2" dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" + "ansi-styles" "^3.2.1" + "escape-string-regexp" "^1.0.5" + "supports-color" "^5.3.0" -chalk@^4.1.0, chalk@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== +"chalk@^2.4.2": + "integrity" "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==" + "resolved" "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" + "version" "2.4.2" dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" + "ansi-styles" "^3.2.1" + "escape-string-regexp" "^1.0.5" + "supports-color" "^5.3.0" -character-entities-legacy@^1.0.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" - integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA== - -character-entities@^1.0.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" - integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw== - -character-reference-invalid@^1.0.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" - integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg== - -cheerio-select@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.5.0.tgz#faf3daeb31b17c5e1a9dabcee288aaf8aafa5823" - integrity sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg== +"chalk@^4.1.0", "chalk@^4.1.2": + "integrity" "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==" + "resolved" "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" + "version" "4.1.2" dependencies: - css-select "^4.1.3" - css-what "^5.0.1" - domelementtype "^2.2.0" - domhandler "^4.2.0" - domutils "^2.7.0" + "ansi-styles" "^4.1.0" + "supports-color" "^7.1.0" -cheerio@^0.22.0: - version "0.22.0" - resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" - integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4= - dependencies: - css-select "~1.2.0" - dom-serializer "~0.1.0" - entities "~1.1.1" - htmlparser2 "^3.9.1" - lodash.assignin "^4.0.9" - lodash.bind "^4.1.4" - lodash.defaults "^4.0.1" - lodash.filter "^4.4.0" - lodash.flatten "^4.2.0" - lodash.foreach "^4.3.0" - lodash.map "^4.4.0" - lodash.merge "^4.4.0" - lodash.pick "^4.2.1" - lodash.reduce "^4.4.0" - lodash.reject "^4.4.0" - lodash.some "^4.4.0" +"character-entities-legacy@^1.0.0": + "integrity" "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==" + "resolved" "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz" + "version" "1.1.4" -cheerio@^1.0.0-rc.10: - version "1.0.0-rc.10" - resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.10.tgz#2ba3dcdfcc26e7956fc1f440e61d51c643379f3e" - integrity sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw== - dependencies: - cheerio-select "^1.5.0" - dom-serializer "^1.3.2" - domhandler "^4.2.0" - htmlparser2 "^6.1.0" - parse5 "^6.0.1" - parse5-htmlparser2-tree-adapter "^6.0.1" - tslib "^2.2.0" +"character-entities@^1.0.0": + "integrity" "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==" + "resolved" "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz" + "version" "1.2.4" -chokidar@^3.4.2, chokidar@^3.5.2, chokidar@^3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== +"character-reference-invalid@^1.0.0": + "integrity" "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==" + "resolved" "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz" + "version" "1.1.4" + +"cheerio-select@^1.5.0": + "integrity" "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==" + "resolved" "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz" + "version" "1.5.0" dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" + "css-select" "^4.1.3" + "css-what" "^5.0.1" + "domelementtype" "^2.2.0" + "domhandler" "^4.2.0" + "domutils" "^2.7.0" + +"cheerio@^0.22.0": + "integrity" "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=" + "resolved" "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz" + "version" "0.22.0" + dependencies: + "css-select" "~1.2.0" + "dom-serializer" "~0.1.0" + "entities" "~1.1.1" + "htmlparser2" "^3.9.1" + "lodash.assignin" "^4.0.9" + "lodash.bind" "^4.1.4" + "lodash.defaults" "^4.0.1" + "lodash.filter" "^4.4.0" + "lodash.flatten" "^4.2.0" + "lodash.foreach" "^4.3.0" + "lodash.map" "^4.4.0" + "lodash.merge" "^4.4.0" + "lodash.pick" "^4.2.1" + "lodash.reduce" "^4.4.0" + "lodash.reject" "^4.4.0" + "lodash.some" "^4.4.0" + +"cheerio@^1.0.0-rc.10": + "integrity" "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==" + "resolved" "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz" + "version" "1.0.0-rc.10" + dependencies: + "cheerio-select" "^1.5.0" + "dom-serializer" "^1.3.2" + "domhandler" "^4.2.0" + "htmlparser2" "^6.1.0" + "parse5" "^6.0.1" + "parse5-htmlparser2-tree-adapter" "^6.0.1" + "tslib" "^2.2.0" + +"chokidar@^3.4.2", "chokidar@^3.5.2", "chokidar@^3.5.3": + "integrity" "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==" + "resolved" "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" + "version" "3.5.3" + dependencies: + "anymatch" "~3.1.2" + "braces" "~3.0.2" + "glob-parent" "~5.1.2" + "is-binary-path" "~2.1.0" + "is-glob" "~4.0.1" + "normalize-path" "~3.0.0" + "readdirp" "~3.6.0" optionalDependencies: - fsevents "~2.3.2" + "fsevents" "~2.3.2" -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== +"chrome-trace-event@^1.0.2": + "integrity" "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==" + "resolved" "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz" + "version" "1.0.3" -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== +"ci-info@^2.0.0": + "integrity" "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" + "resolved" "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz" + "version" "2.0.0" -classnames@^2.2.6: - version "2.3.1" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" - integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== +"classnames@^2.2.6": + "integrity" "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==" + "resolved" "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz" + "version" "2.3.1" -clean-css@^5.1.5, clean-css@^5.2.2: - version "5.2.4" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.2.4.tgz#982b058f8581adb2ae062520808fb2429bd487a4" - integrity sha512-nKseG8wCzEuji/4yrgM/5cthL9oTDc5UOQyFMvW/Q53oP6gLH690o1NbuTh6Y18nujr7BxlsFuS7gXLnLzKJGg== +"clean-css@^5.1.5", "clean-css@^5.2.2": + "integrity" "sha512-nKseG8wCzEuji/4yrgM/5cthL9oTDc5UOQyFMvW/Q53oP6gLH690o1NbuTh6Y18nujr7BxlsFuS7gXLnLzKJGg==" + "resolved" "https://registry.npmjs.org/clean-css/-/clean-css-5.2.4.tgz" + "version" "5.2.4" dependencies: - source-map "~0.6.0" + "source-map" "~0.6.0" -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== +"clean-stack@^2.0.0": + "integrity" "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" + "resolved" "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz" + "version" "2.2.0" -cli-boxes@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" - integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== +"cli-boxes@^2.2.1": + "integrity" "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==" + "resolved" "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz" + "version" "2.2.1" -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== +"clone-deep@^4.0.1": + "integrity" "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==" + "resolved" "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz" + "version" "4.0.1" dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" + "is-plain-object" "^2.0.4" + "kind-of" "^6.0.2" + "shallow-clone" "^3.0.0" -clone-response@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" - integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= +"clone-response@^1.0.2": + "integrity" "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=" + "resolved" "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz" + "version" "1.0.2" dependencies: - mimic-response "^1.0.0" + "mimic-response" "^1.0.0" -clsx@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" - integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA== +"clsx@^1.1.1": + "integrity" "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==" + "resolved" "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz" + "version" "1.1.1" -collapse-white-space@^1.0.2: - version "1.0.6" - resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287" - integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ== +"collapse-white-space@^1.0.2": + "integrity" "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==" + "resolved" "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz" + "version" "1.0.6" -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== +"color-convert@^1.9.0": + "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==" + "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz" + "version" "1.9.3" dependencies: - color-name "1.1.3" + "color-name" "1.1.3" -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== +"color-convert@^2.0.1": + "integrity" "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==" + "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz" + "version" "2.0.1" dependencies: - color-name "~1.1.4" + "color-name" "~1.1.4" -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= +"color-name@~1.1.4": + "integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" + "version" "1.1.4" -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +"color-name@1.1.3": + "integrity" "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" + "version" "1.1.3" -colord@^2.9.1: - version "2.9.2" - resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1" - integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ== +"colord@^2.9.1": + "integrity" "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==" + "resolved" "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz" + "version" "2.9.2" -colorette@^2.0.10: - version "2.0.16" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" - integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== +"colorette@^2.0.10": + "integrity" "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==" + "resolved" "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz" + "version" "2.0.16" -combine-promises@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/combine-promises/-/combine-promises-1.1.0.tgz#72db90743c0ca7aab7d0d8d2052fd7b0f674de71" - integrity sha512-ZI9jvcLDxqwaXEixOhArm3r7ReIivsXkpbyEWyeOhzz1QS0iSgBPnWvEqvIQtYyamGCYA88gFhmUrs9hrrQ0pg== +"combine-promises@^1.1.0": + "integrity" "sha512-ZI9jvcLDxqwaXEixOhArm3r7ReIivsXkpbyEWyeOhzz1QS0iSgBPnWvEqvIQtYyamGCYA88gFhmUrs9hrrQ0pg==" + "resolved" "https://registry.npmjs.org/combine-promises/-/combine-promises-1.1.0.tgz" + "version" "1.1.0" -comma-separated-tokens@^1.0.0: - version "1.0.8" - resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" - integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw== +"comma-separated-tokens@^1.0.0": + "integrity" "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==" + "resolved" "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz" + "version" "1.0.8" -commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +"commander@^2.20.0": + "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + "resolved" "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" + "version" "2.20.3" -commander@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" - integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== +"commander@^5.1.0": + "integrity" "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==" + "resolved" "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz" + "version" "5.1.0" -commander@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== +"commander@^7.2.0": + "integrity" "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==" + "resolved" "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" + "version" "7.2.0" -commander@^8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" - integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== +"commander@^8.3.0": + "integrity" "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==" + "resolved" "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz" + "version" "8.3.0" -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= +"commondir@^1.0.1": + "integrity" "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" + "resolved" "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz" + "version" "1.0.1" -compressible@~2.0.16: - version "2.0.18" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" - integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== +"compressible@~2.0.16": + "integrity" "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==" + "resolved" "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz" + "version" "2.0.18" dependencies: - mime-db ">= 1.43.0 < 2" + "mime-db" ">= 1.43.0 < 2" -compression@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" - integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== +"compression@^1.7.4": + "integrity" "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==" + "resolved" "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz" + "version" "1.7.4" dependencies: - accepts "~1.3.5" - bytes "3.0.0" - compressible "~2.0.16" - debug "2.6.9" - on-headers "~1.0.2" - safe-buffer "5.1.2" - vary "~1.1.2" + "accepts" "~1.3.5" + "bytes" "3.0.0" + "compressible" "~2.0.16" + "debug" "2.6.9" + "on-headers" "~1.0.2" + "safe-buffer" "5.1.2" + "vary" "~1.1.2" -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= +"concat-map@0.0.1": + "integrity" "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "resolved" "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "version" "0.0.1" -configstore@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" - integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== +"configstore@^5.0.1": + "integrity" "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==" + "resolved" "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz" + "version" "5.0.1" dependencies: - dot-prop "^5.2.0" - graceful-fs "^4.1.2" - make-dir "^3.0.0" - unique-string "^2.0.0" - write-file-atomic "^3.0.0" - xdg-basedir "^4.0.0" + "dot-prop" "^5.2.0" + "graceful-fs" "^4.1.2" + "make-dir" "^3.0.0" + "unique-string" "^2.0.0" + "write-file-atomic" "^3.0.0" + "xdg-basedir" "^4.0.0" -connect-history-api-fallback@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" - integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== +"connect-history-api-fallback@^1.6.0": + "integrity" "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==" + "resolved" "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz" + "version" "1.6.0" -consola@^2.15.3: - version "2.15.3" - resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550" - integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw== +"consola@^2.15.3": + "integrity" "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==" + "resolved" "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz" + "version" "2.15.3" -content-disposition@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" - integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ= +"content-disposition@0.5.2": + "integrity" "sha1-DPaLud318r55YcOoUXjLhdunjLQ=" + "resolved" "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz" + "version" "0.5.2" -content-disposition@0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" - integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== +"content-disposition@0.5.4": + "integrity" "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==" + "resolved" "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz" + "version" "0.5.4" dependencies: - safe-buffer "5.2.1" + "safe-buffer" "5.2.1" -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== +"content-type@~1.0.4": + "integrity" "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + "resolved" "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz" + "version" "1.0.4" -convert-source-map@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" - integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== +"convert-source-map@^1.7.0": + "integrity" "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==" + "resolved" "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz" + "version" "1.8.0" dependencies: - safe-buffer "~5.1.1" + "safe-buffer" "~5.1.1" -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= +"cookie-signature@1.0.6": + "integrity" "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + "resolved" "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" + "version" "1.0.6" -cookie@0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" - integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== +"cookie@0.4.2": + "integrity" "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==" + "resolved" "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz" + "version" "0.4.2" -copy-text-to-clipboard@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" - integrity sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q== +"copy-text-to-clipboard@^3.0.1": + "integrity" "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q==" + "resolved" "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz" + "version" "3.0.1" -copy-webpack-plugin@^10.2.0: - version "10.2.4" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz#6c854be3fdaae22025da34b9112ccf81c63308fe" - integrity sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg== +"copy-webpack-plugin@^10.2.0": + "integrity" "sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg==" + "resolved" "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz" + "version" "10.2.4" dependencies: - fast-glob "^3.2.7" - glob-parent "^6.0.1" - globby "^12.0.2" - normalize-path "^3.0.0" - schema-utils "^4.0.0" - serialize-javascript "^6.0.0" + "fast-glob" "^3.2.7" + "glob-parent" "^6.0.1" + "globby" "^12.0.2" + "normalize-path" "^3.0.0" + "schema-utils" "^4.0.0" + "serialize-javascript" "^6.0.0" -core-js-compat@^3.20.2, core-js-compat@^3.21.0: - version "3.21.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82" - integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g== +"core-js-compat@^3.20.2", "core-js-compat@^3.21.0": + "integrity" "sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==" + "resolved" "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz" + "version" "3.21.1" dependencies: - browserslist "^4.19.1" - semver "7.0.0" + "browserslist" "^4.19.1" + "semver" "7.0.0" -core-js-pure@^3.20.2: - version "3.21.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.21.1.tgz#8c4d1e78839f5f46208de7230cebfb72bc3bdb51" - integrity sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ== +"core-js-pure@^3.20.2": + "integrity" "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==" + "resolved" "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz" + "version" "3.21.1" -core-js@^3.18.0: - version "3.21.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.1.tgz#f2e0ddc1fc43da6f904706e8e955bc19d06a0d94" - integrity sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig== +"core-js@^3.18.0": + "integrity" "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==" + "resolved" "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz" + "version" "3.21.1" -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== +"core-util-is@~1.0.0": + "integrity" "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" + "resolved" "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz" + "version" "1.0.3" -cosmiconfig@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" - integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== +"cosmiconfig@^6.0.0": + "integrity" "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==" + "resolved" "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz" + "version" "6.0.0" dependencies: "@types/parse-json" "^4.0.0" - import-fresh "^3.1.0" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.7.2" + "import-fresh" "^3.1.0" + "parse-json" "^5.0.0" + "path-type" "^4.0.0" + "yaml" "^1.7.2" -cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" - integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== +"cosmiconfig@^7.0.0", "cosmiconfig@^7.0.1": + "integrity" "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==" + "resolved" "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz" + "version" "7.0.1" dependencies: "@types/parse-json" "^4.0.0" - import-fresh "^3.2.1" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.10.0" + "import-fresh" "^3.2.1" + "parse-json" "^5.0.0" + "path-type" "^4.0.0" + "yaml" "^1.10.0" -cross-fetch@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" - integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== +"cross-fetch@^3.1.5": + "integrity" "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==" + "resolved" "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz" + "version" "3.1.5" dependencies: - node-fetch "2.6.7" + "node-fetch" "2.6.7" -cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== +"cross-spawn@^7.0.3": + "integrity" "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==" + "resolved" "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" + "version" "7.0.3" dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" + "path-key" "^3.1.0" + "shebang-command" "^2.0.0" + "which" "^2.0.1" -crypto-random-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" - integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== +"crypto-random-string@^2.0.0": + "integrity" "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==" + "resolved" "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz" + "version" "2.0.0" -css-declaration-sorter@^6.0.3: - version "6.1.4" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz#b9bfb4ed9a41f8dcca9bf7184d849ea94a8294b4" - integrity sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw== +"css-declaration-sorter@^6.0.3": + "integrity" "sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw==" + "resolved" "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz" + "version" "6.1.4" dependencies: - timsort "^0.3.0" + "timsort" "^0.3.0" -css-loader@^6.5.1: - version "6.6.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.6.0.tgz#c792ad5510bd1712618b49381bd0310574fafbd3" - integrity sha512-FK7H2lisOixPT406s5gZM1S3l8GrfhEBT3ZiL2UX1Ng1XWs0y2GPllz/OTyvbaHe12VgQrIXIzuEGVlbUhodqg== +"css-loader@^6.5.1": + "integrity" "sha512-FK7H2lisOixPT406s5gZM1S3l8GrfhEBT3ZiL2UX1Ng1XWs0y2GPllz/OTyvbaHe12VgQrIXIzuEGVlbUhodqg==" + "resolved" "https://registry.npmjs.org/css-loader/-/css-loader-6.6.0.tgz" + "version" "6.6.0" dependencies: - icss-utils "^5.1.0" - postcss "^8.4.5" - postcss-modules-extract-imports "^3.0.0" - postcss-modules-local-by-default "^4.0.0" - postcss-modules-scope "^3.0.0" - postcss-modules-values "^4.0.0" - postcss-value-parser "^4.2.0" - semver "^7.3.5" + "icss-utils" "^5.1.0" + "postcss" "^8.4.5" + "postcss-modules-extract-imports" "^3.0.0" + "postcss-modules-local-by-default" "^4.0.0" + "postcss-modules-scope" "^3.0.0" + "postcss-modules-values" "^4.0.0" + "postcss-value-parser" "^4.2.0" + "semver" "^7.3.5" -css-minimizer-webpack-plugin@^3.3.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz#ab78f781ced9181992fe7b6e4f3422e76429878f" - integrity sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q== +"css-minimizer-webpack-plugin@^3.3.1": + "integrity" "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==" + "resolved" "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz" + "version" "3.4.1" dependencies: - cssnano "^5.0.6" - jest-worker "^27.0.2" - postcss "^8.3.5" - schema-utils "^4.0.0" - serialize-javascript "^6.0.0" - source-map "^0.6.1" + "cssnano" "^5.0.6" + "jest-worker" "^27.0.2" + "postcss" "^8.3.5" + "schema-utils" "^4.0.0" + "serialize-javascript" "^6.0.0" + "source-map" "^0.6.1" -css-select@^4.1.3: - version "4.2.1" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd" - integrity sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ== +"css-select@^4.1.3": + "integrity" "sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==" + "resolved" "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz" + "version" "4.2.1" dependencies: - boolbase "^1.0.0" - css-what "^5.1.0" - domhandler "^4.3.0" - domutils "^2.8.0" - nth-check "^2.0.1" + "boolbase" "^1.0.0" + "css-what" "^5.1.0" + "domhandler" "^4.3.0" + "domutils" "^2.8.0" + "nth-check" "^2.0.1" -css-select@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" - integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= +"css-select@~1.2.0": + "integrity" "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=" + "resolved" "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz" + "version" "1.2.0" dependencies: - boolbase "~1.0.0" - css-what "2.1" - domutils "1.5.1" - nth-check "~1.0.1" + "boolbase" "~1.0.0" + "css-what" "2.1" + "domutils" "1.5.1" + "nth-check" "~1.0.1" -css-tree@^1.1.2, css-tree@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" - integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== +"css-tree@^1.1.2", "css-tree@^1.1.3": + "integrity" "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==" + "resolved" "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz" + "version" "1.1.3" dependencies: - mdn-data "2.0.14" - source-map "^0.6.1" + "mdn-data" "2.0.14" + "source-map" "^0.6.1" -css-what@2.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" - integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== +"css-what@^5.0.1", "css-what@^5.1.0": + "integrity" "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==" + "resolved" "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz" + "version" "5.1.0" -css-what@^5.0.1, css-what@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" - integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== +"css-what@2.1": + "integrity" "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==" + "resolved" "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz" + "version" "2.1.3" -cssesc@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" - integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== +"cssesc@^3.0.0": + "integrity" "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" + "resolved" "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz" + "version" "3.0.0" -cssnano-preset-advanced@^5.1.4: - version "5.1.12" - resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-5.1.12.tgz#11f5b0c4e3c32bcfd475465a283fa14dec8df972" - integrity sha512-5WWV9mbqVNwH4nRjs5UbhNl7eKo+16eYNzGogmz0Sa6iqWUeLdN8oo83WuTTqz5vjEKhTbRM5oX6WV1i6ees6g== +"cssnano-preset-advanced@^5.1.4": + "integrity" "sha512-5WWV9mbqVNwH4nRjs5UbhNl7eKo+16eYNzGogmz0Sa6iqWUeLdN8oo83WuTTqz5vjEKhTbRM5oX6WV1i6ees6g==" + "resolved" "https://registry.npmjs.org/cssnano-preset-advanced/-/cssnano-preset-advanced-5.1.12.tgz" + "version" "5.1.12" dependencies: - autoprefixer "^10.3.7" - cssnano-preset-default "^5.1.12" - postcss-discard-unused "^5.0.3" - postcss-merge-idents "^5.0.3" - postcss-reduce-idents "^5.0.3" - postcss-zindex "^5.0.2" + "autoprefixer" "^10.3.7" + "cssnano-preset-default" "^5.1.12" + "postcss-discard-unused" "^5.0.3" + "postcss-merge-idents" "^5.0.3" + "postcss-reduce-idents" "^5.0.3" + "postcss-zindex" "^5.0.2" -cssnano-preset-default@^5.1.12: - version "5.1.12" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.12.tgz#64e2ad8e27a279e1413d2d2383ef89a41c909be9" - integrity sha512-rO/JZYyjW1QNkWBxMGV28DW7d98UDLaF759frhli58QFehZ+D/LSmwQ2z/ylBAe2hUlsIWTq6NYGfQPq65EF9w== +"cssnano-preset-default@^5.1.12": + "integrity" "sha512-rO/JZYyjW1QNkWBxMGV28DW7d98UDLaF759frhli58QFehZ+D/LSmwQ2z/ylBAe2hUlsIWTq6NYGfQPq65EF9w==" + "resolved" "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.12.tgz" + "version" "5.1.12" dependencies: - css-declaration-sorter "^6.0.3" - cssnano-utils "^3.0.2" - postcss-calc "^8.2.0" - postcss-colormin "^5.2.5" - postcss-convert-values "^5.0.4" - postcss-discard-comments "^5.0.3" - postcss-discard-duplicates "^5.0.3" - postcss-discard-empty "^5.0.3" - postcss-discard-overridden "^5.0.4" - postcss-merge-longhand "^5.0.6" - postcss-merge-rules "^5.0.6" - postcss-minify-font-values "^5.0.4" - postcss-minify-gradients "^5.0.6" - postcss-minify-params "^5.0.5" - postcss-minify-selectors "^5.1.3" - postcss-normalize-charset "^5.0.3" - postcss-normalize-display-values "^5.0.3" - postcss-normalize-positions "^5.0.4" - postcss-normalize-repeat-style "^5.0.4" - postcss-normalize-string "^5.0.4" - postcss-normalize-timing-functions "^5.0.3" - postcss-normalize-unicode "^5.0.4" - postcss-normalize-url "^5.0.5" - postcss-normalize-whitespace "^5.0.4" - postcss-ordered-values "^5.0.5" - postcss-reduce-initial "^5.0.3" - postcss-reduce-transforms "^5.0.4" - postcss-svgo "^5.0.4" - postcss-unique-selectors "^5.0.4" + "css-declaration-sorter" "^6.0.3" + "cssnano-utils" "^3.0.2" + "postcss-calc" "^8.2.0" + "postcss-colormin" "^5.2.5" + "postcss-convert-values" "^5.0.4" + "postcss-discard-comments" "^5.0.3" + "postcss-discard-duplicates" "^5.0.3" + "postcss-discard-empty" "^5.0.3" + "postcss-discard-overridden" "^5.0.4" + "postcss-merge-longhand" "^5.0.6" + "postcss-merge-rules" "^5.0.6" + "postcss-minify-font-values" "^5.0.4" + "postcss-minify-gradients" "^5.0.6" + "postcss-minify-params" "^5.0.5" + "postcss-minify-selectors" "^5.1.3" + "postcss-normalize-charset" "^5.0.3" + "postcss-normalize-display-values" "^5.0.3" + "postcss-normalize-positions" "^5.0.4" + "postcss-normalize-repeat-style" "^5.0.4" + "postcss-normalize-string" "^5.0.4" + "postcss-normalize-timing-functions" "^5.0.3" + "postcss-normalize-unicode" "^5.0.4" + "postcss-normalize-url" "^5.0.5" + "postcss-normalize-whitespace" "^5.0.4" + "postcss-ordered-values" "^5.0.5" + "postcss-reduce-initial" "^5.0.3" + "postcss-reduce-transforms" "^5.0.4" + "postcss-svgo" "^5.0.4" + "postcss-unique-selectors" "^5.0.4" -cssnano-utils@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.0.2.tgz#d82b4991a27ba6fec644b39bab35fe027137f516" - integrity sha512-KhprijuQv2sP4kT92sSQwhlK3SJTbDIsxcfIEySB0O+3m9esFOai7dP9bMx5enHAh2MwarVIcnwiWoOm01RIbQ== +"cssnano-utils@^3.0.2": + "integrity" "sha512-KhprijuQv2sP4kT92sSQwhlK3SJTbDIsxcfIEySB0O+3m9esFOai7dP9bMx5enHAh2MwarVIcnwiWoOm01RIbQ==" + "resolved" "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.0.2.tgz" + "version" "3.0.2" -cssnano@^5.0.6, cssnano@^5.0.8: - version "5.0.17" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.17.tgz#ff45713c05cfc780a1aeb3e663b6f224d091cabf" - integrity sha512-fmjLP7k8kL18xSspeXTzRhaFtRI7DL9b8IcXR80JgtnWBpvAzHT7sCR/6qdn0tnxIaINUN6OEQu83wF57Gs3Xw== +"cssnano@^5.0.6", "cssnano@^5.0.8": + "integrity" "sha512-fmjLP7k8kL18xSspeXTzRhaFtRI7DL9b8IcXR80JgtnWBpvAzHT7sCR/6qdn0tnxIaINUN6OEQu83wF57Gs3Xw==" + "resolved" "https://registry.npmjs.org/cssnano/-/cssnano-5.0.17.tgz" + "version" "5.0.17" dependencies: - cssnano-preset-default "^5.1.12" - lilconfig "^2.0.3" - yaml "^1.10.2" + "cssnano-preset-default" "^5.1.12" + "lilconfig" "^2.0.3" + "yaml" "^1.10.2" -csso@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" - integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== +"csso@^4.2.0": + "integrity" "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==" + "resolved" "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz" + "version" "4.2.0" dependencies: - css-tree "^1.1.2" + "css-tree" "^1.1.2" -csstype@^3.0.2: - version "3.0.10" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" - integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA== +"csstype@^3.0.2": + "integrity" "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==" + "resolved" "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz" + "version" "3.0.10" -debug@2.6.9, debug@^2.6.0: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== +"debug@^2.6.0", "debug@2.6.9": + "integrity" "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==" + "resolved" "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" + "version" "2.6.9" dependencies: - ms "2.0.0" + "ms" "2.0.0" -debug@^3.1.1: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== +"debug@^3.1.1": + "integrity" "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==" + "resolved" "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" + "version" "3.2.7" dependencies: - ms "^2.1.1" + "ms" "^2.1.1" -debug@^4.1.0, debug@^4.1.1: - version "4.3.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== +"debug@^4.1.0": + "integrity" "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==" + "resolved" "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz" + "version" "4.3.3" dependencies: - ms "2.1.2" + "ms" "2.1.2" -decompress-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= +"debug@^4.1.1": + "integrity" "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==" + "resolved" "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz" + "version" "4.3.3" dependencies: - mimic-response "^1.0.0" + "ms" "2.1.2" -deep-equal@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" - integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== +"decompress-response@^3.3.0": + "integrity" "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=" + "resolved" "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz" + "version" "3.3.0" dependencies: - is-arguments "^1.0.4" - is-date-object "^1.0.1" - is-regex "^1.0.4" - object-is "^1.0.1" - object-keys "^1.1.1" - regexp.prototype.flags "^1.2.0" + "mimic-response" "^1.0.0" -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - -deepmerge@^1.3.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753" - integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ== - -deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== - -default-gateway@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" - integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg== +"deep-equal@^1.0.1": + "integrity" "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==" + "resolved" "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz" + "version" "1.1.1" dependencies: - execa "^5.0.0" + "is-arguments" "^1.0.4" + "is-date-object" "^1.0.1" + "is-regex" "^1.0.4" + "object-is" "^1.0.1" + "object-keys" "^1.1.1" + "regexp.prototype.flags" "^1.2.0" -defer-to-connect@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" - integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== +"deep-extend@^0.6.0": + "integrity" "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" + "resolved" "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz" + "version" "0.6.0" -define-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== +"deepmerge@^1.3.2": + "integrity" "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==" + "resolved" "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz" + "version" "1.5.2" -define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== +"deepmerge@^4.2.2": + "integrity" "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" + "resolved" "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz" + "version" "4.2.2" + +"default-gateway@^6.0.3": + "integrity" "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==" + "resolved" "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz" + "version" "6.0.3" dependencies: - object-keys "^1.0.12" + "execa" "^5.0.0" -del@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" - integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ== +"defer-to-connect@^1.0.1": + "integrity" "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" + "resolved" "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz" + "version" "1.1.3" + +"define-lazy-prop@^2.0.0": + "integrity" "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==" + "resolved" "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz" + "version" "2.0.0" + +"define-properties@^1.1.3": + "integrity" "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==" + "resolved" "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz" + "version" "1.1.3" dependencies: - globby "^11.0.1" - graceful-fs "^4.2.4" - is-glob "^4.0.1" - is-path-cwd "^2.2.0" - is-path-inside "^3.0.2" - p-map "^4.0.0" - rimraf "^3.0.2" - slash "^3.0.0" + "object-keys" "^1.0.12" -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= - -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= - -detab@2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/detab/-/detab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" - integrity sha512-8zdsQA5bIkoRECvCrNKPla84lyoR7DSAyf7p0YgXzBO9PDJx8KntPUay7NS6yp+KdxdVtiE5SpHKtbp2ZQyA9g== +"del@^6.0.0": + "integrity" "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==" + "resolved" "https://registry.npmjs.org/del/-/del-6.0.0.tgz" + "version" "6.0.0" dependencies: - repeat-string "^1.5.4" + "globby" "^11.0.1" + "graceful-fs" "^4.2.4" + "is-glob" "^4.0.1" + "is-path-cwd" "^2.2.0" + "is-path-inside" "^3.0.2" + "p-map" "^4.0.0" + "rimraf" "^3.0.2" + "slash" "^3.0.0" -detect-node@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" - integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== +"depd@~1.1.2": + "integrity" "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + "resolved" "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" + "version" "1.1.2" -detect-port-alt@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275" - integrity sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q== +"destroy@~1.0.4": + "integrity" "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + "resolved" "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz" + "version" "1.0.4" + +"detab@2.0.4": + "integrity" "sha512-8zdsQA5bIkoRECvCrNKPla84lyoR7DSAyf7p0YgXzBO9PDJx8KntPUay7NS6yp+KdxdVtiE5SpHKtbp2ZQyA9g==" + "resolved" "https://registry.npmjs.org/detab/-/detab-2.0.4.tgz" + "version" "2.0.4" dependencies: - address "^1.0.1" - debug "^2.6.0" + "repeat-string" "^1.5.4" -detect-port@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.3.0.tgz#d9c40e9accadd4df5cac6a782aefd014d573d1f1" - integrity sha512-E+B1gzkl2gqxt1IhUzwjrxBKRqx1UzC3WLONHinn8S3T6lwV/agVCyitiFOsGJ/eYuEUBvD71MZHy3Pv1G9doQ== +"detect-node@^2.0.4": + "integrity" "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==" + "resolved" "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz" + "version" "2.1.0" + +"detect-port-alt@^1.1.6": + "integrity" "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==" + "resolved" "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz" + "version" "1.1.6" dependencies: - address "^1.0.1" - debug "^2.6.0" + "address" "^1.0.1" + "debug" "^2.6.0" -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== +"detect-port@^1.3.0": + "integrity" "sha512-E+B1gzkl2gqxt1IhUzwjrxBKRqx1UzC3WLONHinn8S3T6lwV/agVCyitiFOsGJ/eYuEUBvD71MZHy3Pv1G9doQ==" + "resolved" "https://registry.npmjs.org/detect-port/-/detect-port-1.3.0.tgz" + "version" "1.3.0" dependencies: - path-type "^4.0.0" + "address" "^1.0.1" + "debug" "^2.6.0" -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= - -dns-packet@^1.3.1: - version "1.3.4" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" - integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA== +"dir-glob@^3.0.1": + "integrity" "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==" + "resolved" "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz" + "version" "3.0.1" dependencies: - ip "^1.1.0" - safe-buffer "^5.0.1" + "path-type" "^4.0.0" -dns-txt@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" - integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= +"dns-equal@^1.0.0": + "integrity" "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=" + "resolved" "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz" + "version" "1.0.0" + +"dns-packet@^1.3.1": + "integrity" "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==" + "resolved" "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz" + "version" "1.3.4" dependencies: - buffer-indexof "^1.0.0" + "ip" "^1.1.0" + "safe-buffer" "^5.0.1" -dom-converter@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" - integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA== +"dns-txt@^2.0.2": + "integrity" "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=" + "resolved" "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz" + "version" "2.0.2" dependencies: - utila "~0.4" + "buffer-indexof" "^1.0.0" -dom-serializer@0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" - integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== +"dom-converter@^0.2.0": + "integrity" "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==" + "resolved" "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz" + "version" "0.2.0" dependencies: - domelementtype "^2.0.1" - entities "^2.0.0" + "utila" "~0.4" -dom-serializer@^1.0.1, dom-serializer@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" - integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== +"dom-serializer@^1.0.1": + "integrity" "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==" + "resolved" "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz" + "version" "1.3.2" dependencies: - domelementtype "^2.0.1" - domhandler "^4.2.0" - entities "^2.0.0" + "domelementtype" "^2.0.1" + "domhandler" "^4.2.0" + "entities" "^2.0.0" -dom-serializer@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" - integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA== +"dom-serializer@^1.3.2": + "integrity" "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==" + "resolved" "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz" + "version" "1.3.2" dependencies: - domelementtype "^1.3.0" - entities "^1.1.1" + "domelementtype" "^2.0.1" + "domhandler" "^4.2.0" + "entities" "^2.0.0" -domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" - integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== - -domelementtype@^2.0.1, domelementtype@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" - integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== - -domhandler@^2.3.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" - integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA== +"dom-serializer@~0.1.0": + "integrity" "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==" + "resolved" "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz" + "version" "0.1.1" dependencies: - domelementtype "1" + "domelementtype" "^1.3.0" + "entities" "^1.1.1" -domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626" - integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g== +"dom-serializer@0": + "integrity" "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==" + "resolved" "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz" + "version" "0.2.2" dependencies: - domelementtype "^2.2.0" + "domelementtype" "^2.0.1" + "entities" "^2.0.0" -domutils@1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" - integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8= +"domelementtype@^1.3.0", "domelementtype@^1.3.1", "domelementtype@1": + "integrity" "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" + "resolved" "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz" + "version" "1.3.1" + +"domelementtype@^2.0.1", "domelementtype@^2.2.0": + "integrity" "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==" + "resolved" "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz" + "version" "2.2.0" + +"domhandler@^2.3.0": + "integrity" "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==" + "resolved" "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz" + "version" "2.4.2" dependencies: - dom-serializer "0" - domelementtype "1" + "domelementtype" "1" -domutils@^1.5.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" - integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== +"domhandler@^4.0.0", "domhandler@^4.2.0", "domhandler@^4.3.0": + "integrity" "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==" + "resolved" "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz" + "version" "4.3.0" dependencies: - dom-serializer "0" - domelementtype "1" + "domelementtype" "^2.2.0" -domutils@^2.5.2, domutils@^2.7.0, domutils@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" - integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== +"domutils@^1.5.1": + "integrity" "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==" + "resolved" "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz" + "version" "1.7.0" dependencies: - dom-serializer "^1.0.1" - domelementtype "^2.2.0" - domhandler "^4.2.0" + "dom-serializer" "0" + "domelementtype" "1" -dot-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" - integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== +"domutils@^2.5.2", "domutils@^2.7.0", "domutils@^2.8.0": + "integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==" + "resolved" "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz" + "version" "2.8.0" dependencies: - no-case "^3.0.4" - tslib "^2.0.3" + "dom-serializer" "^1.0.1" + "domelementtype" "^2.2.0" + "domhandler" "^4.2.0" -dot-prop@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" - integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== +"domutils@1.5.1": + "integrity" "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=" + "resolved" "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz" + "version" "1.5.1" dependencies: - is-obj "^2.0.0" + "dom-serializer" "0" + "domelementtype" "1" -duplexer3@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" - integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= - -duplexer@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" - integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= - -electron-to-chromium@^1.4.17: - version "1.4.71" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz#17056914465da0890ce00351a3b946fd4cd51ff6" - integrity sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw== - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -emojis-list@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" - integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== - -emoticon@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/emoticon/-/emoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" - integrity sha512-SNujglcLTTg+lDAcApPNgEdudaqQFiAbJCqzjNxJkvN9vAwCGi0uu8IUVvx+f16h+V44KCY6Y2yboroc9pilHg== - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= - -end-of-stream@^1.1.0: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== +"dot-case@^3.0.4": + "integrity" "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==" + "resolved" "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz" + "version" "3.0.4" dependencies: - once "^1.4.0" + "no-case" "^3.0.4" + "tslib" "^2.0.3" -enhanced-resolve@^5.8.3: - version "5.9.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.0.tgz#49ac24953ac8452ed8fed2ef1340fc8e043667ee" - integrity sha512-weDYmzbBygL7HzGGS26M3hGQx68vehdEg6VUmqSOaFzXExFqlnKuSvsEJCVGQHScS8CQMbrAqftT+AzzHNt/YA== +"dot-prop@^5.2.0": + "integrity" "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==" + "resolved" "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz" + "version" "5.3.0" dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" + "is-obj" "^2.0.0" -entities@^1.1.1, entities@~1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" - integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== +"duplexer@^0.1.2": + "integrity" "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==" + "resolved" "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz" + "version" "0.1.2" -entities@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" - integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== +"duplexer3@^0.1.4": + "integrity" "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" + "resolved" "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz" + "version" "0.1.4" -entities@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4" - integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== +"ee-first@1.1.1": + "integrity" "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + "resolved" "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" + "version" "1.1.1" -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== +"electron-to-chromium@^1.4.284": + "integrity" "sha512-DE9tTy2PNmy1v55AZAO542ui+MLC2cvINMK4P2LXGsJdput/ThVG9t+QGecPuAZZSgC8XoI+Jh9M1OG9IoNSCw==" + "resolved" "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.328.tgz" + "version" "1.4.328" + +"emoji-regex@^8.0.0": + "integrity" "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "resolved" "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz" + "version" "8.0.0" + +"emojis-list@^3.0.0": + "integrity" "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" + "resolved" "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz" + "version" "3.0.0" + +"emoticon@^3.2.0": + "integrity" "sha512-SNujglcLTTg+lDAcApPNgEdudaqQFiAbJCqzjNxJkvN9vAwCGi0uu8IUVvx+f16h+V44KCY6Y2yboroc9pilHg==" + "resolved" "https://registry.npmjs.org/emoticon/-/emoticon-3.2.0.tgz" + "version" "3.2.0" + +"encodeurl@~1.0.2": + "integrity" "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + "resolved" "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz" + "version" "1.0.2" + +"end-of-stream@^1.1.0": + "integrity" "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==" + "resolved" "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz" + "version" "1.4.4" dependencies: - is-arrayish "^0.2.1" + "once" "^1.4.0" -es-module-lexer@^0.9.0: - version "0.9.3" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" - integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-goat@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" - integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== - -escape-html@^1.0.3, escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -eslint-scope@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== +"enhanced-resolve@^5.8.3": + "integrity" "sha512-weDYmzbBygL7HzGGS26M3hGQx68vehdEg6VUmqSOaFzXExFqlnKuSvsEJCVGQHScS8CQMbrAqftT+AzzHNt/YA==" + "resolved" "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.0.tgz" + "version" "5.9.0" dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" + "graceful-fs" "^4.2.4" + "tapable" "^2.2.0" -esprima@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== +"entities@^1.1.1", "entities@~1.1.1": + "integrity" "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" + "resolved" "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz" + "version" "1.1.2" -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== +"entities@^2.0.0": + "integrity" "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" + "resolved" "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz" + "version" "2.2.0" + +"entities@^3.0.1": + "integrity" "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==" + "resolved" "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz" + "version" "3.0.1" + +"error-ex@^1.3.1": + "integrity" "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==" + "resolved" "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz" + "version" "1.3.2" dependencies: - estraverse "^5.2.0" + "is-arrayish" "^0.2.1" -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== +"es-module-lexer@^0.9.0": + "integrity" "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==" + "resolved" "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz" + "version" "0.9.3" -estraverse@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== +"escalade@^3.1.1": + "integrity" "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + "resolved" "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz" + "version" "3.1.1" -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== +"escape-goat@^2.0.0": + "integrity" "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==" + "resolved" "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz" + "version" "2.1.1" -eta@^1.12.3: - version "1.12.3" - resolved "https://registry.yarnpkg.com/eta/-/eta-1.12.3.tgz#2982d08adfbef39f9fa50e2fbd42d7337e7338b1" - integrity sha512-qHixwbDLtekO/d51Yr4glcaUJCIjGVJyTzuqV4GPlgZo1YpgOKG+avQynErZIYrfM6JIJdtiG2Kox8tbb+DoGg== +"escape-html@^1.0.3", "escape-html@~1.0.3": + "integrity" "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + "resolved" "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" + "version" "1.0.3" -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= +"escape-string-regexp@^1.0.5": + "integrity" "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==" + "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + "version" "1.0.5" -eval@^0.1.4: - version "0.1.6" - resolved "https://registry.yarnpkg.com/eval/-/eval-0.1.6.tgz#9620d7d8c85515e97e6b47c5814f46ae381cb3cc" - integrity sha512-o0XUw+5OGkXw4pJZzQoXUk+H87DHuC+7ZE//oSrRGtatTmr12oTnLfg6QOq9DyTt0c/p4TwzgmkKrBzWTSizyQ== +"escape-string-regexp@^4.0.0": + "integrity" "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" + "version" "4.0.0" + +"eslint-scope@5.1.1": + "integrity" "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==" + "resolved" "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz" + "version" "5.1.1" dependencies: - require-like ">= 0.1.1" + "esrecurse" "^4.3.0" + "estraverse" "^4.1.1" -eventemitter3@^4.0.0: - version "4.0.7" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" - integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== +"esprima@^4.0.0": + "integrity" "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + "resolved" "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz" + "version" "4.0.1" -events@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== +"esrecurse@^4.3.0": + "integrity" "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==" + "resolved" "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz" + "version" "4.3.0" dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" + "estraverse" "^5.2.0" -express@^4.17.1: - version "4.17.3" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1" - integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg== +"estraverse@^4.1.1": + "integrity" "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" + "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz" + "version" "4.3.0" + +"estraverse@^5.2.0": + "integrity" "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" + "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz" + "version" "5.3.0" + +"esutils@^2.0.2": + "integrity" "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" + "resolved" "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz" + "version" "2.0.3" + +"eta@^1.12.3": + "integrity" "sha512-qHixwbDLtekO/d51Yr4glcaUJCIjGVJyTzuqV4GPlgZo1YpgOKG+avQynErZIYrfM6JIJdtiG2Kox8tbb+DoGg==" + "resolved" "https://registry.npmjs.org/eta/-/eta-1.12.3.tgz" + "version" "1.12.3" + +"etag@~1.8.1": + "integrity" "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + "resolved" "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz" + "version" "1.8.1" + +"eval@^0.1.4": + "integrity" "sha512-o0XUw+5OGkXw4pJZzQoXUk+H87DHuC+7ZE//oSrRGtatTmr12oTnLfg6QOq9DyTt0c/p4TwzgmkKrBzWTSizyQ==" + "resolved" "https://registry.npmjs.org/eval/-/eval-0.1.6.tgz" + "version" "0.1.6" dependencies: - accepts "~1.3.8" - array-flatten "1.1.1" - body-parser "1.19.2" - content-disposition "0.5.4" - content-type "~1.0.4" - cookie "0.4.2" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "~1.1.2" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.7" - qs "6.9.7" - range-parser "~1.2.1" - safe-buffer "5.2.1" - send "0.17.2" - serve-static "1.14.2" - setprototypeof "1.2.0" - statuses "~1.5.0" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" + "require-like" ">= 0.1.1" -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= +"eventemitter3@^4.0.0": + "integrity" "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" + "resolved" "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz" + "version" "4.0.7" + +"events@^3.2.0": + "integrity" "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" + "resolved" "https://registry.npmjs.org/events/-/events-3.3.0.tgz" + "version" "3.3.0" + +"execa@^5.0.0": + "integrity" "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==" + "resolved" "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz" + "version" "5.1.1" dependencies: - is-extendable "^0.1.0" + "cross-spawn" "^7.0.3" + "get-stream" "^6.0.0" + "human-signals" "^2.1.0" + "is-stream" "^2.0.0" + "merge-stream" "^2.0.0" + "npm-run-path" "^4.0.1" + "onetime" "^5.1.2" + "signal-exit" "^3.0.3" + "strip-final-newline" "^2.0.0" -extend@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== +"express@^4.17.1": + "integrity" "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==" + "resolved" "https://registry.npmjs.org/express/-/express-4.17.3.tgz" + "version" "4.17.3" + dependencies: + "accepts" "~1.3.8" + "array-flatten" "1.1.1" + "body-parser" "1.19.2" + "content-disposition" "0.5.4" + "content-type" "~1.0.4" + "cookie" "0.4.2" + "cookie-signature" "1.0.6" + "debug" "2.6.9" + "depd" "~1.1.2" + "encodeurl" "~1.0.2" + "escape-html" "~1.0.3" + "etag" "~1.8.1" + "finalhandler" "~1.1.2" + "fresh" "0.5.2" + "merge-descriptors" "1.0.1" + "methods" "~1.1.2" + "on-finished" "~2.3.0" + "parseurl" "~1.3.3" + "path-to-regexp" "0.1.7" + "proxy-addr" "~2.0.7" + "qs" "6.9.7" + "range-parser" "~1.2.1" + "safe-buffer" "5.2.1" + "send" "0.17.2" + "serve-static" "1.14.2" + "setprototypeof" "1.2.0" + "statuses" "~1.5.0" + "type-is" "~1.6.18" + "utils-merge" "1.0.1" + "vary" "~1.1.2" -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== +"extend-shallow@^2.0.1": + "integrity" "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=" + "resolved" "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz" + "version" "2.0.1" + dependencies: + "is-extendable" "^0.1.0" -fast-glob@^3.2.7, fast-glob@^3.2.9: - version "3.2.11" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" - integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== +"extend@^3.0.0": + "integrity" "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + "resolved" "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz" + "version" "3.0.2" + +"fast-deep-equal@^3.1.1", "fast-deep-equal@^3.1.3": + "integrity" "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "resolved" "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz" + "version" "3.1.3" + +"fast-glob@^3.2.7", "fast-glob@^3.2.9": + "integrity" "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==" + "resolved" "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz" + "version" "3.2.11" dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" + "glob-parent" "^5.1.2" + "merge2" "^1.3.0" + "micromatch" "^4.0.4" -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== +"fast-json-stable-stringify@^2.0.0": + "integrity" "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "resolved" "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz" + "version" "2.1.0" -fast-url-parser@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" - integrity sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0= +"fast-url-parser@1.1.3": + "integrity" "sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0=" + "resolved" "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz" + "version" "1.1.3" dependencies: - punycode "^1.3.2" + "punycode" "^1.3.2" -fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== +"fastq@^1.6.0": + "integrity" "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==" + "resolved" "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz" + "version" "1.13.0" dependencies: - reusify "^1.0.4" + "reusify" "^1.0.4" -faye-websocket@^0.11.3: - version "0.11.4" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" - integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== +"faye-websocket@^0.11.3": + "integrity" "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==" + "resolved" "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz" + "version" "0.11.4" dependencies: - websocket-driver ">=0.5.1" + "websocket-driver" ">=0.5.1" -fbemitter@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/fbemitter/-/fbemitter-3.0.0.tgz#00b2a1af5411254aab416cd75f9e6289bee4bff3" - integrity sha512-KWKaceCwKQU0+HPoop6gn4eOHk50bBv/VxjJtGMfwmJt3D29JpN4H4eisCtIPA+a8GVBam+ldMMpMjJUvpDyHw== +"fbemitter@^3.0.0": + "integrity" "sha512-KWKaceCwKQU0+HPoop6gn4eOHk50bBv/VxjJtGMfwmJt3D29JpN4H4eisCtIPA+a8GVBam+ldMMpMjJUvpDyHw==" + "resolved" "https://registry.npmjs.org/fbemitter/-/fbemitter-3.0.0.tgz" + "version" "3.0.0" dependencies: - fbjs "^3.0.0" + "fbjs" "^3.0.0" -fbjs-css-vars@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8" - integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ== +"fbjs-css-vars@^1.0.0": + "integrity" "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==" + "resolved" "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz" + "version" "1.0.2" -fbjs@^3.0.0, fbjs@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.4.tgz#e1871c6bd3083bac71ff2da868ad5067d37716c6" - integrity sha512-ucV0tDODnGV3JCnnkmoszb5lf4bNpzjv80K41wd4k798Etq+UYD0y0TIfalLjZoKgjive6/adkRnszwapiDgBQ== +"fbjs@^3.0.0", "fbjs@^3.0.1": + "integrity" "sha512-ucV0tDODnGV3JCnnkmoszb5lf4bNpzjv80K41wd4k798Etq+UYD0y0TIfalLjZoKgjive6/adkRnszwapiDgBQ==" + "resolved" "https://registry.npmjs.org/fbjs/-/fbjs-3.0.4.tgz" + "version" "3.0.4" dependencies: - cross-fetch "^3.1.5" - fbjs-css-vars "^1.0.0" - loose-envify "^1.0.0" - object-assign "^4.1.0" - promise "^7.1.1" - setimmediate "^1.0.5" - ua-parser-js "^0.7.30" + "cross-fetch" "^3.1.5" + "fbjs-css-vars" "^1.0.0" + "loose-envify" "^1.0.0" + "object-assign" "^4.1.0" + "promise" "^7.1.1" + "setimmediate" "^1.0.5" + "ua-parser-js" "^0.7.30" -feed@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/feed/-/feed-4.2.2.tgz#865783ef6ed12579e2c44bbef3c9113bc4956a7e" - integrity sha512-u5/sxGfiMfZNtJ3OvQpXcvotFpYkL0n9u9mM2vkui2nGo8b4wvDkJ8gAkYqbA8QpGyFCv3RK0Z+Iv+9veCS9bQ== +"feed@^4.2.2": + "integrity" "sha512-u5/sxGfiMfZNtJ3OvQpXcvotFpYkL0n9u9mM2vkui2nGo8b4wvDkJ8gAkYqbA8QpGyFCv3RK0Z+Iv+9veCS9bQ==" + "resolved" "https://registry.npmjs.org/feed/-/feed-4.2.2.tgz" + "version" "4.2.2" dependencies: - xml-js "^1.6.11" + "xml-js" "^1.6.11" -file-loader@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" - integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw== +"file-loader@*", "file-loader@^6.2.0": + "integrity" "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==" + "resolved" "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz" + "version" "6.2.0" dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" + "loader-utils" "^2.0.0" + "schema-utils" "^3.0.0" -filesize@^8.0.6: - version "8.0.7" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.7.tgz#695e70d80f4e47012c132d57a059e80c6b580bd8" - integrity sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ== +"filesize@^8.0.6": + "integrity" "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==" + "resolved" "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz" + "version" "8.0.7" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +"fill-range@^7.0.1": + "integrity" "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==" + "resolved" "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz" + "version" "7.0.1" dependencies: - to-regex-range "^5.0.1" + "to-regex-range" "^5.0.1" -finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== +"finalhandler@~1.1.2": + "integrity" "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==" + "resolved" "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz" + "version" "1.1.2" dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" - unpipe "~1.0.0" + "debug" "2.6.9" + "encodeurl" "~1.0.2" + "escape-html" "~1.0.3" + "on-finished" "~2.3.0" + "parseurl" "~1.3.3" + "statuses" "~1.5.0" + "unpipe" "~1.0.0" -find-cache-dir@^3.3.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" - integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== +"find-cache-dir@^3.3.1": + "integrity" "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==" + "resolved" "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz" + "version" "3.3.2" dependencies: - commondir "^1.0.1" - make-dir "^3.0.2" - pkg-dir "^4.1.0" + "commondir" "^1.0.1" + "make-dir" "^3.0.2" + "pkg-dir" "^4.1.0" -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== +"find-up@^3.0.0": + "integrity" "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==" + "resolved" "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz" + "version" "3.0.0" dependencies: - locate-path "^3.0.0" + "locate-path" "^3.0.0" -find-up@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== +"find-up@^4.0.0": + "integrity" "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==" + "resolved" "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz" + "version" "4.1.0" dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" + "locate-path" "^5.0.0" + "path-exists" "^4.0.0" -find-up@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== +"find-up@^5.0.0": + "integrity" "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==" + "resolved" "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz" + "version" "5.0.0" dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" + "locate-path" "^6.0.0" + "path-exists" "^4.0.0" -flux@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/flux/-/flux-4.0.3.tgz#573b504a24982c4768fdfb59d8d2ea5637d72ee7" - integrity sha512-yKAbrp7JhZhj6uiT1FTuVMlIAT1J4jqEyBpFApi1kxpGZCvacMVc/t1pMQyotqHhAgvoE3bNvAykhCo2CLjnYw== +"flux@^4.0.1": + "integrity" "sha512-yKAbrp7JhZhj6uiT1FTuVMlIAT1J4jqEyBpFApi1kxpGZCvacMVc/t1pMQyotqHhAgvoE3bNvAykhCo2CLjnYw==" + "resolved" "https://registry.npmjs.org/flux/-/flux-4.0.3.tgz" + "version" "4.0.3" dependencies: - fbemitter "^3.0.0" - fbjs "^3.0.1" + "fbemitter" "^3.0.0" + "fbjs" "^3.0.1" -follow-redirects@^1.0.0, follow-redirects@^1.14.7: - version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" - integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== +"follow-redirects@^1.0.0", "follow-redirects@^1.14.7": + "integrity" "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==" + "resolved" "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz" + "version" "1.14.9" -fork-ts-checker-webpack-plugin@^6.5.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz#0282b335fa495a97e167f69018f566ea7d2a2b5e" - integrity sha512-cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw== +"fork-ts-checker-webpack-plugin@^6.5.0": + "integrity" "sha512-cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw==" + "resolved" "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz" + "version" "6.5.0" dependencies: "@babel/code-frame" "^7.8.3" "@types/json-schema" "^7.0.5" - chalk "^4.1.0" - chokidar "^3.4.2" - cosmiconfig "^6.0.0" - deepmerge "^4.2.2" - fs-extra "^9.0.0" - glob "^7.1.6" - memfs "^3.1.2" - minimatch "^3.0.4" - schema-utils "2.7.0" - semver "^7.3.2" - tapable "^1.0.0" + "chalk" "^4.1.0" + "chokidar" "^3.4.2" + "cosmiconfig" "^6.0.0" + "deepmerge" "^4.2.2" + "fs-extra" "^9.0.0" + "glob" "^7.1.6" + "memfs" "^3.1.2" + "minimatch" "^3.0.4" + "schema-utils" "2.7.0" + "semver" "^7.3.2" + "tapable" "^1.0.0" -forwarded@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" - integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== +"forwarded@0.2.0": + "integrity" "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" + "resolved" "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz" + "version" "0.2.0" -fraction.js@^4.1.2: - version "4.1.3" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.3.tgz#be65b0f20762ef27e1e793860bc2dfb716e99e65" - integrity sha512-pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg== +"fraction.js@^4.1.2": + "integrity" "sha512-pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg==" + "resolved" "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.3.tgz" + "version" "4.1.3" -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= +"fresh@0.5.2": + "integrity" "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + "resolved" "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz" + "version" "0.5.2" -fs-extra@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1" - integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ== +"fs-extra@^10.0.0": + "integrity" "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==" + "resolved" "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz" + "version" "10.0.0" dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" + "graceful-fs" "^4.2.0" + "jsonfile" "^6.0.1" + "universalify" "^2.0.0" -fs-extra@^9.0.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== +"fs-extra@^9.0.0": + "integrity" "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==" + "resolved" "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz" + "version" "9.1.0" dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" + "at-least-node" "^1.0.0" + "graceful-fs" "^4.2.0" + "jsonfile" "^6.0.1" + "universalify" "^2.0.0" -fs-monkey@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" - integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== +"fs-monkey@1.0.3": + "integrity" "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==" + "resolved" "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz" + "version" "1.0.3" -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +"fs.realpath@^1.0.0": + "integrity" "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" + "version" "1.0.0" -fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== +"function-bind@^1.1.1": + "integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" + "version" "1.1.1" -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +"gensync@^1.0.0-beta.1", "gensync@^1.0.0-beta.2": + "integrity" "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" + "resolved" "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz" + "version" "1.0.0-beta.2" -gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: - version "1.0.0-beta.2" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" - integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== - -get-intrinsic@^1.0.2: - version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" - integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== +"get-intrinsic@^1.0.2": + "integrity" "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==" + "resolved" "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz" + "version" "1.1.1" dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" + "function-bind" "^1.1.1" + "has" "^1.0.3" + "has-symbols" "^1.0.1" -get-own-enumerable-property-symbols@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" - integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== +"get-own-enumerable-property-symbols@^3.0.0": + "integrity" "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==" + "resolved" "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz" + "version" "3.0.2" -get-stream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== +"get-stream@^4.1.0": + "integrity" "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==" + "resolved" "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz" + "version" "4.1.0" dependencies: - pump "^3.0.0" + "pump" "^3.0.0" -get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== +"get-stream@^5.1.0": + "integrity" "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==" + "resolved" "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz" + "version" "5.2.0" dependencies: - pump "^3.0.0" + "pump" "^3.0.0" -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== +"get-stream@^6.0.0": + "integrity" "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" + "resolved" "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz" + "version" "6.0.1" -github-slugger@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" - integrity sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ== +"github-slugger@^1.4.0": + "integrity" "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==" + "resolved" "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz" + "version" "1.4.0" -glob-parent@^5.1.2, glob-parent@~5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== +"glob-parent@^5.1.2", "glob-parent@~5.1.2": + "integrity" "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==" + "resolved" "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" + "version" "5.1.2" dependencies: - is-glob "^4.0.1" + "is-glob" "^4.0.1" -glob-parent@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" - integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== +"glob-parent@^6.0.1": + "integrity" "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==" + "resolved" "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz" + "version" "6.0.2" dependencies: - is-glob "^4.0.3" + "is-glob" "^4.0.3" -glob-to-regexp@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== +"glob-to-regexp@^0.4.1": + "integrity" "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + "resolved" "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz" + "version" "0.4.1" -glob@^7.0.0, glob@^7.1.3, glob@^7.1.6: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== +"glob@^7.0.0", "glob@^7.1.3", "glob@^7.1.6": + "integrity" "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==" + "resolved" "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz" + "version" "7.2.0" dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" + "fs.realpath" "^1.0.0" + "inflight" "^1.0.4" + "inherits" "2" + "minimatch" "^3.0.4" + "once" "^1.3.0" + "path-is-absolute" "^1.0.0" -global-dirs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" - integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== +"global-dirs@^3.0.0": + "integrity" "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==" + "resolved" "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz" + "version" "3.0.0" dependencies: - ini "2.0.0" + "ini" "2.0.0" -global-modules@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" - integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== +"global-modules@^2.0.0": + "integrity" "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==" + "resolved" "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz" + "version" "2.0.0" dependencies: - global-prefix "^3.0.0" + "global-prefix" "^3.0.0" -global-prefix@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" - integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== +"global-prefix@^3.0.0": + "integrity" "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==" + "resolved" "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz" + "version" "3.0.0" dependencies: - ini "^1.3.5" - kind-of "^6.0.2" - which "^1.3.1" + "ini" "^1.3.5" + "kind-of" "^6.0.2" + "which" "^1.3.1" -globals@^11.1.0: - version "11.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" - integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== +"globals@^11.1.0": + "integrity" "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" + "resolved" "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz" + "version" "11.12.0" -globby@^11.0.1, globby@^11.0.2, globby@^11.0.4: - version "11.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" - integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== +"globby@^11.0.1", "globby@^11.0.2", "globby@^11.0.4": + "integrity" "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==" + "resolved" "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz" + "version" "11.1.0" dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.2.9" - ignore "^5.2.0" - merge2 "^1.4.1" - slash "^3.0.0" + "array-union" "^2.1.0" + "dir-glob" "^3.0.1" + "fast-glob" "^3.2.9" + "ignore" "^5.2.0" + "merge2" "^1.4.1" + "slash" "^3.0.0" -globby@^12.0.2: - version "12.2.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-12.2.0.tgz#2ab8046b4fba4ff6eede835b29f678f90e3d3c22" - integrity sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA== +"globby@^12.0.2": + "integrity" "sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==" + "resolved" "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz" + "version" "12.2.0" dependencies: - array-union "^3.0.1" - dir-glob "^3.0.1" - fast-glob "^3.2.7" - ignore "^5.1.9" - merge2 "^1.4.1" - slash "^4.0.0" + "array-union" "^3.0.1" + "dir-glob" "^3.0.1" + "fast-glob" "^3.2.7" + "ignore" "^5.1.9" + "merge2" "^1.4.1" + "slash" "^4.0.0" -got@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== +"got@^9.6.0": + "integrity" "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==" + "resolved" "https://registry.npmjs.org/got/-/got-9.6.0.tgz" + "version" "9.6.0" dependencies: "@sindresorhus/is" "^0.14.0" "@szmarczak/http-timer" "^1.1.2" - cacheable-request "^6.0.0" - decompress-response "^3.3.0" - duplexer3 "^0.1.4" - get-stream "^4.1.0" - lowercase-keys "^1.0.1" - mimic-response "^1.0.1" - p-cancelable "^1.0.0" - to-readable-stream "^1.0.0" - url-parse-lax "^3.0.0" + "cacheable-request" "^6.0.0" + "decompress-response" "^3.3.0" + "duplexer3" "^0.1.4" + "get-stream" "^4.1.0" + "lowercase-keys" "^1.0.1" + "mimic-response" "^1.0.1" + "p-cancelable" "^1.0.0" + "to-readable-stream" "^1.0.0" + "url-parse-lax" "^3.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: - version "4.2.9" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" - integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== +"graceful-fs@^4.1.2", "graceful-fs@^4.1.6", "graceful-fs@^4.2.0", "graceful-fs@^4.2.4", "graceful-fs@^4.2.6", "graceful-fs@^4.2.9": + "integrity" "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==" + "resolved" "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz" + "version" "4.2.9" -gray-matter@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-4.0.3.tgz#e893c064825de73ea1f5f7d88c7a9f7274288798" - integrity sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q== +"gray-matter@^4.0.3": + "integrity" "sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==" + "resolved" "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.3.tgz" + "version" "4.0.3" dependencies: - js-yaml "^3.13.1" - kind-of "^6.0.2" - section-matter "^1.0.0" - strip-bom-string "^1.0.0" + "js-yaml" "^3.13.1" + "kind-of" "^6.0.2" + "section-matter" "^1.0.0" + "strip-bom-string" "^1.0.0" -gzip-size@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462" - integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q== +"gzip-size@^6.0.0": + "integrity" "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==" + "resolved" "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz" + "version" "6.0.0" dependencies: - duplexer "^0.1.2" + "duplexer" "^0.1.2" -handle-thing@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" - integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== +"handle-thing@^2.0.0": + "integrity" "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==" + "resolved" "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz" + "version" "2.0.1" -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= +"has-flag@^3.0.0": + "integrity" "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" + "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz" + "version" "3.0.0" -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +"has-flag@^4.0.0": + "integrity" "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz" + "version" "4.0.0" -has-symbols@^1.0.1, has-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== +"has-symbols@^1.0.1", "has-symbols@^1.0.2": + "integrity" "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" + "resolved" "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz" + "version" "1.0.2" -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== +"has-tostringtag@^1.0.0": + "integrity" "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==" + "resolved" "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz" + "version" "1.0.0" dependencies: - has-symbols "^1.0.2" + "has-symbols" "^1.0.2" -has-yarn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" - integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== +"has-yarn@^2.1.0": + "integrity" "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==" + "resolved" "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz" + "version" "2.1.0" -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== +"has@^1.0.3": + "integrity" "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==" + "resolved" "https://registry.npmjs.org/has/-/has-1.0.3.tgz" + "version" "1.0.3" dependencies: - function-bind "^1.1.1" + "function-bind" "^1.1.1" -hast-to-hyperscript@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz#9b67fd188e4c81e8ad66f803855334173920218d" - integrity sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA== +"hast-to-hyperscript@^9.0.0": + "integrity" "sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA==" + "resolved" "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz" + "version" "9.0.1" dependencies: "@types/unist" "^2.0.3" - comma-separated-tokens "^1.0.0" - property-information "^5.3.0" - space-separated-tokens "^1.0.0" - style-to-object "^0.3.0" - unist-util-is "^4.0.0" - web-namespaces "^1.0.0" + "comma-separated-tokens" "^1.0.0" + "property-information" "^5.3.0" + "space-separated-tokens" "^1.0.0" + "style-to-object" "^0.3.0" + "unist-util-is" "^4.0.0" + "web-namespaces" "^1.0.0" -hast-util-from-parse5@^5.0.0: - version "5.0.3" - resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" - integrity sha512-gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA== +"hast-util-from-parse5@^5.0.0": + "integrity" "sha512-gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA==" + "resolved" "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-5.0.3.tgz" + "version" "5.0.3" dependencies: - ccount "^1.0.3" - hastscript "^5.0.0" - property-information "^5.0.0" - web-namespaces "^1.1.2" - xtend "^4.0.1" + "ccount" "^1.0.3" + "hastscript" "^5.0.0" + "property-information" "^5.0.0" + "web-namespaces" "^1.1.2" + "xtend" "^4.0.1" -hast-util-from-parse5@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" - integrity sha512-jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA== +"hast-util-from-parse5@^6.0.0": + "integrity" "sha512-jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA==" + "resolved" "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz" + "version" "6.0.1" dependencies: "@types/parse5" "^5.0.0" - hastscript "^6.0.0" - property-information "^5.0.0" - vfile "^4.0.0" - vfile-location "^3.2.0" - web-namespaces "^1.0.0" + "hastscript" "^6.0.0" + "property-information" "^5.0.0" + "vfile" "^4.0.0" + "vfile-location" "^3.2.0" + "web-namespaces" "^1.0.0" -hast-util-parse-selector@^2.0.0: - version "2.2.5" - resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz#d57c23f4da16ae3c63b3b6ca4616683313499c3a" - integrity sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ== +"hast-util-parse-selector@^2.0.0": + "integrity" "sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==" + "resolved" "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz" + "version" "2.2.5" -hast-util-raw@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" - integrity sha512-ZMuiYA+UF7BXBtsTBNcLBF5HzXzkyE6MLzJnL605LKE8GJylNjGc4jjxazAHUtcwT5/CEt6afRKViYB4X66dig== +"hast-util-raw@6.0.1": + "integrity" "sha512-ZMuiYA+UF7BXBtsTBNcLBF5HzXzkyE6MLzJnL605LKE8GJylNjGc4jjxazAHUtcwT5/CEt6afRKViYB4X66dig==" + "resolved" "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-6.0.1.tgz" + "version" "6.0.1" dependencies: "@types/hast" "^2.0.0" - hast-util-from-parse5 "^6.0.0" - hast-util-to-parse5 "^6.0.0" - html-void-elements "^1.0.0" - parse5 "^6.0.0" - unist-util-position "^3.0.0" - vfile "^4.0.0" - web-namespaces "^1.0.0" - xtend "^4.0.0" - zwitch "^1.0.0" + "hast-util-from-parse5" "^6.0.0" + "hast-util-to-parse5" "^6.0.0" + "html-void-elements" "^1.0.0" + "parse5" "^6.0.0" + "unist-util-position" "^3.0.0" + "vfile" "^4.0.0" + "web-namespaces" "^1.0.0" + "xtend" "^4.0.0" + "zwitch" "^1.0.0" -hast-util-to-parse5@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz#1ec44650b631d72952066cea9b1445df699f8479" - integrity sha512-Lu5m6Lgm/fWuz8eWnrKezHtVY83JeRGaNQ2kn9aJgqaxvVkFCZQBEhgodZUDUvoodgyROHDb3r5IxAEdl6suJQ== +"hast-util-to-parse5@^6.0.0": + "integrity" "sha512-Lu5m6Lgm/fWuz8eWnrKezHtVY83JeRGaNQ2kn9aJgqaxvVkFCZQBEhgodZUDUvoodgyROHDb3r5IxAEdl6suJQ==" + "resolved" "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz" + "version" "6.0.0" dependencies: - hast-to-hyperscript "^9.0.0" - property-information "^5.0.0" - web-namespaces "^1.0.0" - xtend "^4.0.0" - zwitch "^1.0.0" + "hast-to-hyperscript" "^9.0.0" + "property-information" "^5.0.0" + "web-namespaces" "^1.0.0" + "xtend" "^4.0.0" + "zwitch" "^1.0.0" -hastscript@^5.0.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a" - integrity sha512-WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ== +"hastscript@^5.0.0": + "integrity" "sha512-WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ==" + "resolved" "https://registry.npmjs.org/hastscript/-/hastscript-5.1.2.tgz" + "version" "5.1.2" dependencies: - comma-separated-tokens "^1.0.0" - hast-util-parse-selector "^2.0.0" - property-information "^5.0.0" - space-separated-tokens "^1.0.0" + "comma-separated-tokens" "^1.0.0" + "hast-util-parse-selector" "^2.0.0" + "property-information" "^5.0.0" + "space-separated-tokens" "^1.0.0" -hastscript@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" - integrity sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w== +"hastscript@^6.0.0": + "integrity" "sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==" + "resolved" "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz" + "version" "6.0.0" dependencies: "@types/hast" "^2.0.0" - comma-separated-tokens "^1.0.0" - hast-util-parse-selector "^2.0.0" - property-information "^5.0.0" - space-separated-tokens "^1.0.0" + "comma-separated-tokens" "^1.0.0" + "hast-util-parse-selector" "^2.0.0" + "property-information" "^5.0.0" + "space-separated-tokens" "^1.0.0" -he@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" - integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== +"he@^1.2.0": + "integrity" "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" + "resolved" "https://registry.npmjs.org/he/-/he-1.2.0.tgz" + "version" "1.2.0" -history@^4.9.0: - version "4.10.1" - resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" - integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew== +"history@^4.9.0": + "integrity" "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==" + "resolved" "https://registry.npmjs.org/history/-/history-4.10.1.tgz" + "version" "4.10.1" dependencies: "@babel/runtime" "^7.1.2" - loose-envify "^1.2.0" - resolve-pathname "^3.0.0" - tiny-invariant "^1.0.2" - tiny-warning "^1.0.0" - value-equal "^1.0.1" + "loose-envify" "^1.2.0" + "resolve-pathname" "^3.0.0" + "tiny-invariant" "^1.0.2" + "tiny-warning" "^1.0.0" + "value-equal" "^1.0.1" -hoist-non-react-statics@^3.1.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" - integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== +"hoist-non-react-statics@^3.1.0": + "integrity" "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==" + "resolved" "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz" + "version" "3.3.2" dependencies: - react-is "^16.7.0" + "react-is" "^16.7.0" -hpack.js@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" - integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI= +"hpack.js@^2.1.6": + "integrity" "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=" + "resolved" "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz" + "version" "2.1.6" dependencies: - inherits "^2.0.1" - obuf "^1.0.0" - readable-stream "^2.0.1" - wbuf "^1.1.0" + "inherits" "^2.0.1" + "obuf" "^1.0.0" + "readable-stream" "^2.0.1" + "wbuf" "^1.1.0" -html-entities@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" - integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ== +"html-entities@^2.3.2": + "integrity" "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==" + "resolved" "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz" + "version" "2.3.2" -html-minifier-terser@^6.0.2: - version "6.1.0" - resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab" - integrity sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw== +"html-minifier-terser@^6.0.2": + "integrity" "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==" + "resolved" "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz" + "version" "6.1.0" dependencies: - camel-case "^4.1.2" - clean-css "^5.2.2" - commander "^8.3.0" - he "^1.2.0" - param-case "^3.0.4" - relateurl "^0.2.7" - terser "^5.10.0" + "camel-case" "^4.1.2" + "clean-css" "^5.2.2" + "commander" "^8.3.0" + "he" "^1.2.0" + "param-case" "^3.0.4" + "relateurl" "^0.2.7" + "terser" "^5.10.0" -html-tags@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" - integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg== +"html-tags@^3.1.0": + "integrity" "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==" + "resolved" "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz" + "version" "3.1.0" -html-void-elements@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483" - integrity sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w== +"html-void-elements@^1.0.0": + "integrity" "sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==" + "resolved" "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz" + "version" "1.0.5" -html-webpack-plugin@^5.4.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" - integrity sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw== +"html-webpack-plugin@^5.4.0": + "integrity" "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==" + "resolved" "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz" + "version" "5.5.0" dependencies: "@types/html-minifier-terser" "^6.0.0" - html-minifier-terser "^6.0.2" - lodash "^4.17.21" - pretty-error "^4.0.0" - tapable "^2.0.0" + "html-minifier-terser" "^6.0.2" + "lodash" "^4.17.21" + "pretty-error" "^4.0.0" + "tapable" "^2.0.0" -htmlparser2@^3.9.1: - version "3.10.1" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" - integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== +"htmlparser2@^3.9.1": + "integrity" "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==" + "resolved" "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz" + "version" "3.10.1" dependencies: - domelementtype "^1.3.1" - domhandler "^2.3.0" - domutils "^1.5.1" - entities "^1.1.1" - inherits "^2.0.1" - readable-stream "^3.1.1" + "domelementtype" "^1.3.1" + "domhandler" "^2.3.0" + "domutils" "^1.5.1" + "entities" "^1.1.1" + "inherits" "^2.0.1" + "readable-stream" "^3.1.1" -htmlparser2@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" - integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== +"htmlparser2@^6.1.0": + "integrity" "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==" + "resolved" "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz" + "version" "6.1.0" dependencies: - domelementtype "^2.0.1" - domhandler "^4.0.0" - domutils "^2.5.2" - entities "^2.0.0" + "domelementtype" "^2.0.1" + "domhandler" "^4.0.0" + "domutils" "^2.5.2" + "entities" "^2.0.0" -http-cache-semantics@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" - integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== +"http-cache-semantics@^4.0.0": + "integrity" "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" + "resolved" "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz" + "version" "4.1.1" -http-deceiver@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" - integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= +"http-deceiver@^1.2.7": + "integrity" "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=" + "resolved" "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz" + "version" "1.2.7" -http-errors@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" - integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== +"http-errors@~1.6.2": + "integrity" "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=" + "resolved" "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz" + "version" "1.6.3" dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.1" + "depd" "~1.1.2" + "inherits" "2.0.3" + "setprototypeof" "1.1.0" + "statuses" ">= 1.4.0 < 2" -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= +"http-errors@1.8.1": + "integrity" "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==" + "resolved" "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz" + "version" "1.8.1" dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" + "depd" "~1.1.2" + "inherits" "2.0.4" + "setprototypeof" "1.2.0" + "statuses" ">= 1.5.0 < 2" + "toidentifier" "1.0.1" -http-parser-js@>=0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5" - integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA== +"http-parser-js@>=0.5.1": + "integrity" "sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==" + "resolved" "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz" + "version" "0.5.5" -http-proxy-middleware@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.3.tgz#5df04f69a89f530c2284cd71eeaa51ba52243289" - integrity sha512-1bloEwnrHMnCoO/Gcwbz7eSVvW50KPES01PecpagI+YLNLci4AcuKJrujW4Mc3sBLpFxMSlsLNHS5Nl/lvrTPA== +"http-proxy-middleware@^2.0.0": + "integrity" "sha512-1bloEwnrHMnCoO/Gcwbz7eSVvW50KPES01PecpagI+YLNLci4AcuKJrujW4Mc3sBLpFxMSlsLNHS5Nl/lvrTPA==" + "resolved" "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.3.tgz" + "version" "2.0.3" dependencies: "@types/http-proxy" "^1.17.8" - http-proxy "^1.18.1" - is-glob "^4.0.1" - is-plain-obj "^3.0.0" - micromatch "^4.0.2" + "http-proxy" "^1.18.1" + "is-glob" "^4.0.1" + "is-plain-obj" "^3.0.0" + "micromatch" "^4.0.2" -http-proxy@^1.18.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" - integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== +"http-proxy@^1.18.1": + "integrity" "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==" + "resolved" "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz" + "version" "1.18.1" dependencies: - eventemitter3 "^4.0.0" - follow-redirects "^1.0.0" - requires-port "^1.0.0" + "eventemitter3" "^4.0.0" + "follow-redirects" "^1.0.0" + "requires-port" "^1.0.0" -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== +"human-signals@^2.1.0": + "integrity" "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==" + "resolved" "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz" + "version" "2.1.0" -iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== +"iconv-lite@0.4.24": + "integrity" "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==" + "resolved" "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" + "version" "0.4.24" dependencies: - safer-buffer ">= 2.1.2 < 3" + "safer-buffer" ">= 2.1.2 < 3" -icss-utils@^5.0.0, icss-utils@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" - integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== +"icss-utils@^5.0.0", "icss-utils@^5.1.0": + "integrity" "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==" + "resolved" "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz" + "version" "5.1.0" -ignore@^5.1.9, ignore@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" - integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== +"ignore@^5.1.9", "ignore@^5.2.0": + "integrity" "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==" + "resolved" "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz" + "version" "5.2.0" -image-size@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.1.tgz#86d6cfc2b1d19eab5d2b368d4b9194d9e48541c5" - integrity sha512-VAwkvNSNGClRw9mDHhc5Efax8PLlsOGcUTh0T/LIriC8vPA3U5PdqXWqkz406MoYHMKW8Uf9gWr05T/rYB44kQ== +"image-size@^1.0.1": + "integrity" "sha512-VAwkvNSNGClRw9mDHhc5Efax8PLlsOGcUTh0T/LIriC8vPA3U5PdqXWqkz406MoYHMKW8Uf9gWr05T/rYB44kQ==" + "resolved" "https://registry.npmjs.org/image-size/-/image-size-1.0.1.tgz" + "version" "1.0.1" dependencies: - queue "6.0.2" + "queue" "6.0.2" -immer@^9.0.7: - version "9.0.12" - resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.12.tgz#2d33ddf3ee1d247deab9d707ca472c8c942a0f20" - integrity sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA== +"immer@^9.0.7": + "integrity" "sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA==" + "resolved" "https://registry.npmjs.org/immer/-/immer-9.0.12.tgz" + "version" "9.0.12" -import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.2.2, import-fresh@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" - integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== +"import-fresh@^3.1.0", "import-fresh@^3.2.1", "import-fresh@^3.2.2", "import-fresh@^3.3.0": + "integrity" "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==" + "resolved" "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz" + "version" "3.3.0" dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" + "parent-module" "^1.0.0" + "resolve-from" "^4.0.0" -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= +"import-lazy@^2.1.0": + "integrity" "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=" + "resolved" "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz" + "version" "2.1.0" -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= +"imurmurhash@^0.1.4": + "integrity" "sha1-khi5srkoojixPcT7a21XbyMUU+o=" + "resolved" "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz" + "version" "0.1.4" -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== +"indent-string@^4.0.0": + "integrity" "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" + "resolved" "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz" + "version" "4.0.0" -infima@0.2.0-alpha.37: - version "0.2.0-alpha.37" - resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.37.tgz#b87ff42d528d6d050098a560f0294fbdd12adb78" - integrity sha512-4GX7Baw+/lwS4PPW/UJNY89tWSvYG1DL6baKVdpK6mC593iRgMssxNtORMTFArLPJ/A/lzsGhRmx+z6MaMxj0Q== +"infima@0.2.0-alpha.37": + "integrity" "sha512-4GX7Baw+/lwS4PPW/UJNY89tWSvYG1DL6baKVdpK6mC593iRgMssxNtORMTFArLPJ/A/lzsGhRmx+z6MaMxj0Q==" + "resolved" "https://registry.npmjs.org/infima/-/infima-0.2.0-alpha.37.tgz" + "version" "0.2.0-alpha.37" -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= +"inflight@^1.0.4": + "integrity" "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=" + "resolved" "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" + "version" "1.0.6" dependencies: - once "^1.3.0" - wrappy "1" + "once" "^1.3.0" + "wrappy" "1" -inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== +"inherits@^2.0.0", "inherits@^2.0.1", "inherits@^2.0.3", "inherits@~2.0.3", "inherits@2", "inherits@2.0.4": + "integrity" "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" + "version" "2.0.4" -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= +"inherits@2.0.3": + "integrity" "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" + "version" "2.0.3" -ini@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" - integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== +"ini@^1.3.5", "ini@~1.3.0": + "integrity" "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" + "resolved" "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz" + "version" "1.3.8" -ini@^1.3.5, ini@~1.3.0: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== +"ini@2.0.0": + "integrity" "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==" + "resolved" "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz" + "version" "2.0.0" -inline-style-parser@0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1" - integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q== +"inline-style-parser@0.1.1": + "integrity" "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==" + "resolved" "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz" + "version" "0.1.1" -interpret@^1.0.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" - integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== +"interpret@^1.0.0": + "integrity" "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==" + "resolved" "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz" + "version" "1.4.0" -ip@^1.1.0: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= +"ip@^1.1.0": + "integrity" "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=" + "resolved" "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz" + "version" "1.1.5" -ipaddr.js@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== +"ipaddr.js@^2.0.1": + "integrity" "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==" + "resolved" "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz" + "version" "2.0.1" -ipaddr.js@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" - integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== +"ipaddr.js@1.9.1": + "integrity" "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" + "resolved" "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz" + "version" "1.9.1" -is-alphabetical@1.0.4, is-alphabetical@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d" - integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg== +"is-alphabetical@^1.0.0", "is-alphabetical@1.0.4": + "integrity" "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==" + "resolved" "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz" + "version" "1.0.4" -is-alphanumerical@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf" - integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A== +"is-alphanumerical@^1.0.0": + "integrity" "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==" + "resolved" "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz" + "version" "1.0.4" dependencies: - is-alphabetical "^1.0.0" - is-decimal "^1.0.0" + "is-alphabetical" "^1.0.0" + "is-decimal" "^1.0.0" -is-arguments@^1.0.4: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== +"is-arguments@^1.0.4": + "integrity" "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==" + "resolved" "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz" + "version" "1.1.1" dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" + "call-bind" "^1.0.2" + "has-tostringtag" "^1.0.0" -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= +"is-arrayish@^0.2.1": + "integrity" "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + "resolved" "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz" + "version" "0.2.1" -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== +"is-binary-path@~2.1.0": + "integrity" "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==" + "resolved" "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz" + "version" "2.1.0" dependencies: - binary-extensions "^2.0.0" + "binary-extensions" "^2.0.0" -is-buffer@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" - integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== +"is-buffer@^2.0.0": + "integrity" "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==" + "resolved" "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz" + "version" "2.0.5" -is-ci@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" - integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== +"is-ci@^2.0.0": + "integrity" "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==" + "resolved" "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz" + "version" "2.0.0" dependencies: - ci-info "^2.0.0" + "ci-info" "^2.0.0" -is-core-module@^2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" - integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== +"is-core-module@^2.8.1": + "integrity" "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==" + "resolved" "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz" + "version" "2.8.1" dependencies: - has "^1.0.3" + "has" "^1.0.3" -is-date-object@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== +"is-date-object@^1.0.1": + "integrity" "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==" + "resolved" "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz" + "version" "1.0.5" dependencies: - has-tostringtag "^1.0.0" + "has-tostringtag" "^1.0.0" -is-decimal@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" - integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw== +"is-decimal@^1.0.0": + "integrity" "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==" + "resolved" "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz" + "version" "1.0.4" -is-docker@^2.0.0, is-docker@^2.1.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== +"is-docker@^2.0.0", "is-docker@^2.1.1": + "integrity" "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==" + "resolved" "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz" + "version" "2.2.1" -is-extendable@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= +"is-extendable@^0.1.0": + "integrity" "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" + "resolved" "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz" + "version" "0.1.1" -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= +"is-extglob@^2.1.1": + "integrity" "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + "resolved" "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" + "version" "2.1.1" -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== +"is-fullwidth-code-point@^3.0.0": + "integrity" "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + "resolved" "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz" + "version" "3.0.0" -is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== +"is-glob@^4.0.1", "is-glob@^4.0.3", "is-glob@~4.0.1": + "integrity" "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==" + "resolved" "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz" + "version" "4.0.3" dependencies: - is-extglob "^2.1.1" + "is-extglob" "^2.1.1" -is-hexadecimal@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" - integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== +"is-hexadecimal@^1.0.0": + "integrity" "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==" + "resolved" "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz" + "version" "1.0.4" -is-installed-globally@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" - integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== +"is-installed-globally@^0.4.0": + "integrity" "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==" + "resolved" "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz" + "version" "0.4.0" dependencies: - global-dirs "^3.0.0" - is-path-inside "^3.0.2" + "global-dirs" "^3.0.0" + "is-path-inside" "^3.0.2" -is-npm@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" - integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== +"is-npm@^5.0.0": + "integrity" "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==" + "resolved" "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz" + "version" "5.0.0" -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== +"is-number@^7.0.0": + "integrity" "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + "resolved" "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz" + "version" "7.0.0" -is-obj@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" - integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= +"is-obj@^1.0.1": + "integrity" "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + "resolved" "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz" + "version" "1.0.1" -is-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" - integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== +"is-obj@^2.0.0": + "integrity" "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" + "resolved" "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz" + "version" "2.0.0" -is-path-cwd@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" - integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== +"is-path-cwd@^2.2.0": + "integrity" "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==" + "resolved" "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz" + "version" "2.2.0" -is-path-inside@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== +"is-path-inside@^3.0.2": + "integrity" "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==" + "resolved" "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz" + "version" "3.0.3" -is-plain-obj@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" - integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== +"is-plain-obj@^2.0.0": + "integrity" "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==" + "resolved" "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz" + "version" "2.1.0" -is-plain-obj@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" - integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== +"is-plain-obj@^3.0.0": + "integrity" "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==" + "resolved" "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz" + "version" "3.0.0" -is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== +"is-plain-object@^2.0.4": + "integrity" "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==" + "resolved" "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz" + "version" "2.0.4" dependencies: - isobject "^3.0.1" + "isobject" "^3.0.1" -is-regex@^1.0.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== +"is-regex@^1.0.4": + "integrity" "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==" + "resolved" "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz" + "version" "1.1.4" dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" + "call-bind" "^1.0.2" + "has-tostringtag" "^1.0.0" -is-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" - integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= +"is-regexp@^1.0.0": + "integrity" "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=" + "resolved" "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz" + "version" "1.0.0" -is-root@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" - integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg== +"is-root@^2.1.0": + "integrity" "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==" + "resolved" "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz" + "version" "2.1.0" -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== +"is-stream@^2.0.0": + "integrity" "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" + "resolved" "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz" + "version" "2.0.1" -is-typedarray@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= +"is-typedarray@^1.0.0": + "integrity" "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + "resolved" "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" + "version" "1.0.0" -is-whitespace-character@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7" - integrity sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w== +"is-whitespace-character@^1.0.0": + "integrity" "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==" + "resolved" "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz" + "version" "1.0.4" -is-word-character@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230" - integrity sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA== +"is-word-character@^1.0.0": + "integrity" "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==" + "resolved" "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz" + "version" "1.0.4" -is-wsl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== +"is-wsl@^2.2.0": + "integrity" "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==" + "resolved" "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz" + "version" "2.2.0" dependencies: - is-docker "^2.0.0" + "is-docker" "^2.0.0" -is-yarn-global@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" - integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== +"is-yarn-global@^0.3.0": + "integrity" "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==" + "resolved" "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz" + "version" "0.3.0" -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= +"isarray@~1.0.0": + "integrity" "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "resolved" "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + "version" "1.0.0" -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +"isarray@0.0.1": + "integrity" "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + "resolved" "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + "version" "0.0.1" -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= +"isexe@^2.0.0": + "integrity" "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + "resolved" "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" + "version" "2.0.0" -isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= +"isobject@^3.0.1": + "integrity" "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "resolved" "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz" + "version" "3.0.1" -jest-worker@^27.0.2, jest-worker@^27.4.5: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" - integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== +"jest-worker@^27.0.2", "jest-worker@^27.4.5": + "integrity" "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==" + "resolved" "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz" + "version" "27.5.1" dependencies: "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" + "merge-stream" "^2.0.0" + "supports-color" "^8.0.0" -joi@^17.4.2, joi@^17.6.0: - version "17.6.0" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.0.tgz#0bb54f2f006c09a96e75ce687957bd04290054b2" - integrity sha512-OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw== +"joi@^17.4.2", "joi@^17.6.0": + "integrity" "sha512-OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw==" + "resolved" "https://registry.npmjs.org/joi/-/joi-17.6.0.tgz" + "version" "17.6.0" dependencies: "@hapi/hoek" "^9.0.0" "@hapi/topo" "^5.0.0" @@ -4684,2834 +4702,2879 @@ joi@^17.4.2, joi@^17.6.0: "@sideway/formula" "^3.0.0" "@sideway/pinpoint" "^2.0.0" -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== +"js-tokens@^3.0.0 || ^4.0.0", "js-tokens@^4.0.0": + "integrity" "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "resolved" "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" + "version" "4.0.0" -js-yaml@^3.13.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== +"js-yaml@^3.13.1": + "integrity" "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==" + "resolved" "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz" + "version" "3.14.1" dependencies: - argparse "^1.0.7" - esprima "^4.0.0" + "argparse" "^1.0.7" + "esprima" "^4.0.0" -js-yaml@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== +"js-yaml@^4.0.0": + "integrity" "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==" + "resolved" "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz" + "version" "4.1.0" dependencies: - argparse "^2.0.1" + "argparse" "^2.0.1" -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== +"jsesc@^2.5.1": + "integrity" "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" + "resolved" "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz" + "version" "2.5.2" -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= +"jsesc@~0.5.0": + "integrity" "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + "resolved" "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz" + "version" "0.5.0" -json-buffer@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= +"json-buffer@3.0.0": + "integrity" "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" + "resolved" "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz" + "version" "3.0.0" -json-parse-better-errors@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== +"json-parse-better-errors@^1.0.2": + "integrity" "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" + "resolved" "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz" + "version" "1.0.2" -json-parse-even-better-errors@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== +"json-parse-even-better-errors@^2.3.0": + "integrity" "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" + "resolved" "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz" + "version" "2.3.1" -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== +"json-schema-traverse@^0.4.1": + "integrity" "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "resolved" "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz" + "version" "0.4.1" -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== +"json-schema-traverse@^1.0.0": + "integrity" "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + "resolved" "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz" + "version" "1.0.0" -json5@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" - integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== +"json5@^1.0.1": + "integrity" "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==" + "resolved" "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz" + "version" "1.0.2" dependencies: - minimist "^1.2.0" + "minimist" "^1.2.0" -json5@^2.1.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" +"json5@^2.1.2", "json5@^2.2.2": + "integrity" "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" + "resolved" "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz" + "version" "2.2.3" -jsonfile@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" - integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== +"jsonfile@^6.0.1": + "integrity" "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==" + "resolved" "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz" + "version" "6.1.0" dependencies: - universalify "^2.0.0" + "universalify" "^2.0.0" optionalDependencies: - graceful-fs "^4.1.6" + "graceful-fs" "^4.1.6" -keyv@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" - integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== +"keyv@^3.0.0": + "integrity" "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==" + "resolved" "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz" + "version" "3.1.0" dependencies: - json-buffer "3.0.0" + "json-buffer" "3.0.0" -kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== +"kind-of@^6.0.0", "kind-of@^6.0.2": + "integrity" "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz" + "version" "6.0.3" -kleur@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" - integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== +"kleur@^3.0.3": + "integrity" "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==" + "resolved" "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz" + "version" "3.0.3" -klona@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" - integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== +"klona@^2.0.5": + "integrity" "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==" + "resolved" "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz" + "version" "2.0.5" -latest-version@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" - integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== +"latest-version@^5.1.0": + "integrity" "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==" + "resolved" "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz" + "version" "5.1.0" dependencies: - package-json "^6.3.0" + "package-json" "^6.3.0" -leven@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" - integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== +"leven@^3.1.0": + "integrity" "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==" + "resolved" "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz" + "version" "3.1.0" -lilconfig@^2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" - integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA== +"lilconfig@^2.0.3": + "integrity" "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==" + "resolved" "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz" + "version" "2.0.4" -lines-and-columns@^1.1.6: - version "1.2.4" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" - integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== +"lines-and-columns@^1.1.6": + "integrity" "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" + "resolved" "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz" + "version" "1.2.4" -loader-runner@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" - integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== +"loader-runner@^4.2.0": + "integrity" "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==" + "resolved" "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz" + "version" "4.2.0" -loader-utils@^1.4.0: - version "1.4.2" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3" - integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg== +"loader-utils@^1.4.0": + "integrity" "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==" + "resolved" "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz" + "version" "1.4.2" dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^1.0.1" + "big.js" "^5.2.2" + "emojis-list" "^3.0.0" + "json5" "^1.0.1" -loader-utils@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" - integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A== +"loader-utils@^2.0.0": + "integrity" "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==" + "resolved" "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz" + "version" "2.0.2" dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^2.1.2" + "big.js" "^5.2.2" + "emojis-list" "^3.0.0" + "json5" "^2.1.2" -loader-utils@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.0.tgz#bcecc51a7898bee7473d4bc6b845b23af8304d4f" - integrity sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ== +"loader-utils@^3.2.0": + "integrity" "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==" + "resolved" "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz" + "version" "3.2.0" -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== +"locate-path@^3.0.0": + "integrity" "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==" + "resolved" "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz" + "version" "3.0.0" dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" + "p-locate" "^3.0.0" + "path-exists" "^3.0.0" -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== +"locate-path@^5.0.0": + "integrity" "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==" + "resolved" "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz" + "version" "5.0.0" dependencies: - p-locate "^4.1.0" + "p-locate" "^4.1.0" -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== +"locate-path@^6.0.0": + "integrity" "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==" + "resolved" "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz" + "version" "6.0.0" dependencies: - p-locate "^5.0.0" + "p-locate" "^5.0.0" -lodash.assignin@^4.0.9: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" - integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI= +"lodash.assignin@^4.0.9": + "integrity" "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=" + "resolved" "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz" + "version" "4.2.0" -lodash.bind@^4.1.4: - version "4.2.1" - resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35" - integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU= +"lodash.bind@^4.1.4": + "integrity" "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=" + "resolved" "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz" + "version" "4.2.1" -lodash.curry@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170" - integrity sha1-JI42By7ekGUB11lmIAqG2riyMXA= +"lodash.curry@^4.0.1": + "integrity" "sha1-JI42By7ekGUB11lmIAqG2riyMXA=" + "resolved" "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz" + "version" "4.1.1" -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= +"lodash.debounce@^4.0.8": + "integrity" "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" + "resolved" "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz" + "version" "4.0.8" -lodash.defaults@^4.0.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" - integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= +"lodash.defaults@^4.0.1": + "integrity" "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=" + "resolved" "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz" + "version" "4.2.0" -lodash.filter@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" - integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= +"lodash.filter@^4.4.0": + "integrity" "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=" + "resolved" "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz" + "version" "4.6.0" -lodash.flatten@^4.2.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" - integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= +"lodash.flatten@^4.2.0": + "integrity" "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" + "resolved" "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz" + "version" "4.4.0" -lodash.flow@^3.3.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a" - integrity sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o= +"lodash.flow@^3.3.0": + "integrity" "sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o=" + "resolved" "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz" + "version" "3.5.0" -lodash.foreach@^4.3.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" - integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM= +"lodash.foreach@^4.3.0": + "integrity" "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" + "resolved" "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz" + "version" "4.5.0" -lodash.map@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" - integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= +"lodash.map@^4.4.0": + "integrity" "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=" + "resolved" "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz" + "version" "4.6.0" -lodash.memoize@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= +"lodash.memoize@^4.1.2": + "integrity" "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=" + "resolved" "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz" + "version" "4.1.2" -lodash.merge@^4.4.0: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== +"lodash.merge@^4.4.0": + "integrity" "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + "resolved" "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz" + "version" "4.6.2" -lodash.pick@^4.2.1: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" - integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= +"lodash.pick@^4.2.1": + "integrity" "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=" + "resolved" "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz" + "version" "4.4.0" -lodash.reduce@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" - integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs= +"lodash.reduce@^4.4.0": + "integrity" "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=" + "resolved" "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz" + "version" "4.6.0" -lodash.reject@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415" - integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU= +"lodash.reject@^4.4.0": + "integrity" "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=" + "resolved" "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz" + "version" "4.6.0" -lodash.some@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" - integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0= +"lodash.some@^4.4.0": + "integrity" "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=" + "resolved" "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz" + "version" "4.6.0" -lodash.uniq@4.5.0, lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= +"lodash.uniq@^4.5.0", "lodash.uniq@4.5.0": + "integrity" "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" + "resolved" "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz" + "version" "4.5.0" -lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== +"lodash@^4.17.14", "lodash@^4.17.19", "lodash@^4.17.20", "lodash@^4.17.21": + "integrity" "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + "resolved" "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" + "version" "4.17.21" -loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" - integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== +"loose-envify@^1.0.0", "loose-envify@^1.1.0", "loose-envify@^1.2.0", "loose-envify@^1.3.1", "loose-envify@^1.4.0": + "integrity" "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==" + "resolved" "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz" + "version" "1.4.0" dependencies: - js-tokens "^3.0.0 || ^4.0.0" + "js-tokens" "^3.0.0 || ^4.0.0" -lower-case@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" - integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== +"lower-case@^2.0.2": + "integrity" "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==" + "resolved" "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz" + "version" "2.0.2" dependencies: - tslib "^2.0.3" + "tslib" "^2.0.3" -lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== +"lowercase-keys@^1.0.0", "lowercase-keys@^1.0.1": + "integrity" "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" + "resolved" "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz" + "version" "1.0.1" -lowercase-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" - integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== +"lowercase-keys@^2.0.0": + "integrity" "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" + "resolved" "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz" + "version" "2.0.0" -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== +"lru-cache@^5.1.1": + "integrity" "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==" + "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz" + "version" "5.1.1" dependencies: - yallist "^4.0.0" + "yallist" "^3.0.2" -magic-string@^0.25.3: - version "0.25.7" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" - integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA== +"lru-cache@^6.0.0": + "integrity" "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==" + "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz" + "version" "6.0.0" dependencies: - sourcemap-codec "^1.4.4" + "yallist" "^4.0.0" -make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== +"magic-string@^0.25.3": + "integrity" "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==" + "resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz" + "version" "0.25.7" dependencies: - semver "^6.0.0" + "sourcemap-codec" "^1.4.4" -markdown-escapes@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" - integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg== - -mdast-squeeze-paragraphs@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97" - integrity sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ== +"make-dir@^3.0.0", "make-dir@^3.0.2", "make-dir@^3.1.0": + "integrity" "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==" + "resolved" "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz" + "version" "3.1.0" dependencies: - unist-util-remove "^2.0.0" + "semver" "^6.0.0" -mdast-util-definitions@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2" - integrity sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ== +"markdown-escapes@^1.0.0": + "integrity" "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==" + "resolved" "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz" + "version" "1.0.4" + +"mdast-squeeze-paragraphs@^4.0.0": + "integrity" "sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ==" + "resolved" "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz" + "version" "4.0.0" dependencies: - unist-util-visit "^2.0.0" + "unist-util-remove" "^2.0.0" -mdast-util-to-hast@10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb" - integrity sha512-BW3LM9SEMnjf4HXXVApZMt8gLQWVNXc3jryK0nJu/rOXPOnlkUjmdkDlmxMirpbU9ILncGFIwLH/ubnWBbcdgA== +"mdast-util-definitions@^4.0.0": + "integrity" "sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==" + "resolved" "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz" + "version" "4.0.0" + dependencies: + "unist-util-visit" "^2.0.0" + +"mdast-util-to-hast@10.0.1": + "integrity" "sha512-BW3LM9SEMnjf4HXXVApZMt8gLQWVNXc3jryK0nJu/rOXPOnlkUjmdkDlmxMirpbU9ILncGFIwLH/ubnWBbcdgA==" + "resolved" "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz" + "version" "10.0.1" dependencies: "@types/mdast" "^3.0.0" "@types/unist" "^2.0.0" - mdast-util-definitions "^4.0.0" - mdurl "^1.0.0" - unist-builder "^2.0.0" - unist-util-generated "^1.0.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "mdast-util-definitions" "^4.0.0" + "mdurl" "^1.0.0" + "unist-builder" "^2.0.0" + "unist-util-generated" "^1.0.0" + "unist-util-position" "^3.0.0" + "unist-util-visit" "^2.0.0" -mdast-util-to-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" - integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w== +"mdast-util-to-string@^2.0.0": + "integrity" "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==" + "resolved" "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz" + "version" "2.0.0" -mdn-data@2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" - integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== +"mdn-data@2.0.14": + "integrity" "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==" + "resolved" "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz" + "version" "2.0.14" -mdurl@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" - integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= +"mdurl@^1.0.0": + "integrity" "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=" + "resolved" "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz" + "version" "1.0.1" -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= +"media-typer@0.3.0": + "integrity" "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" + "resolved" "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" + "version" "0.3.0" -memfs@^3.1.2, memfs@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305" - integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw== +"memfs@^3.1.2", "memfs@^3.4.1": + "integrity" "sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==" + "resolved" "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz" + "version" "3.4.1" dependencies: - fs-monkey "1.0.3" + "fs-monkey" "1.0.3" -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= +"merge-descriptors@1.0.1": + "integrity" "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + "resolved" "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz" + "version" "1.0.1" -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== +"merge-stream@^2.0.0": + "integrity" "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + "resolved" "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz" + "version" "2.0.0" -merge2@^1.3.0, merge2@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== +"merge2@^1.3.0", "merge2@^1.4.1": + "integrity" "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" + "resolved" "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz" + "version" "1.4.1" -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= +"methods@~1.1.2": + "integrity" "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" + "resolved" "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" + "version" "1.1.2" -micromatch@^4.0.2, micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== +"micromatch@^4.0.2", "micromatch@^4.0.4": + "integrity" "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==" + "resolved" "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz" + "version" "4.0.4" dependencies: - braces "^3.0.1" - picomatch "^2.2.3" + "braces" "^3.0.1" + "picomatch" "^2.2.3" -mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": - version "1.51.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" - integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== +"mime-db@>= 1.43.0 < 2", "mime-db@1.51.0": + "integrity" "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==" + "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz" + "version" "1.51.0" -mime-db@~1.33.0: - version "1.33.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" - integrity sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ== +"mime-db@~1.33.0": + "integrity" "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" + "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz" + "version" "1.33.0" -mime-types@2.1.18: - version "2.1.18" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" - integrity sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ== +"mime-types@^2.1.27", "mime-types@^2.1.31", "mime-types@~2.1.17", "mime-types@~2.1.24", "mime-types@~2.1.34": + "integrity" "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==" + "resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz" + "version" "2.1.34" dependencies: - mime-db "~1.33.0" + "mime-db" "1.51.0" -mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: - version "2.1.34" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" - integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== +"mime-types@2.1.18": + "integrity" "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==" + "resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz" + "version" "2.1.18" dependencies: - mime-db "1.51.0" + "mime-db" "~1.33.0" -mime@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== +"mime@1.6.0": + "integrity" "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + "resolved" "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz" + "version" "1.6.0" -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +"mimic-fn@^2.1.0": + "integrity" "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + "resolved" "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz" + "version" "2.1.0" -mimic-response@^1.0.0, mimic-response@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" - integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== +"mimic-response@^1.0.0", "mimic-response@^1.0.1": + "integrity" "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" + "resolved" "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz" + "version" "1.0.1" -mini-create-react-context@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" - integrity sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ== +"mini-create-react-context@^0.4.0": + "integrity" "sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==" + "resolved" "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz" + "version" "0.4.1" dependencies: "@babel/runtime" "^7.12.1" - tiny-warning "^1.0.3" + "tiny-warning" "^1.0.3" -mini-css-extract-plugin@^1.6.0: - version "1.6.2" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" - integrity sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q== +"mini-css-extract-plugin@^1.6.0": + "integrity" "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==" + "resolved" "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz" + "version" "1.6.2" dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" - webpack-sources "^1.1.0" + "loader-utils" "^2.0.0" + "schema-utils" "^3.0.0" + "webpack-sources" "^1.1.0" -minimalistic-assert@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== +"minimalistic-assert@^1.0.0": + "integrity" "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" + "resolved" "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz" + "version" "1.0.1" -minimatch@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== +"minimatch@^3.0.4": + "integrity" "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==" + "resolved" "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" + "version" "3.1.2" dependencies: - brace-expansion "^1.1.7" + "brace-expansion" "^1.1.7" -minimatch@^3.0.4: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== +"minimatch@3.0.4": + "integrity" "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==" + "resolved" "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" + "version" "3.0.4" dependencies: - brace-expansion "^1.1.7" + "brace-expansion" "^1.1.7" -minimist@^1.2.0, minimist@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" - integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== +"minimist@^1.2.0", "minimist@^1.2.5": + "integrity" "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==" + "resolved" "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz" + "version" "1.2.7" -mkdirp@^0.5.5: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== +"mkdirp@^0.5.5": + "integrity" "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==" + "resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz" + "version" "0.5.5" dependencies: - minimist "^1.2.5" + "minimist" "^1.2.5" -mrmime@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.0.tgz#14d387f0585a5233d291baba339b063752a2398b" - integrity sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ== +"mrmime@^1.0.0": + "integrity" "sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==" + "resolved" "https://registry.npmjs.org/mrmime/-/mrmime-1.0.0.tgz" + "version" "1.0.0" -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= +"ms@^2.1.1", "ms@2.1.3": + "integrity" "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "resolved" "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" + "version" "2.1.3" -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +"ms@2.0.0": + "integrity" "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "resolved" "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" + "version" "2.0.0" -ms@2.1.3, ms@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== +"ms@2.1.2": + "integrity" "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "resolved" "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" + "version" "2.1.2" -multicast-dns-service-types@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" - integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE= +"multicast-dns-service-types@^1.1.0": + "integrity" "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=" + "resolved" "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz" + "version" "1.1.0" -multicast-dns@^6.0.1: - version "6.2.3" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" - integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g== +"multicast-dns@^6.0.1": + "integrity" "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==" + "resolved" "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz" + "version" "6.2.3" dependencies: - dns-packet "^1.3.1" - thunky "^1.0.2" + "dns-packet" "^1.3.1" + "thunky" "^1.0.2" -nanoid@^3.2.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" - integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw== +"nanoid@^3.2.0": + "integrity" "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==" + "resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz" + "version" "3.3.1" -negotiator@0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== +"negotiator@0.6.3": + "integrity" "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" + "resolved" "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz" + "version" "0.6.3" -neo-async@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== +"neo-async@^2.6.2": + "integrity" "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" + "resolved" "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz" + "version" "2.6.2" -no-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" - integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== +"no-case@^3.0.4": + "integrity" "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==" + "resolved" "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz" + "version" "3.0.4" dependencies: - lower-case "^2.0.2" - tslib "^2.0.3" + "lower-case" "^2.0.2" + "tslib" "^2.0.3" -node-emoji@^1.10.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" - integrity sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A== +"node-emoji@^1.10.0": + "integrity" "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==" + "resolved" "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz" + "version" "1.11.0" dependencies: - lodash "^4.17.21" + "lodash" "^4.17.21" -node-fetch@2.6.7: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== +"node-fetch@2.6.7": + "integrity" "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==" + "resolved" "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz" + "version" "2.6.7" dependencies: - whatwg-url "^5.0.0" + "whatwg-url" "^5.0.0" -node-forge@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.0.tgz#37a874ea723855f37db091e6c186e5b67a01d4b2" - integrity sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA== +"node-forge@^1.2.0": + "integrity" "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==" + "resolved" "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz" + "version" "1.3.0" -node-releases@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01" - integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg== +"node-releases@^2.0.8": + "integrity" "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==" + "resolved" "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz" + "version" "2.0.10" -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== +"normalize-path@^3.0.0", "normalize-path@~3.0.0": + "integrity" "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + "resolved" "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" + "version" "3.0.0" -normalize-range@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= +"normalize-range@^0.1.2": + "integrity" "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=" + "resolved" "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz" + "version" "0.1.2" -normalize-url@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" - integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== +"normalize-url@^4.1.0": + "integrity" "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==" + "resolved" "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz" + "version" "4.5.1" -normalize-url@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" - integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== +"normalize-url@^6.0.1": + "integrity" "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==" + "resolved" "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz" + "version" "6.1.0" -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== +"npm-run-path@^4.0.1": + "integrity" "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==" + "resolved" "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz" + "version" "4.0.1" dependencies: - path-key "^3.0.0" + "path-key" "^3.0.0" -nprogress@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/nprogress/-/nprogress-0.2.0.tgz#cb8f34c53213d895723fcbab907e9422adbcafb1" - integrity sha1-y480xTIT2JVyP8urkH6UIq28r7E= +"nprogress@^0.2.0": + "integrity" "sha1-y480xTIT2JVyP8urkH6UIq28r7E=" + "resolved" "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz" + "version" "0.2.0" -nth-check@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" - integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w== +"nth-check@^2.0.1": + "integrity" "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==" + "resolved" "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz" + "version" "2.0.1" dependencies: - boolbase "^1.0.0" + "boolbase" "^1.0.0" -nth-check@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" - integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== +"nth-check@~1.0.1": + "integrity" "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==" + "resolved" "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz" + "version" "1.0.2" dependencies: - boolbase "~1.0.0" + "boolbase" "~1.0.0" -object-assign@^4.1.0, object-assign@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= +"object-assign@^4.1.0", "object-assign@^4.1.1": + "integrity" "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "resolved" "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" + "version" "4.1.1" -object-is@^1.0.1: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" - integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== +"object-is@^1.0.1": + "integrity" "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==" + "resolved" "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz" + "version" "1.1.5" dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" + "call-bind" "^1.0.2" + "define-properties" "^1.1.3" -object-keys@^1.0.12, object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== +"object-keys@^1.0.12", "object-keys@^1.1.1": + "integrity" "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" + "resolved" "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz" + "version" "1.1.1" -object.assign@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" - integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== +"object.assign@^4.1.0": + "integrity" "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==" + "resolved" "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz" + "version" "4.1.2" dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - has-symbols "^1.0.1" - object-keys "^1.1.1" + "call-bind" "^1.0.0" + "define-properties" "^1.1.3" + "has-symbols" "^1.0.1" + "object-keys" "^1.1.1" -obuf@^1.0.0, obuf@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" - integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== +"obuf@^1.0.0", "obuf@^1.1.2": + "integrity" "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==" + "resolved" "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz" + "version" "1.1.2" -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= +"on-finished@~2.3.0": + "integrity" "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=" + "resolved" "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz" + "version" "2.3.0" dependencies: - ee-first "1.1.1" + "ee-first" "1.1.1" -on-headers@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" - integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== +"on-headers@~1.0.2": + "integrity" "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" + "resolved" "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz" + "version" "1.0.2" -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= +"once@^1.3.0", "once@^1.3.1", "once@^1.4.0": + "integrity" "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=" + "resolved" "https://registry.npmjs.org/once/-/once-1.4.0.tgz" + "version" "1.4.0" dependencies: - wrappy "1" + "wrappy" "1" -onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== +"onetime@^5.1.2": + "integrity" "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==" + "resolved" "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz" + "version" "5.1.2" dependencies: - mimic-fn "^2.1.0" + "mimic-fn" "^2.1.0" -open@^8.0.9, open@^8.4.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== +"open@^8.0.9", "open@^8.4.0": + "integrity" "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==" + "resolved" "https://registry.npmjs.org/open/-/open-8.4.0.tgz" + "version" "8.4.0" dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" + "define-lazy-prop" "^2.0.0" + "is-docker" "^2.1.1" + "is-wsl" "^2.2.0" -opener@^1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" - integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== +"opener@^1.5.2": + "integrity" "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==" + "resolved" "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz" + "version" "1.5.2" -p-cancelable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" - integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== +"p-cancelable@^1.0.0": + "integrity" "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" + "resolved" "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz" + "version" "1.1.0" -p-limit@^2.0.0, p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== +"p-limit@^2.0.0", "p-limit@^2.2.0": + "integrity" "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==" + "resolved" "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz" + "version" "2.3.0" dependencies: - p-try "^2.0.0" + "p-try" "^2.0.0" -p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== +"p-limit@^3.0.2": + "integrity" "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==" + "resolved" "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz" + "version" "3.1.0" dependencies: - yocto-queue "^0.1.0" + "yocto-queue" "^0.1.0" -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== +"p-locate@^3.0.0": + "integrity" "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==" + "resolved" "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz" + "version" "3.0.0" dependencies: - p-limit "^2.0.0" + "p-limit" "^2.0.0" -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== +"p-locate@^4.1.0": + "integrity" "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==" + "resolved" "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz" + "version" "4.1.0" dependencies: - p-limit "^2.2.0" + "p-limit" "^2.2.0" -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== +"p-locate@^5.0.0": + "integrity" "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==" + "resolved" "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz" + "version" "5.0.0" dependencies: - p-limit "^3.0.2" + "p-limit" "^3.0.2" -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== +"p-map@^4.0.0": + "integrity" "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==" + "resolved" "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz" + "version" "4.0.0" dependencies: - aggregate-error "^3.0.0" + "aggregate-error" "^3.0.0" -p-retry@^4.5.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" - integrity sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA== +"p-retry@^4.5.0": + "integrity" "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==" + "resolved" "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz" + "version" "4.6.1" dependencies: "@types/retry" "^0.12.0" - retry "^0.13.1" + "retry" "^0.13.1" -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== +"p-try@^2.0.0": + "integrity" "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + "resolved" "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz" + "version" "2.2.0" -package-json@^6.3.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" - integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== +"package-json@^6.3.0": + "integrity" "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==" + "resolved" "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz" + "version" "6.5.0" dependencies: - got "^9.6.0" - registry-auth-token "^4.0.0" - registry-url "^5.0.0" - semver "^6.2.0" + "got" "^9.6.0" + "registry-auth-token" "^4.0.0" + "registry-url" "^5.0.0" + "semver" "^6.2.0" -param-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" - integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== +"param-case@^3.0.4": + "integrity" "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==" + "resolved" "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz" + "version" "3.0.4" dependencies: - dot-case "^3.0.4" - tslib "^2.0.3" + "dot-case" "^3.0.4" + "tslib" "^2.0.3" -parent-module@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" - integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== +"parent-module@^1.0.0": + "integrity" "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==" + "resolved" "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz" + "version" "1.0.1" dependencies: - callsites "^3.0.0" + "callsites" "^3.0.0" -parse-entities@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8" - integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ== +"parse-entities@^2.0.0": + "integrity" "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==" + "resolved" "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz" + "version" "2.0.0" dependencies: - character-entities "^1.0.0" - character-entities-legacy "^1.0.0" - character-reference-invalid "^1.0.0" - is-alphanumerical "^1.0.0" - is-decimal "^1.0.0" - is-hexadecimal "^1.0.0" + "character-entities" "^1.0.0" + "character-entities-legacy" "^1.0.0" + "character-reference-invalid" "^1.0.0" + "is-alphanumerical" "^1.0.0" + "is-decimal" "^1.0.0" + "is-hexadecimal" "^1.0.0" -parse-json@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== +"parse-json@^5.0.0": + "integrity" "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==" + "resolved" "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz" + "version" "5.2.0" dependencies: "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" + "error-ex" "^1.3.1" + "json-parse-even-better-errors" "^2.3.0" + "lines-and-columns" "^1.1.6" -parse-numeric-range@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/parse-numeric-range/-/parse-numeric-range-1.3.0.tgz#7c63b61190d61e4d53a1197f0c83c47bb670ffa3" - integrity sha512-twN+njEipszzlMJd4ONUYgSfZPDxgHhT9Ahed5uTigpQn90FggW4SA/AIPq/6a149fTbE9qBEcSwE3FAEp6wQQ== +"parse-numeric-range@^1.3.0": + "integrity" "sha512-twN+njEipszzlMJd4ONUYgSfZPDxgHhT9Ahed5uTigpQn90FggW4SA/AIPq/6a149fTbE9qBEcSwE3FAEp6wQQ==" + "resolved" "https://registry.npmjs.org/parse-numeric-range/-/parse-numeric-range-1.3.0.tgz" + "version" "1.3.0" -parse5-htmlparser2-tree-adapter@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" - integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== +"parse5-htmlparser2-tree-adapter@^6.0.1": + "integrity" "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==" + "resolved" "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz" + "version" "6.0.1" dependencies: - parse5 "^6.0.1" + "parse5" "^6.0.1" -parse5@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" - integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== +"parse5@^5.0.0": + "integrity" "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==" + "resolved" "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz" + "version" "5.1.1" -parse5@^6.0.0, parse5@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== +"parse5@^6.0.0", "parse5@^6.0.1": + "integrity" "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" + "resolved" "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz" + "version" "6.0.1" -parseurl@~1.3.2, parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== +"parseurl@~1.3.2", "parseurl@~1.3.3": + "integrity" "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" + "resolved" "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz" + "version" "1.3.3" -pascal-case@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" - integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== +"pascal-case@^3.1.2": + "integrity" "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==" + "resolved" "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz" + "version" "3.1.2" dependencies: - no-case "^3.0.4" - tslib "^2.0.3" + "no-case" "^3.0.4" + "tslib" "^2.0.3" -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= +"path-exists@^3.0.0": + "integrity" "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" + "resolved" "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz" + "version" "3.0.0" -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== +"path-exists@^4.0.0": + "integrity" "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + "resolved" "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz" + "version" "4.0.0" -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= +"path-is-absolute@^1.0.0": + "integrity" "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + "resolved" "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" + "version" "1.0.1" -path-is-inside@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= +"path-is-inside@1.0.2": + "integrity" "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=" + "resolved" "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz" + "version" "1.0.2" -path-key@^3.0.0, path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== +"path-key@^3.0.0", "path-key@^3.1.0": + "integrity" "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + "resolved" "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz" + "version" "3.1.1" -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== +"path-parse@^1.0.7": + "integrity" "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + "resolved" "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" + "version" "1.0.7" -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= - -path-to-regexp@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" - integrity sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ== - -path-to-regexp@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" - integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== +"path-to-regexp@^1.7.0": + "integrity" "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==" + "resolved" "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz" + "version" "1.8.0" dependencies: - isarray "0.0.1" + "isarray" "0.0.1" -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== +"path-to-regexp@0.1.7": + "integrity" "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + "resolved" "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" + "version" "0.1.7" -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +"path-to-regexp@2.2.1": + "integrity" "sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ==" + "resolved" "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz" + "version" "2.2.1" -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +"path-type@^4.0.0": + "integrity" "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" + "resolved" "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz" + "version" "4.0.0" -pkg-dir@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== +"picocolors@^1.0.0": + "integrity" "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "resolved" "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz" + "version" "1.0.0" + +"picomatch@^2.0.4", "picomatch@^2.2.1", "picomatch@^2.2.3": + "integrity" "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" + "resolved" "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz" + "version" "2.3.1" + +"pkg-dir@^4.1.0": + "integrity" "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==" + "resolved" "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz" + "version" "4.2.0" dependencies: - find-up "^4.0.0" + "find-up" "^4.0.0" -pkg-up@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" - integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== +"pkg-up@^3.1.0": + "integrity" "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==" + "resolved" "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz" + "version" "3.1.0" dependencies: - find-up "^3.0.0" + "find-up" "^3.0.0" -portfinder@^1.0.28: - version "1.0.28" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" - integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== +"portfinder@^1.0.28": + "integrity" "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==" + "resolved" "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz" + "version" "1.0.28" dependencies: - async "^2.6.2" - debug "^3.1.1" - mkdirp "^0.5.5" + "async" "^2.6.2" + "debug" "^3.1.1" + "mkdirp" "^0.5.5" -postcss-calc@^8.2.0: - version "8.2.4" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5" - integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q== +"postcss-calc@^8.2.0": + "integrity" "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==" + "resolved" "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz" + "version" "8.2.4" dependencies: - postcss-selector-parser "^6.0.9" - postcss-value-parser "^4.2.0" + "postcss-selector-parser" "^6.0.9" + "postcss-value-parser" "^4.2.0" -postcss-colormin@^5.2.5: - version "5.2.5" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.5.tgz#d1fc269ac2ad03fe641d462b5d1dada35c69968a" - integrity sha512-+X30aDaGYq81mFqwyPpnYInsZQnNpdxMX0ajlY7AExCexEFkPVV+KrO7kXwayqEWL2xwEbNQ4nUO0ZsRWGnevg== +"postcss-colormin@^5.2.5": + "integrity" "sha512-+X30aDaGYq81mFqwyPpnYInsZQnNpdxMX0ajlY7AExCexEFkPVV+KrO7kXwayqEWL2xwEbNQ4nUO0ZsRWGnevg==" + "resolved" "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.5.tgz" + "version" "5.2.5" dependencies: - browserslist "^4.16.6" - caniuse-api "^3.0.0" - colord "^2.9.1" - postcss-value-parser "^4.2.0" + "browserslist" "^4.16.6" + "caniuse-api" "^3.0.0" + "colord" "^2.9.1" + "postcss-value-parser" "^4.2.0" -postcss-convert-values@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.4.tgz#3e74dd97c581f475ae7b4500bc0a7c4fb3a6b1b6" - integrity sha512-bugzSAyjIexdObovsPZu/sBCTHccImJxLyFgeV0MmNBm/Lw5h5XnjfML6gzEmJ3A6nyfCW7hb1JXzcsA4Zfbdw== +"postcss-convert-values@^5.0.4": + "integrity" "sha512-bugzSAyjIexdObovsPZu/sBCTHccImJxLyFgeV0MmNBm/Lw5h5XnjfML6gzEmJ3A6nyfCW7hb1JXzcsA4Zfbdw==" + "resolved" "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-discard-comments@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.3.tgz#011acb63418d600fdbe18804e1bbecb543ad2f87" - integrity sha512-6W5BemziRoqIdAKT+1QjM4bNcJAQ7z7zk073730NHg4cUXh3/rQHHj7pmYxUB9aGhuRhBiUf0pXvIHkRwhQP0Q== +"postcss-discard-comments@^5.0.3": + "integrity" "sha512-6W5BemziRoqIdAKT+1QjM4bNcJAQ7z7zk073730NHg4cUXh3/rQHHj7pmYxUB9aGhuRhBiUf0pXvIHkRwhQP0Q==" + "resolved" "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.3.tgz" + "version" "5.0.3" -postcss-discard-duplicates@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.3.tgz#10f202a4cfe9d407b73dfea7a477054d21ea0c1f" - integrity sha512-vPtm1Mf+kp7iAENTG7jI1MN1lk+fBqL5y+qxyi4v3H+lzsXEdfS3dwUZD45KVhgzDEgduur8ycB4hMegyMTeRw== +"postcss-discard-duplicates@^5.0.3": + "integrity" "sha512-vPtm1Mf+kp7iAENTG7jI1MN1lk+fBqL5y+qxyi4v3H+lzsXEdfS3dwUZD45KVhgzDEgduur8ycB4hMegyMTeRw==" + "resolved" "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.3.tgz" + "version" "5.0.3" -postcss-discard-empty@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.3.tgz#ec185af4a3710b88933b0ff751aa157b6041dd6a" - integrity sha512-xGJugpaXKakwKI7sSdZjUuN4V3zSzb2Y0LOlmTajFbNinEjTfVs9PFW2lmKBaC/E64WwYppfqLD03P8l9BuueA== +"postcss-discard-empty@^5.0.3": + "integrity" "sha512-xGJugpaXKakwKI7sSdZjUuN4V3zSzb2Y0LOlmTajFbNinEjTfVs9PFW2lmKBaC/E64WwYppfqLD03P8l9BuueA==" + "resolved" "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.3.tgz" + "version" "5.0.3" -postcss-discard-overridden@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.4.tgz#cc999d6caf18ea16eff8b2b58f48ec3ddee35c9c" - integrity sha512-3j9QH0Qh1KkdxwiZOW82cId7zdwXVQv/gRXYDnwx5pBtR1sTkU4cXRK9lp5dSdiM0r0OICO/L8J6sV1/7m0kHg== +"postcss-discard-overridden@^5.0.4": + "integrity" "sha512-3j9QH0Qh1KkdxwiZOW82cId7zdwXVQv/gRXYDnwx5pBtR1sTkU4cXRK9lp5dSdiM0r0OICO/L8J6sV1/7m0kHg==" + "resolved" "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.4.tgz" + "version" "5.0.4" -postcss-discard-unused@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-5.0.3.tgz#89fd3ebdbed8320df77a4ad503bd83cff52409f5" - integrity sha512-WO6FJxL5fGnuE77ZbTcZ/nRZJ4+TOqNaqLBLWgkR4e+WdmHn77OHPyQmsRv7eOB2rLKL6tsq2bs1GwoKXD/++Q== +"postcss-discard-unused@^5.0.3": + "integrity" "sha512-WO6FJxL5fGnuE77ZbTcZ/nRZJ4+TOqNaqLBLWgkR4e+WdmHn77OHPyQmsRv7eOB2rLKL6tsq2bs1GwoKXD/++Q==" + "resolved" "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-5.0.3.tgz" + "version" "5.0.3" dependencies: - postcss-selector-parser "^6.0.5" + "postcss-selector-parser" "^6.0.5" -postcss-loader@^6.1.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz#0895f7346b1702103d30fdc66e4d494a93c008ef" - integrity sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q== +"postcss-loader@^6.1.1": + "integrity" "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==" + "resolved" "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz" + "version" "6.2.1" dependencies: - cosmiconfig "^7.0.0" - klona "^2.0.5" - semver "^7.3.5" + "cosmiconfig" "^7.0.0" + "klona" "^2.0.5" + "semver" "^7.3.5" -postcss-merge-idents@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-5.0.3.tgz#04f333f32767bd7b7b002f0032da347ec3c8c484" - integrity sha512-Z4LCzh2WzMn69KaS2FaJcrIeDQ170V13QHq+0hnBEFKJJkD+y5qndZ/bl3AhpddrSrXWIVR+xAwjmHQIJI2Eog== +"postcss-merge-idents@^5.0.3": + "integrity" "sha512-Z4LCzh2WzMn69KaS2FaJcrIeDQ170V13QHq+0hnBEFKJJkD+y5qndZ/bl3AhpddrSrXWIVR+xAwjmHQIJI2Eog==" + "resolved" "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-5.0.3.tgz" + "version" "5.0.3" dependencies: - cssnano-utils "^3.0.2" - postcss-value-parser "^4.2.0" + "cssnano-utils" "^3.0.2" + "postcss-value-parser" "^4.2.0" -postcss-merge-longhand@^5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.6.tgz#090e60d5d3b3caad899f8774f8dccb33217d2166" - integrity sha512-rkmoPwQO6ymJSmWsX6l2hHeEBQa7C4kJb9jyi5fZB1sE8nSCv7sqchoYPixRwX/yvLoZP2y6FA5kcjiByeJqDg== +"postcss-merge-longhand@^5.0.6": + "integrity" "sha512-rkmoPwQO6ymJSmWsX6l2hHeEBQa7C4kJb9jyi5fZB1sE8nSCv7sqchoYPixRwX/yvLoZP2y6FA5kcjiByeJqDg==" + "resolved" "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.6.tgz" + "version" "5.0.6" dependencies: - postcss-value-parser "^4.2.0" - stylehacks "^5.0.3" + "postcss-value-parser" "^4.2.0" + "stylehacks" "^5.0.3" -postcss-merge-rules@^5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.6.tgz#26b37411fe1e80202fcef61cab027265b8925f2b" - integrity sha512-nzJWJ9yXWp8AOEpn/HFAW72WKVGD2bsLiAmgw4hDchSij27bt6TF+sIK0cJUBAYT3SGcjtGGsOR89bwkkMuMgQ== +"postcss-merge-rules@^5.0.6": + "integrity" "sha512-nzJWJ9yXWp8AOEpn/HFAW72WKVGD2bsLiAmgw4hDchSij27bt6TF+sIK0cJUBAYT3SGcjtGGsOR89bwkkMuMgQ==" + "resolved" "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.6.tgz" + "version" "5.0.6" dependencies: - browserslist "^4.16.6" - caniuse-api "^3.0.0" - cssnano-utils "^3.0.2" - postcss-selector-parser "^6.0.5" + "browserslist" "^4.16.6" + "caniuse-api" "^3.0.0" + "cssnano-utils" "^3.0.2" + "postcss-selector-parser" "^6.0.5" -postcss-minify-font-values@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.4.tgz#627d824406b0712243221891f40a44fffe1467fd" - integrity sha512-RN6q3tyuEesvyCYYFCRGJ41J1XFvgV+dvYGHr0CeHv8F00yILlN8Slf4t8XW4IghlfZYCeyRrANO6HpJ948ieA== +"postcss-minify-font-values@^5.0.4": + "integrity" "sha512-RN6q3tyuEesvyCYYFCRGJ41J1XFvgV+dvYGHr0CeHv8F00yILlN8Slf4t8XW4IghlfZYCeyRrANO6HpJ948ieA==" + "resolved" "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-minify-gradients@^5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.6.tgz#b07cef51a93f075e94053fd972ff1cba2eaf6503" - integrity sha512-E/dT6oVxB9nLGUTiY/rG5dX9taugv9cbLNTFad3dKxOO+BQg25Q/xo2z2ddG+ZB1CbkZYaVwx5blY8VC7R/43A== +"postcss-minify-gradients@^5.0.6": + "integrity" "sha512-E/dT6oVxB9nLGUTiY/rG5dX9taugv9cbLNTFad3dKxOO+BQg25Q/xo2z2ddG+ZB1CbkZYaVwx5blY8VC7R/43A==" + "resolved" "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.6.tgz" + "version" "5.0.6" dependencies: - colord "^2.9.1" - cssnano-utils "^3.0.2" - postcss-value-parser "^4.2.0" + "colord" "^2.9.1" + "cssnano-utils" "^3.0.2" + "postcss-value-parser" "^4.2.0" -postcss-minify-params@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.5.tgz#86cb624358cd45c21946f8c317893f0449396646" - integrity sha512-YBNuq3Rz5LfLFNHb9wrvm6t859b8qIqfXsWeK7wROm3jSKNpO1Y5e8cOyBv6Acji15TgSrAwb3JkVNCqNyLvBg== +"postcss-minify-params@^5.0.5": + "integrity" "sha512-YBNuq3Rz5LfLFNHb9wrvm6t859b8qIqfXsWeK7wROm3jSKNpO1Y5e8cOyBv6Acji15TgSrAwb3JkVNCqNyLvBg==" + "resolved" "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.5.tgz" + "version" "5.0.5" dependencies: - browserslist "^4.16.6" - cssnano-utils "^3.0.2" - postcss-value-parser "^4.2.0" + "browserslist" "^4.16.6" + "cssnano-utils" "^3.0.2" + "postcss-value-parser" "^4.2.0" -postcss-minify-selectors@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.3.tgz#6ac12d52aa661fd509469d87ab2cebb0a1e3a1b5" - integrity sha512-9RJfTiQEKA/kZhMaEXND893nBqmYQ8qYa/G+uPdVnXF6D/FzpfI6kwBtWEcHx5FqDbA79O9n6fQJfrIj6M8jvQ== +"postcss-minify-selectors@^5.1.3": + "integrity" "sha512-9RJfTiQEKA/kZhMaEXND893nBqmYQ8qYa/G+uPdVnXF6D/FzpfI6kwBtWEcHx5FqDbA79O9n6fQJfrIj6M8jvQ==" + "resolved" "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.3.tgz" + "version" "5.1.3" dependencies: - postcss-selector-parser "^6.0.5" + "postcss-selector-parser" "^6.0.5" -postcss-modules-extract-imports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" - integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== +"postcss-modules-extract-imports@^3.0.0": + "integrity" "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==" + "resolved" "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz" + "version" "3.0.0" -postcss-modules-local-by-default@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" - integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== +"postcss-modules-local-by-default@^4.0.0": + "integrity" "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==" + "resolved" "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz" + "version" "4.0.0" dependencies: - icss-utils "^5.0.0" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.1.0" + "icss-utils" "^5.0.0" + "postcss-selector-parser" "^6.0.2" + "postcss-value-parser" "^4.1.0" -postcss-modules-scope@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" - integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== +"postcss-modules-scope@^3.0.0": + "integrity" "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==" + "resolved" "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz" + "version" "3.0.0" dependencies: - postcss-selector-parser "^6.0.4" + "postcss-selector-parser" "^6.0.4" -postcss-modules-values@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" - integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== +"postcss-modules-values@^4.0.0": + "integrity" "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==" + "resolved" "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz" + "version" "4.0.0" dependencies: - icss-utils "^5.0.0" + "icss-utils" "^5.0.0" -postcss-normalize-charset@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.3.tgz#719fb9f9ca9835fcbd4fed8d6e0d72a79e7b5472" - integrity sha512-iKEplDBco9EfH7sx4ut7R2r/dwTnUqyfACf62Unc9UiyFuI7uUqZZtY+u+qp7g8Qszl/U28HIfcsI3pEABWFfA== +"postcss-normalize-charset@^5.0.3": + "integrity" "sha512-iKEplDBco9EfH7sx4ut7R2r/dwTnUqyfACf62Unc9UiyFuI7uUqZZtY+u+qp7g8Qszl/U28HIfcsI3pEABWFfA==" + "resolved" "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.3.tgz" + "version" "5.0.3" -postcss-normalize-display-values@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.3.tgz#94cc82e20c51cc4ffba6b36e9618adc1e50db8c1" - integrity sha512-FIV5FY/qs4Ja32jiDb5mVj5iWBlS3N8tFcw2yg98+8MkRgyhtnBgSC0lxU+16AMHbjX5fbSJgw5AXLMolonuRQ== +"postcss-normalize-display-values@^5.0.3": + "integrity" "sha512-FIV5FY/qs4Ja32jiDb5mVj5iWBlS3N8tFcw2yg98+8MkRgyhtnBgSC0lxU+16AMHbjX5fbSJgw5AXLMolonuRQ==" + "resolved" "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.3.tgz" + "version" "5.0.3" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-normalize-positions@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.4.tgz#4001f38c99675437b83277836fb4291887fcc6cc" - integrity sha512-qynirjBX0Lc73ROomZE3lzzmXXTu48/QiEzKgMeqh28+MfuHLsuqC9po4kj84igZqqFGovz8F8hf44hA3dPYmQ== +"postcss-normalize-positions@^5.0.4": + "integrity" "sha512-qynirjBX0Lc73ROomZE3lzzmXXTu48/QiEzKgMeqh28+MfuHLsuqC9po4kj84igZqqFGovz8F8hf44hA3dPYmQ==" + "resolved" "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-normalize-repeat-style@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.4.tgz#d005adf9ee45fae78b673031a376c0c871315145" - integrity sha512-Innt+wctD7YpfeDR7r5Ik6krdyppyAg2HBRpX88fo5AYzC1Ut/l3xaxACG0KsbX49cO2n5EB13clPwuYVt8cMA== +"postcss-normalize-repeat-style@^5.0.4": + "integrity" "sha512-Innt+wctD7YpfeDR7r5Ik6krdyppyAg2HBRpX88fo5AYzC1Ut/l3xaxACG0KsbX49cO2n5EB13clPwuYVt8cMA==" + "resolved" "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-normalize-string@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.4.tgz#b5e00a07597e7aa8a871817bfeac2bfaa59c3333" - integrity sha512-Dfk42l0+A1CDnVpgE606ENvdmksttLynEqTQf5FL3XGQOyqxjbo25+pglCUvziicTxjtI2NLUR6KkxyUWEVubQ== +"postcss-normalize-string@^5.0.4": + "integrity" "sha512-Dfk42l0+A1CDnVpgE606ENvdmksttLynEqTQf5FL3XGQOyqxjbo25+pglCUvziicTxjtI2NLUR6KkxyUWEVubQ==" + "resolved" "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-normalize-timing-functions@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.3.tgz#47210227bfcba5e52650d7a18654337090de7072" - integrity sha512-QRfjvFh11moN4PYnJ7hia4uJXeFotyK3t2jjg8lM9mswleGsNw2Lm3I5wO+l4k1FzK96EFwEVn8X8Ojrp2gP4g== +"postcss-normalize-timing-functions@^5.0.3": + "integrity" "sha512-QRfjvFh11moN4PYnJ7hia4uJXeFotyK3t2jjg8lM9mswleGsNw2Lm3I5wO+l4k1FzK96EFwEVn8X8Ojrp2gP4g==" + "resolved" "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.3.tgz" + "version" "5.0.3" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-normalize-unicode@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.4.tgz#02866096937005cdb2c17116c690f29505a1623d" - integrity sha512-W79Regn+a+eXTzB+oV/8XJ33s3pDyFTND2yDuUCo0Xa3QSy1HtNIfRVPXNubHxjhlqmMFADr3FSCHT84ITW3ig== +"postcss-normalize-unicode@^5.0.4": + "integrity" "sha512-W79Regn+a+eXTzB+oV/8XJ33s3pDyFTND2yDuUCo0Xa3QSy1HtNIfRVPXNubHxjhlqmMFADr3FSCHT84ITW3ig==" + "resolved" "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.4.tgz" + "version" "5.0.4" dependencies: - browserslist "^4.16.6" - postcss-value-parser "^4.2.0" + "browserslist" "^4.16.6" + "postcss-value-parser" "^4.2.0" -postcss-normalize-url@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.5.tgz#c39efc12ff119f6f45f0b4f516902b12c8080e3a" - integrity sha512-Ws3tX+PcekYlXh+ycAt0wyzqGthkvVtZ9SZLutMVvHARxcpu4o7vvXcNoiNKyjKuWecnjS6HDI3fjBuDr5MQxQ== +"postcss-normalize-url@^5.0.5": + "integrity" "sha512-Ws3tX+PcekYlXh+ycAt0wyzqGthkvVtZ9SZLutMVvHARxcpu4o7vvXcNoiNKyjKuWecnjS6HDI3fjBuDr5MQxQ==" + "resolved" "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.5.tgz" + "version" "5.0.5" dependencies: - normalize-url "^6.0.1" - postcss-value-parser "^4.2.0" + "normalize-url" "^6.0.1" + "postcss-value-parser" "^4.2.0" -postcss-normalize-whitespace@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.4.tgz#1d477e7da23fecef91fc4e37d462272c7b55c5ca" - integrity sha512-wsnuHolYZjMwWZJoTC9jeI2AcjA67v4UuidDrPN9RnX8KIZfE+r2Nd6XZRwHVwUiHmRvKQtxiqo64K+h8/imaw== +"postcss-normalize-whitespace@^5.0.4": + "integrity" "sha512-wsnuHolYZjMwWZJoTC9jeI2AcjA67v4UuidDrPN9RnX8KIZfE+r2Nd6XZRwHVwUiHmRvKQtxiqo64K+h8/imaw==" + "resolved" "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-ordered-values@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.5.tgz#e878af822a130c3f3709737e24cb815ca7c6d040" - integrity sha512-mfY7lXpq+8bDEHfP+muqibDPhZ5eP9zgBEF9XRvoQgXcQe2Db3G1wcvjbnfjXG6wYsl+0UIjikqq4ym1V2jGMQ== +"postcss-ordered-values@^5.0.5": + "integrity" "sha512-mfY7lXpq+8bDEHfP+muqibDPhZ5eP9zgBEF9XRvoQgXcQe2Db3G1wcvjbnfjXG6wYsl+0UIjikqq4ym1V2jGMQ==" + "resolved" "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.5.tgz" + "version" "5.0.5" dependencies: - cssnano-utils "^3.0.2" - postcss-value-parser "^4.2.0" + "cssnano-utils" "^3.0.2" + "postcss-value-parser" "^4.2.0" -postcss-reduce-idents@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-5.0.3.tgz#b632796275b4fa1a4040799969dd17167eaf4d8b" - integrity sha512-9bj9/Xhwiti0Z35kkguJX4G6yUYVw8S1kRLU4jFSCTEuHu4yJggf4rNUoVnT45lm/vU97Wd593CxspMDbHxy4w== +"postcss-reduce-idents@^5.0.3": + "integrity" "sha512-9bj9/Xhwiti0Z35kkguJX4G6yUYVw8S1kRLU4jFSCTEuHu4yJggf4rNUoVnT45lm/vU97Wd593CxspMDbHxy4w==" + "resolved" "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-5.0.3.tgz" + "version" "5.0.3" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-reduce-initial@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.3.tgz#68891594defd648253703bbd8f1093162f19568d" - integrity sha512-c88TkSnQ/Dnwgb4OZbKPOBbCaauwEjbECP5uAuFPOzQ+XdjNjRH7SG0dteXrpp1LlIFEKK76iUGgmw2V0xeieA== +"postcss-reduce-initial@^5.0.3": + "integrity" "sha512-c88TkSnQ/Dnwgb4OZbKPOBbCaauwEjbECP5uAuFPOzQ+XdjNjRH7SG0dteXrpp1LlIFEKK76iUGgmw2V0xeieA==" + "resolved" "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.0.3.tgz" + "version" "5.0.3" dependencies: - browserslist "^4.16.6" - caniuse-api "^3.0.0" + "browserslist" "^4.16.6" + "caniuse-api" "^3.0.0" -postcss-reduce-transforms@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.4.tgz#717e72d30befe857f7d2784dba10eb1157863712" - integrity sha512-VIJB9SFSaL8B/B7AXb7KHL6/GNNbbCHslgdzS9UDfBZYIA2nx8NLY7iD/BXFSO/1sRUILzBTfHCoW5inP37C5g== +"postcss-reduce-transforms@^5.0.4": + "integrity" "sha512-VIJB9SFSaL8B/B7AXb7KHL6/GNNbbCHslgdzS9UDfBZYIA2nx8NLY7iD/BXFSO/1sRUILzBTfHCoW5inP37C5g==" + "resolved" "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" + "postcss-value-parser" "^4.2.0" -postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: - version "6.0.9" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f" - integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ== +"postcss-selector-parser@^6.0.2", "postcss-selector-parser@^6.0.4", "postcss-selector-parser@^6.0.5", "postcss-selector-parser@^6.0.9": + "integrity" "sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==" + "resolved" "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz" + "version" "6.0.9" dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" + "cssesc" "^3.0.0" + "util-deprecate" "^1.0.2" -postcss-sort-media-queries@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/postcss-sort-media-queries/-/postcss-sort-media-queries-4.2.1.tgz#a99bae69ef1098ee3b64a5fa94d258ec240d0355" - integrity sha512-9VYekQalFZ3sdgcTjXMa0dDjsfBVHXlraYJEMiOJ/2iMmI2JGCMavP16z3kWOaRu8NSaJCTgVpB/IVpH5yT9YQ== +"postcss-sort-media-queries@^4.1.0": + "integrity" "sha512-9VYekQalFZ3sdgcTjXMa0dDjsfBVHXlraYJEMiOJ/2iMmI2JGCMavP16z3kWOaRu8NSaJCTgVpB/IVpH5yT9YQ==" + "resolved" "https://registry.npmjs.org/postcss-sort-media-queries/-/postcss-sort-media-queries-4.2.1.tgz" + "version" "4.2.1" dependencies: - sort-css-media-queries "2.0.4" + "sort-css-media-queries" "2.0.4" -postcss-svgo@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.4.tgz#cfa8682f47b88f7cd75108ec499e133b43102abf" - integrity sha512-yDKHvULbnZtIrRqhZoA+rxreWpee28JSRH/gy9727u0UCgtpv1M/9WEWY3xySlFa0zQJcqf6oCBJPR5NwkmYpg== +"postcss-svgo@^5.0.4": + "integrity" "sha512-yDKHvULbnZtIrRqhZoA+rxreWpee28JSRH/gy9727u0UCgtpv1M/9WEWY3xySlFa0zQJcqf6oCBJPR5NwkmYpg==" + "resolved" "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-value-parser "^4.2.0" - svgo "^2.7.0" + "postcss-value-parser" "^4.2.0" + "svgo" "^2.7.0" -postcss-unique-selectors@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.4.tgz#08e188126b634ddfa615fb1d6c262bafdd64826e" - integrity sha512-5ampwoSDJCxDPoANBIlMgoBcYUHnhaiuLYJR5pj1DLnYQvMRVyFuTA5C3Bvt+aHtiqWpJkD/lXT50Vo1D0ZsAQ== +"postcss-unique-selectors@^5.0.4": + "integrity" "sha512-5ampwoSDJCxDPoANBIlMgoBcYUHnhaiuLYJR5pj1DLnYQvMRVyFuTA5C3Bvt+aHtiqWpJkD/lXT50Vo1D0ZsAQ==" + "resolved" "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.4.tgz" + "version" "5.0.4" dependencies: - postcss-selector-parser "^6.0.5" + "postcss-selector-parser" "^6.0.5" -postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" - integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== +"postcss-value-parser@^4.1.0", "postcss-value-parser@^4.2.0": + "integrity" "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" + "resolved" "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" + "version" "4.2.0" -postcss-zindex@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-5.0.2.tgz#7e48aee54062c93418593035229ea06b92381251" - integrity sha512-KPQFjQu73H35HLHmE8Wv31ygfQoucxD52oRm4FPFv1emYhFMzUQdF8adaXCevFLIHPRp2rRYfbaDiEqZ4YjVtw== +"postcss-zindex@^5.0.2": + "integrity" "sha512-KPQFjQu73H35HLHmE8Wv31ygfQoucxD52oRm4FPFv1emYhFMzUQdF8adaXCevFLIHPRp2rRYfbaDiEqZ4YjVtw==" + "resolved" "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-5.0.2.tgz" + "version" "5.0.2" -postcss@^8.3.11, postcss@^8.3.5, postcss@^8.3.7, postcss@^8.4.5: - version "8.4.6" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.6.tgz#c5ff3c3c457a23864f32cb45ac9b741498a09ae1" - integrity sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA== +"postcss@^7.0.0 || ^8.0.1", "postcss@^8.0.9", "postcss@^8.1.0", "postcss@^8.2.15", "postcss@^8.2.2", "postcss@^8.3.11", "postcss@^8.3.5", "postcss@^8.3.7", "postcss@^8.4.4", "postcss@^8.4.5": + "integrity" "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==" + "resolved" "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz" + "version" "8.4.6" dependencies: - nanoid "^3.2.0" - picocolors "^1.0.0" - source-map-js "^1.0.2" + "nanoid" "^3.2.0" + "picocolors" "^1.0.0" + "source-map-js" "^1.0.2" -prepend-http@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= +"prepend-http@^2.0.0": + "integrity" "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" + "resolved" "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz" + "version" "2.0.0" -pretty-error@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6" - integrity sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw== +"pretty-error@^4.0.0": + "integrity" "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==" + "resolved" "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz" + "version" "4.0.0" dependencies: - lodash "^4.17.20" - renderkid "^3.0.0" + "lodash" "^4.17.20" + "renderkid" "^3.0.0" -pretty-time@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e" - integrity sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA== +"pretty-time@^1.1.0": + "integrity" "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==" + "resolved" "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz" + "version" "1.1.0" -prism-react-renderer@^1.2.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.1.tgz#88fc9d0df6bed06ca2b9097421349f8c2f24e30d" - integrity sha512-xUeDMEz074d0zc5y6rxiMp/dlC7C+5IDDlaEUlcBOFE2wddz7hz5PNupb087mPwTt7T9BrFmewObfCBuf/LKwQ== +"prism-react-renderer@^1.2.1": + "integrity" "sha512-xUeDMEz074d0zc5y6rxiMp/dlC7C+5IDDlaEUlcBOFE2wddz7hz5PNupb087mPwTt7T9BrFmewObfCBuf/LKwQ==" + "resolved" "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-1.3.1.tgz" + "version" "1.3.1" -prismjs@^1.23.0: - version "1.27.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057" - integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA== +"prismjs@^1.23.0": + "integrity" "sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==" + "resolved" "https://registry.npmjs.org/prismjs/-/prismjs-1.27.0.tgz" + "version" "1.27.0" -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== +"process-nextick-args@~2.0.0": + "integrity" "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + "resolved" "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz" + "version" "2.0.1" -promise@^7.1.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" - integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== +"promise@^7.1.1": + "integrity" "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==" + "resolved" "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz" + "version" "7.3.1" dependencies: - asap "~2.0.3" + "asap" "~2.0.3" -prompts@^2.4.1, prompts@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" - integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q== +"prompts@^2.4.1", "prompts@^2.4.2": + "integrity" "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==" + "resolved" "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz" + "version" "2.4.2" dependencies: - kleur "^3.0.3" - sisteransi "^1.0.5" + "kleur" "^3.0.3" + "sisteransi" "^1.0.5" -prop-types@^15.6.2, prop-types@^15.7.2: - version "15.8.1" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" - integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== +"prop-types@^15.0.0", "prop-types@^15.6.2", "prop-types@^15.7.2": + "integrity" "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==" + "resolved" "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz" + "version" "15.8.1" dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.13.1" + "loose-envify" "^1.4.0" + "object-assign" "^4.1.1" + "react-is" "^16.13.1" -property-information@^5.0.0, property-information@^5.3.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69" - integrity sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA== +"property-information@^5.0.0", "property-information@^5.3.0": + "integrity" "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==" + "resolved" "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz" + "version" "5.6.0" dependencies: - xtend "^4.0.0" + "xtend" "^4.0.0" -proxy-addr@~2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" - integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== +"proxy-addr@~2.0.7": + "integrity" "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==" + "resolved" "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz" + "version" "2.0.7" dependencies: - forwarded "0.2.0" - ipaddr.js "1.9.1" + "forwarded" "0.2.0" + "ipaddr.js" "1.9.1" -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== +"pump@^3.0.0": + "integrity" "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==" + "resolved" "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz" + "version" "3.0.0" dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" + "end-of-stream" "^1.1.0" + "once" "^1.3.1" -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= +"punycode@^1.3.2": + "integrity" "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "resolved" "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz" + "version" "1.4.1" -punycode@^1.3.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= +"punycode@^2.1.0": + "integrity" "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + "resolved" "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz" + "version" "2.1.1" -punycode@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== +"punycode@1.3.2": + "integrity" "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" + "resolved" "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz" + "version" "1.3.2" -pupa@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" - integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== +"pupa@^2.1.1": + "integrity" "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==" + "resolved" "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz" + "version" "2.1.1" dependencies: - escape-goat "^2.0.0" + "escape-goat" "^2.0.0" -pure-color@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz#1fe064fb0ac851f0de61320a8bf796836422f33e" - integrity sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4= +"pure-color@^1.2.0": + "integrity" "sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4=" + "resolved" "https://registry.npmjs.org/pure-color/-/pure-color-1.3.0.tgz" + "version" "1.3.0" -qs@6.9.7: - version "6.9.7" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe" - integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== +"qs@6.9.7": + "integrity" "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==" + "resolved" "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz" + "version" "6.9.7" -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= +"querystring@0.2.0": + "integrity" "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" + "resolved" "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz" + "version" "0.2.0" -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== +"queue-microtask@^1.2.2": + "integrity" "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" + "resolved" "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" + "version" "1.2.3" -queue@6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65" - integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA== +"queue@6.0.2": + "integrity" "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==" + "resolved" "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz" + "version" "6.0.2" dependencies: - inherits "~2.0.3" + "inherits" "~2.0.3" -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== +"randombytes@^2.1.0": + "integrity" "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==" + "resolved" "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz" + "version" "2.1.0" dependencies: - safe-buffer "^5.1.0" + "safe-buffer" "^5.1.0" -range-parser@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" - integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4= +"range-parser@^1.2.1", "range-parser@~1.2.1": + "integrity" "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + "resolved" "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz" + "version" "1.2.1" -range-parser@^1.2.1, range-parser@~1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" - integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== +"range-parser@1.2.0": + "integrity" "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=" + "resolved" "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz" + "version" "1.2.0" -raw-body@2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c" - integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g== +"raw-body@2.4.3": + "integrity" "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==" + "resolved" "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz" + "version" "2.4.3" dependencies: - bytes "3.1.2" - http-errors "1.8.1" - iconv-lite "0.4.24" - unpipe "1.0.0" + "bytes" "3.1.2" + "http-errors" "1.8.1" + "iconv-lite" "0.4.24" + "unpipe" "1.0.0" -rc@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== +"rc@^1.2.8": + "integrity" "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==" + "resolved" "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz" + "version" "1.2.8" dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" + "deep-extend" "^0.6.0" + "ini" "~1.3.0" + "minimist" "^1.2.0" + "strip-json-comments" "~2.0.1" -react-base16-styling@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.6.0.tgz#ef2156d66cf4139695c8a167886cb69ea660792c" - integrity sha1-7yFW1mz0E5aVyKFniGy2nqZgeSw= +"react-base16-styling@^0.6.0": + "integrity" "sha1-7yFW1mz0E5aVyKFniGy2nqZgeSw=" + "resolved" "https://registry.npmjs.org/react-base16-styling/-/react-base16-styling-0.6.0.tgz" + "version" "0.6.0" dependencies: - base16 "^1.0.0" - lodash.curry "^4.0.1" - lodash.flow "^3.3.0" - pure-color "^1.2.0" + "base16" "^1.0.0" + "lodash.curry" "^4.0.1" + "lodash.flow" "^3.3.0" + "pure-color" "^1.2.0" -react-dev-utils@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.0.tgz#4eab12cdb95692a077616770b5988f0adf806526" - integrity sha512-xBQkitdxozPxt1YZ9O1097EJiVpwHr9FoAuEVURCKV0Av8NBERovJauzP7bo1ThvuhZ4shsQ1AJiu4vQpoT1AQ== +"react-dev-utils@^12.0.0": + "integrity" "sha512-xBQkitdxozPxt1YZ9O1097EJiVpwHr9FoAuEVURCKV0Av8NBERovJauzP7bo1ThvuhZ4shsQ1AJiu4vQpoT1AQ==" + "resolved" "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.0.tgz" + "version" "12.0.0" dependencies: "@babel/code-frame" "^7.16.0" - address "^1.1.2" - browserslist "^4.18.1" - chalk "^4.1.2" - cross-spawn "^7.0.3" - detect-port-alt "^1.1.6" - escape-string-regexp "^4.0.0" - filesize "^8.0.6" - find-up "^5.0.0" - fork-ts-checker-webpack-plugin "^6.5.0" - global-modules "^2.0.0" - globby "^11.0.4" - gzip-size "^6.0.0" - immer "^9.0.7" - is-root "^2.1.0" - loader-utils "^3.2.0" - open "^8.4.0" - pkg-up "^3.1.0" - prompts "^2.4.2" - react-error-overlay "^6.0.10" - recursive-readdir "^2.2.2" - shell-quote "^1.7.3" - strip-ansi "^6.0.1" - text-table "^0.2.0" + "address" "^1.1.2" + "browserslist" "^4.18.1" + "chalk" "^4.1.2" + "cross-spawn" "^7.0.3" + "detect-port-alt" "^1.1.6" + "escape-string-regexp" "^4.0.0" + "filesize" "^8.0.6" + "find-up" "^5.0.0" + "fork-ts-checker-webpack-plugin" "^6.5.0" + "global-modules" "^2.0.0" + "globby" "^11.0.4" + "gzip-size" "^6.0.0" + "immer" "^9.0.7" + "is-root" "^2.1.0" + "loader-utils" "^3.2.0" + "open" "^8.4.0" + "pkg-up" "^3.1.0" + "prompts" "^2.4.2" + "react-error-overlay" "^6.0.10" + "recursive-readdir" "^2.2.2" + "shell-quote" "^1.7.3" + "strip-ansi" "^6.0.1" + "text-table" "^0.2.0" -react-dom@^16.10.2: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" - integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw== +"react-dom@*", "react-dom@^16.10.2", "react-dom@^16.8.4 || ^17.0.0", "react-dom@^17.0.0 || ^16.3.0 || ^15.5.4", "react-dom@>= 16.8.0 < 18.0.0": + "integrity" "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==" + "resolved" "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz" + "version" "16.14.0" dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.19.1" + "loose-envify" "^1.1.0" + "object-assign" "^4.1.1" + "prop-types" "^15.6.2" + "scheduler" "^0.19.1" -react-error-overlay@^6.0.10: - version "6.0.10" - resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.10.tgz#0fe26db4fa85d9dbb8624729580e90e7159a59a6" - integrity sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA== +"react-error-overlay@^6.0.10": + "integrity" "sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA==" + "resolved" "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.10.tgz" + "version" "6.0.10" -react-fast-compare@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" - integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== +"react-fast-compare@^3.1.1": + "integrity" "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==" + "resolved" "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz" + "version" "3.2.0" -react-helmet@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726" - integrity sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw== +"react-helmet@^6.1.0": + "integrity" "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==" + "resolved" "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz" + "version" "6.1.0" dependencies: - object-assign "^4.1.1" - prop-types "^15.7.2" - react-fast-compare "^3.1.1" - react-side-effect "^2.1.0" + "object-assign" "^4.1.1" + "prop-types" "^15.7.2" + "react-fast-compare" "^3.1.1" + "react-side-effect" "^2.1.0" -react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" - integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== +"react-is@^16.13.1", "react-is@^16.6.0", "react-is@^16.7.0": + "integrity" "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + "resolved" "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" + "version" "16.13.1" -react-json-view@^1.21.3: - version "1.21.3" - resolved "https://registry.yarnpkg.com/react-json-view/-/react-json-view-1.21.3.tgz#f184209ee8f1bf374fb0c41b0813cff54549c475" - integrity sha512-13p8IREj9/x/Ye4WI/JpjhoIwuzEgUAtgJZNBJckfzJt1qyh24BdTm6UQNGnyTq9dapQdrqvquZTo3dz1X6Cjw== +"react-json-view@^1.21.3": + "integrity" "sha512-13p8IREj9/x/Ye4WI/JpjhoIwuzEgUAtgJZNBJckfzJt1qyh24BdTm6UQNGnyTq9dapQdrqvquZTo3dz1X6Cjw==" + "resolved" "https://registry.npmjs.org/react-json-view/-/react-json-view-1.21.3.tgz" + "version" "1.21.3" dependencies: - flux "^4.0.1" - react-base16-styling "^0.6.0" - react-lifecycles-compat "^3.0.4" - react-textarea-autosize "^8.3.2" + "flux" "^4.0.1" + "react-base16-styling" "^0.6.0" + "react-lifecycles-compat" "^3.0.4" + "react-textarea-autosize" "^8.3.2" -react-lifecycles-compat@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" - integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== +"react-lifecycles-compat@^3.0.4": + "integrity" "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" + "resolved" "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz" + "version" "3.0.4" -react-loadable-ssr-addon-v5-slorber@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/react-loadable-ssr-addon-v5-slorber/-/react-loadable-ssr-addon-v5-slorber-1.0.1.tgz#2cdc91e8a744ffdf9e3556caabeb6e4278689883" - integrity sha512-lq3Lyw1lGku8zUEJPDxsNm1AfYHBrO9Y1+olAYwpUJ2IGFBskM0DMKok97A6LWUpHm+o7IvQBOWu9MLenp9Z+A== +"react-loadable-ssr-addon-v5-slorber@^1.0.1": + "integrity" "sha512-lq3Lyw1lGku8zUEJPDxsNm1AfYHBrO9Y1+olAYwpUJ2IGFBskM0DMKok97A6LWUpHm+o7IvQBOWu9MLenp9Z+A==" + "resolved" "https://registry.npmjs.org/react-loadable-ssr-addon-v5-slorber/-/react-loadable-ssr-addon-v5-slorber-1.0.1.tgz" + "version" "1.0.1" dependencies: "@babel/runtime" "^7.10.3" -react-popupbox@^2.0.8: - version "2.0.8" - resolved "https://registry.yarnpkg.com/react-popupbox/-/react-popupbox-2.0.8.tgz#9e0c96dcf4ddbbea8d03c28ee6c0634f0d51b791" - integrity sha512-5DT0SxLMIchKgnUkdPwTzvFhtTL5SOQd6n5dzUnnELiimjFE8eaQwL1n58NZUxs9oJsHXF3qQNvcgwEfn8VHrw== +"react-loadable@*", "react-loadable@npm:@docusaurus/react-loadable@5.5.2": + "integrity" "sha512-A3dYjdBGuy0IGT+wyLIGIKLRE+sAk1iNk0f1HjNDysO7u8lhL4N3VEm+FAubmJbAztn94F7MxBTPmnixbiyFdQ==" + "resolved" "https://registry.npmjs.org/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz" + "version" "5.5.2" dependencies: - deepmerge "^1.3.2" - react "^16.3.1" + "@types/react" "*" + "prop-types" "^15.6.2" -react-router-config@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/react-router-config/-/react-router-config-5.1.1.tgz#0f4263d1a80c6b2dc7b9c1902c9526478194a988" - integrity sha512-DuanZjaD8mQp1ppHjgnnUnyOlqYXZVjnov/JzFhjLEwd3Z4dYjMSnqrEzzGThH47vpCOqPPwJM2FtthLeJ8Pbg== +"react-popupbox@^2.0.8": + "integrity" "sha512-5DT0SxLMIchKgnUkdPwTzvFhtTL5SOQd6n5dzUnnELiimjFE8eaQwL1n58NZUxs9oJsHXF3qQNvcgwEfn8VHrw==" + "resolved" "https://registry.npmjs.org/react-popupbox/-/react-popupbox-2.0.8.tgz" + "version" "2.0.8" + dependencies: + "deepmerge" "^1.3.2" + "react" "^16.3.1" + +"react-router-config@^5.1.1": + "integrity" "sha512-DuanZjaD8mQp1ppHjgnnUnyOlqYXZVjnov/JzFhjLEwd3Z4dYjMSnqrEzzGThH47vpCOqPPwJM2FtthLeJ8Pbg==" + "resolved" "https://registry.npmjs.org/react-router-config/-/react-router-config-5.1.1.tgz" + "version" "5.1.1" dependencies: "@babel/runtime" "^7.1.2" -react-router-dom@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363" - integrity sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ== +"react-router-dom@^5.2.0": + "integrity" "sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ==" + "resolved" "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.0.tgz" + "version" "5.3.0" dependencies: "@babel/runtime" "^7.12.13" - history "^4.9.0" - loose-envify "^1.3.1" - prop-types "^15.6.2" - react-router "5.2.1" - tiny-invariant "^1.0.2" - tiny-warning "^1.0.0" + "history" "^4.9.0" + "loose-envify" "^1.3.1" + "prop-types" "^15.6.2" + "react-router" "5.2.1" + "tiny-invariant" "^1.0.2" + "tiny-warning" "^1.0.0" -react-router@5.2.1, react-router@^5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d" - integrity sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ== +"react-router@^5.2.0", "react-router@>=5", "react-router@5.2.1": + "integrity" "sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ==" + "resolved" "https://registry.npmjs.org/react-router/-/react-router-5.2.1.tgz" + "version" "5.2.1" dependencies: "@babel/runtime" "^7.12.13" - history "^4.9.0" - hoist-non-react-statics "^3.1.0" - loose-envify "^1.3.1" - mini-create-react-context "^0.4.0" - path-to-regexp "^1.7.0" - prop-types "^15.6.2" - react-is "^16.6.0" - tiny-invariant "^1.0.2" - tiny-warning "^1.0.0" + "history" "^4.9.0" + "hoist-non-react-statics" "^3.1.0" + "loose-envify" "^1.3.1" + "mini-create-react-context" "^0.4.0" + "path-to-regexp" "^1.7.0" + "prop-types" "^15.6.2" + "react-is" "^16.6.0" + "tiny-invariant" "^1.0.2" + "tiny-warning" "^1.0.0" -react-side-effect@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3" - integrity sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ== +"react-side-effect@^2.1.0": + "integrity" "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==" + "resolved" "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz" + "version" "2.1.1" -react-textarea-autosize@^8.3.2: - version "8.3.3" - resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz#f70913945369da453fd554c168f6baacd1fa04d8" - integrity sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ== +"react-textarea-autosize@^8.3.2": + "integrity" "sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ==" + "resolved" "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz" + "version" "8.3.3" dependencies: "@babel/runtime" "^7.10.2" - use-composed-ref "^1.0.0" - use-latest "^1.0.0" + "use-composed-ref" "^1.0.0" + "use-latest" "^1.0.0" -react@^16.10.2, react@^16.3.1: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" - integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g== +"react@*", "react@^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0", "react@^15.0.2 || ^16.0.0 || ^17.0.0", "react@^16.10.2", "react@^16.13.1", "react@^16.13.1 || ^17.0.0", "react@^16.14.0", "react@^16.3.0 || ^17.0.0", "react@^16.3.1", "react@^16.8.0 || ^17.0.0", "react@^16.8.4 || ^17.0.0", "react@^17.0.0 || ^16.3.0 || ^15.5.4", "react@>= 16.8.0 < 18.0.0", "react@>=0.14.9", "react@>=15", "react@>=16.3.0": + "integrity" "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==" + "resolved" "https://registry.npmjs.org/react/-/react-16.14.0.tgz" + "version" "16.14.0" dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" + "loose-envify" "^1.1.0" + "object-assign" "^4.1.1" + "prop-types" "^15.6.2" -readable-stream@^2.0.1: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== +"readable-stream@^2.0.1": + "integrity" "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==" + "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz" + "version" "2.3.7" dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" + "core-util-is" "~1.0.0" + "inherits" "~2.0.3" + "isarray" "~1.0.0" + "process-nextick-args" "~2.0.0" + "safe-buffer" "~5.1.1" + "string_decoder" "~1.1.1" + "util-deprecate" "~1.0.1" -readable-stream@^3.0.6, readable-stream@^3.1.1: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== +"readable-stream@^3.0.6", "readable-stream@^3.1.1": + "integrity" "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==" + "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz" + "version" "3.6.0" dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" + "inherits" "^2.0.3" + "string_decoder" "^1.1.1" + "util-deprecate" "^1.0.1" -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== +"readdirp@~3.6.0": + "integrity" "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==" + "resolved" "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz" + "version" "3.6.0" dependencies: - picomatch "^2.2.1" + "picomatch" "^2.2.1" -reading-time@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/reading-time/-/reading-time-1.5.0.tgz#d2a7f1b6057cb2e169beaf87113cc3411b5bc5bb" - integrity sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg== +"reading-time@^1.5.0": + "integrity" "sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg==" + "resolved" "https://registry.npmjs.org/reading-time/-/reading-time-1.5.0.tgz" + "version" "1.5.0" -rechoir@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" - integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= +"rechoir@^0.6.2": + "integrity" "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=" + "resolved" "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz" + "version" "0.6.2" dependencies: - resolve "^1.1.6" + "resolve" "^1.1.6" -recursive-readdir@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f" - integrity sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg== +"recursive-readdir@^2.2.2": + "integrity" "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==" + "resolved" "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz" + "version" "2.2.2" dependencies: - minimatch "3.0.4" + "minimatch" "3.0.4" -regenerate-unicode-properties@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56" - integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw== +"regenerate-unicode-properties@^10.0.1": + "integrity" "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==" + "resolved" "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz" + "version" "10.0.1" dependencies: - regenerate "^1.4.2" + "regenerate" "^1.4.2" -regenerate-unicode-properties@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" - integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA== +"regenerate-unicode-properties@^9.0.0": + "integrity" "sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==" + "resolved" "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz" + "version" "9.0.0" dependencies: - regenerate "^1.4.2" + "regenerate" "^1.4.2" -regenerate@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" - integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== +"regenerate@^1.4.2": + "integrity" "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" + "resolved" "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz" + "version" "1.4.2" -regenerator-runtime@^0.13.4: - version "0.13.9" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" - integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== +"regenerator-runtime@^0.13.4": + "integrity" "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + "resolved" "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz" + "version" "0.13.9" -regenerator-transform@^0.14.2: - version "0.14.5" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" - integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw== +"regenerator-transform@^0.14.2": + "integrity" "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==" + "resolved" "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz" + "version" "0.14.5" dependencies: "@babel/runtime" "^7.8.4" -regexp.prototype.flags@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307" - integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ== +"regexp.prototype.flags@^1.2.0": + "integrity" "sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==" + "resolved" "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz" + "version" "1.4.1" dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" + "call-bind" "^1.0.2" + "define-properties" "^1.1.3" -regexpu-core@^4.5.4: - version "4.8.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" - integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg== +"regexpu-core@^4.5.4": + "integrity" "sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==" + "resolved" "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz" + "version" "4.8.0" dependencies: - regenerate "^1.4.2" - regenerate-unicode-properties "^9.0.0" - regjsgen "^0.5.2" - regjsparser "^0.7.0" - unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.0.0" + "regenerate" "^1.4.2" + "regenerate-unicode-properties" "^9.0.0" + "regjsgen" "^0.5.2" + "regjsparser" "^0.7.0" + "unicode-match-property-ecmascript" "^2.0.0" + "unicode-match-property-value-ecmascript" "^2.0.0" -regexpu-core@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3" - integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw== +"regexpu-core@^5.0.1": + "integrity" "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==" + "resolved" "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz" + "version" "5.0.1" dependencies: - regenerate "^1.4.2" - regenerate-unicode-properties "^10.0.1" - regjsgen "^0.6.0" - regjsparser "^0.8.2" - unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.0.0" + "regenerate" "^1.4.2" + "regenerate-unicode-properties" "^10.0.1" + "regjsgen" "^0.6.0" + "regjsparser" "^0.8.2" + "unicode-match-property-ecmascript" "^2.0.0" + "unicode-match-property-value-ecmascript" "^2.0.0" -registry-auth-token@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" - integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== +"registry-auth-token@^4.0.0": + "integrity" "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==" + "resolved" "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz" + "version" "4.2.1" dependencies: - rc "^1.2.8" + "rc" "^1.2.8" -registry-url@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" - integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== +"registry-url@^5.0.0": + "integrity" "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==" + "resolved" "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz" + "version" "5.1.0" dependencies: - rc "^1.2.8" + "rc" "^1.2.8" -regjsgen@^0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" - integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== +"regjsgen@^0.5.2": + "integrity" "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==" + "resolved" "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz" + "version" "0.5.2" -regjsgen@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d" - integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA== +"regjsgen@^0.6.0": + "integrity" "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==" + "resolved" "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz" + "version" "0.6.0" -regjsparser@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968" - integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ== +"regjsparser@^0.7.0": + "integrity" "sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==" + "resolved" "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz" + "version" "0.7.0" dependencies: - jsesc "~0.5.0" + "jsesc" "~0.5.0" -regjsparser@^0.8.2: - version "0.8.4" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f" - integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA== +"regjsparser@^0.8.2": + "integrity" "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==" + "resolved" "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz" + "version" "0.8.4" dependencies: - jsesc "~0.5.0" + "jsesc" "~0.5.0" -rehype-parse@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/rehype-parse/-/rehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" - integrity sha512-0S3CpvpTAgGmnz8kiCyFLGuW5yA4OQhyNTm/nwPopZ7+PI11WnGl1TTWTGv/2hPEe/g2jRLlhVVSsoDH8waRug== +"rehype-parse@^6.0.2": + "integrity" "sha512-0S3CpvpTAgGmnz8kiCyFLGuW5yA4OQhyNTm/nwPopZ7+PI11WnGl1TTWTGv/2hPEe/g2jRLlhVVSsoDH8waRug==" + "resolved" "https://registry.npmjs.org/rehype-parse/-/rehype-parse-6.0.2.tgz" + "version" "6.0.2" dependencies: - hast-util-from-parse5 "^5.0.0" - parse5 "^5.0.0" - xtend "^4.0.0" + "hast-util-from-parse5" "^5.0.0" + "parse5" "^5.0.0" + "xtend" "^4.0.0" -relateurl@^0.2.7: - version "0.2.7" - resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" - integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= +"relateurl@^0.2.7": + "integrity" "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=" + "resolved" "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz" + "version" "0.2.7" -remark-admonitions@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/remark-admonitions/-/remark-admonitions-1.2.1.tgz#87caa1a442aa7b4c0cafa04798ed58a342307870" - integrity sha512-Ji6p68VDvD+H1oS95Fdx9Ar5WA2wcDA4kwrrhVU7fGctC6+d3uiMICu7w7/2Xld+lnU7/gi+432+rRbup5S8ow== +"remark-admonitions@^1.2.1": + "integrity" "sha512-Ji6p68VDvD+H1oS95Fdx9Ar5WA2wcDA4kwrrhVU7fGctC6+d3uiMICu7w7/2Xld+lnU7/gi+432+rRbup5S8ow==" + "resolved" "https://registry.npmjs.org/remark-admonitions/-/remark-admonitions-1.2.1.tgz" + "version" "1.2.1" dependencies: - rehype-parse "^6.0.2" - unified "^8.4.2" - unist-util-visit "^2.0.1" + "rehype-parse" "^6.0.2" + "unified" "^8.4.2" + "unist-util-visit" "^2.0.1" -remark-emoji@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/remark-emoji/-/remark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" - integrity sha512-P3cj9s5ggsUvWw5fS2uzCHJMGuXYRb0NnZqYlNecewXt8QBU9n5vW3DUUKOhepS8F9CwdMx9B8a3i7pqFWAI5w== +"remark-emoji@^2.1.0": + "integrity" "sha512-P3cj9s5ggsUvWw5fS2uzCHJMGuXYRb0NnZqYlNecewXt8QBU9n5vW3DUUKOhepS8F9CwdMx9B8a3i7pqFWAI5w==" + "resolved" "https://registry.npmjs.org/remark-emoji/-/remark-emoji-2.2.0.tgz" + "version" "2.2.0" dependencies: - emoticon "^3.2.0" - node-emoji "^1.10.0" - unist-util-visit "^2.0.3" + "emoticon" "^3.2.0" + "node-emoji" "^1.10.0" + "unist-util-visit" "^2.0.3" -remark-footnotes@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/remark-footnotes/-/remark-footnotes-2.0.0.tgz#9001c4c2ffebba55695d2dd80ffb8b82f7e6303f" - integrity sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ== +"remark-footnotes@2.0.0": + "integrity" "sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==" + "resolved" "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-2.0.0.tgz" + "version" "2.0.0" -remark-mdx-remove-exports@^1.6.22: - version "1.6.22" - resolved "https://registry.yarnpkg.com/remark-mdx-remove-exports/-/remark-mdx-remove-exports-1.6.22.tgz#9e34f3d02c9c54b02ca0a1fde946449338d06ecb" - integrity sha512-7g2uiTmTGfz5QyVb+toeX25frbk1Y6yd03RXGPtqx0+DVh86Gb7MkNYbk7H2X27zdZ3CQv1W/JqlFO0Oo8IxVA== +"remark-mdx-remove-exports@^1.6.22": + "integrity" "sha512-7g2uiTmTGfz5QyVb+toeX25frbk1Y6yd03RXGPtqx0+DVh86Gb7MkNYbk7H2X27zdZ3CQv1W/JqlFO0Oo8IxVA==" + "resolved" "https://registry.npmjs.org/remark-mdx-remove-exports/-/remark-mdx-remove-exports-1.6.22.tgz" + "version" "1.6.22" dependencies: - unist-util-remove "2.0.0" + "unist-util-remove" "2.0.0" -remark-mdx-remove-imports@^1.6.22: - version "1.6.22" - resolved "https://registry.yarnpkg.com/remark-mdx-remove-imports/-/remark-mdx-remove-imports-1.6.22.tgz#79f711c95359cff437a120d1fbdc1326ec455826" - integrity sha512-lmjAXD8Ltw0TsvBzb45S+Dxx7LTJAtDaMneMAv8LAUIPEyYoKkmGbmVsiF0/pY6mhM1Q16swCmu1TN+ie/vn/A== +"remark-mdx-remove-imports@^1.6.22": + "integrity" "sha512-lmjAXD8Ltw0TsvBzb45S+Dxx7LTJAtDaMneMAv8LAUIPEyYoKkmGbmVsiF0/pY6mhM1Q16swCmu1TN+ie/vn/A==" + "resolved" "https://registry.npmjs.org/remark-mdx-remove-imports/-/remark-mdx-remove-imports-1.6.22.tgz" + "version" "1.6.22" dependencies: - unist-util-remove "2.0.0" + "unist-util-remove" "2.0.0" -remark-mdx@1.6.22: - version "1.6.22" - resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd" - integrity sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ== +"remark-mdx@1.6.22": + "integrity" "sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ==" + "resolved" "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.22.tgz" + "version" "1.6.22" dependencies: "@babel/core" "7.12.9" "@babel/helper-plugin-utils" "7.10.4" "@babel/plugin-proposal-object-rest-spread" "7.12.1" "@babel/plugin-syntax-jsx" "7.12.1" "@mdx-js/util" "1.6.22" - is-alphabetical "1.0.4" - remark-parse "8.0.3" - unified "9.2.0" + "is-alphabetical" "1.0.4" + "remark-parse" "8.0.3" + "unified" "9.2.0" -remark-parse@8.0.3: - version "8.0.3" - resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" - integrity sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q== +"remark-parse@8.0.3": + "integrity" "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==" + "resolved" "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz" + "version" "8.0.3" dependencies: - ccount "^1.0.0" - collapse-white-space "^1.0.2" - is-alphabetical "^1.0.0" - is-decimal "^1.0.0" - is-whitespace-character "^1.0.0" - is-word-character "^1.0.0" - markdown-escapes "^1.0.0" - parse-entities "^2.0.0" - repeat-string "^1.5.4" - state-toggle "^1.0.0" - trim "0.0.1" - trim-trailing-lines "^1.0.0" - unherit "^1.0.4" - unist-util-remove-position "^2.0.0" - vfile-location "^3.0.0" - xtend "^4.0.1" + "ccount" "^1.0.0" + "collapse-white-space" "^1.0.2" + "is-alphabetical" "^1.0.0" + "is-decimal" "^1.0.0" + "is-whitespace-character" "^1.0.0" + "is-word-character" "^1.0.0" + "markdown-escapes" "^1.0.0" + "parse-entities" "^2.0.0" + "repeat-string" "^1.5.4" + "state-toggle" "^1.0.0" + "trim" "0.0.1" + "trim-trailing-lines" "^1.0.0" + "unherit" "^1.0.4" + "unist-util-remove-position" "^2.0.0" + "vfile-location" "^3.0.0" + "xtend" "^4.0.1" -remark-squeeze-paragraphs@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz#76eb0e085295131c84748c8e43810159c5653ead" - integrity sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw== +"remark-squeeze-paragraphs@4.0.0": + "integrity" "sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==" + "resolved" "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz" + "version" "4.0.0" dependencies: - mdast-squeeze-paragraphs "^4.0.0" + "mdast-squeeze-paragraphs" "^4.0.0" -remarkable-admonitions@^0.2.1: - version "0.2.2" - resolved "https://registry.yarnpkg.com/remarkable-admonitions/-/remarkable-admonitions-0.2.2.tgz#8765f9ec66be4f4c651a4e1cfb559dd7f920819c" - integrity sha512-CcMTEcLYmJLXX3IVMk4LyW4oFD2NQxh5FeLzn4k89TAPpyWIeVix/B/g/gDbZAUpCNY9l6heovR5NNIktf8X5A== +"remarkable-admonitions@^0.2.1": + "integrity" "sha512-CcMTEcLYmJLXX3IVMk4LyW4oFD2NQxh5FeLzn4k89TAPpyWIeVix/B/g/gDbZAUpCNY9l6heovR5NNIktf8X5A==" + "resolved" "https://registry.npmjs.org/remarkable-admonitions/-/remarkable-admonitions-0.2.2.tgz" + "version" "0.2.2" -renderkid@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a" - integrity sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg== +"renderkid@^3.0.0": + "integrity" "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==" + "resolved" "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz" + "version" "3.0.0" dependencies: - css-select "^4.1.3" - dom-converter "^0.2.0" - htmlparser2 "^6.1.0" - lodash "^4.17.21" - strip-ansi "^6.0.1" + "css-select" "^4.1.3" + "dom-converter" "^0.2.0" + "htmlparser2" "^6.1.0" + "lodash" "^4.17.21" + "strip-ansi" "^6.0.1" -repeat-string@^1.5.4: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= +"repeat-string@^1.5.4": + "integrity" "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + "resolved" "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz" + "version" "1.6.1" -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== +"require-from-string@^2.0.2": + "integrity" "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" + "resolved" "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz" + "version" "2.0.2" "require-like@>= 0.1.1": - version "0.1.2" - resolved "https://registry.yarnpkg.com/require-like/-/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa" - integrity sha1-rW8wwTvs15cBDEaK+ndcDAprR/o= + "integrity" "sha1-rW8wwTvs15cBDEaK+ndcDAprR/o=" + "resolved" "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz" + "version" "0.1.2" -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= +"requires-port@^1.0.0": + "integrity" "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" + "resolved" "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz" + "version" "1.0.0" -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" - integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== +"resolve-from@^4.0.0": + "integrity" "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + "resolved" "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz" + "version" "4.0.0" -resolve-pathname@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" - integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng== +"resolve-pathname@^3.0.0": + "integrity" "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==" + "resolved" "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz" + "version" "3.0.0" -resolve@^1.1.6, resolve@^1.14.2, resolve@^1.3.2: - version "1.22.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" - integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== +"resolve@^1.1.6", "resolve@^1.14.2", "resolve@^1.3.2": + "integrity" "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==" + "resolved" "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz" + "version" "1.22.0" dependencies: - is-core-module "^2.8.1" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" + "is-core-module" "^2.8.1" + "path-parse" "^1.0.7" + "supports-preserve-symlinks-flag" "^1.0.0" -responselike@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= +"responselike@^1.0.2": + "integrity" "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=" + "resolved" "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz" + "version" "1.0.2" dependencies: - lowercase-keys "^1.0.0" + "lowercase-keys" "^1.0.0" -retry@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" - integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== +"retry@^0.13.1": + "integrity" "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==" + "resolved" "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz" + "version" "0.13.1" -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== +"reusify@^1.0.4": + "integrity" "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==" + "resolved" "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz" + "version" "1.0.4" -rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== +"rimraf@^3.0.2": + "integrity" "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==" + "resolved" "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" + "version" "3.0.2" dependencies: - glob "^7.1.3" + "glob" "^7.1.3" -rtl-detect@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/rtl-detect/-/rtl-detect-1.0.4.tgz#40ae0ea7302a150b96bc75af7d749607392ecac6" - integrity sha512-EBR4I2VDSSYr7PkBmFy04uhycIpDKp+21p/jARYXlCSjQksTBQcJ0HFUPOO79EPPH5JS6VAhiIQbycf0O3JAxQ== +"rtl-detect@^1.0.4": + "integrity" "sha512-EBR4I2VDSSYr7PkBmFy04uhycIpDKp+21p/jARYXlCSjQksTBQcJ0HFUPOO79EPPH5JS6VAhiIQbycf0O3JAxQ==" + "resolved" "https://registry.npmjs.org/rtl-detect/-/rtl-detect-1.0.4.tgz" + "version" "1.0.4" -rtlcss@^3.3.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/rtlcss/-/rtlcss-3.5.0.tgz#c9eb91269827a102bac7ae3115dd5d049de636c3" - integrity sha512-wzgMaMFHQTnyi9YOwsx9LjOxYXJPzS8sYnFaKm6R5ysvTkwzHiB0vxnbHwchHQT65PTdBjDG21/kQBWI7q9O7A== +"rtlcss@^3.3.0": + "integrity" "sha512-wzgMaMFHQTnyi9YOwsx9LjOxYXJPzS8sYnFaKm6R5ysvTkwzHiB0vxnbHwchHQT65PTdBjDG21/kQBWI7q9O7A==" + "resolved" "https://registry.npmjs.org/rtlcss/-/rtlcss-3.5.0.tgz" + "version" "3.5.0" dependencies: - find-up "^5.0.0" - picocolors "^1.0.0" - postcss "^8.3.11" - strip-json-comments "^3.1.1" + "find-up" "^5.0.0" + "picocolors" "^1.0.0" + "postcss" "^8.3.11" + "strip-json-comments" "^3.1.1" -run-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== +"run-parallel@^1.1.9": + "integrity" "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==" + "resolved" "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz" + "version" "1.2.0" dependencies: - queue-microtask "^1.2.2" + "queue-microtask" "^1.2.2" -rxjs@^7.5.4: - version "7.5.4" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.4.tgz#3d6bd407e6b7ce9a123e76b1e770dc5761aa368d" - integrity sha512-h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ== +"rxjs@^7.5.4": + "integrity" "sha512-h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ==" + "resolved" "https://registry.npmjs.org/rxjs/-/rxjs-7.5.4.tgz" + "version" "7.5.4" dependencies: - tslib "^2.1.0" + "tslib" "^2.1.0" -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== +"safe-buffer@^5.0.1", "safe-buffer@^5.1.0", "safe-buffer@>=5.1.0", "safe-buffer@~5.2.0", "safe-buffer@5.2.1": + "integrity" "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" + "version" "5.2.1" -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +"safe-buffer@~5.1.0", "safe-buffer@~5.1.1": + "integrity" "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" + "version" "5.1.2" + +"safe-buffer@5.1.2": + "integrity" "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" + "version" "5.1.2" "safer-buffer@>= 2.1.2 < 3": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + "integrity" "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "resolved" "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" + "version" "2.1.2" -sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +"sax@^1.2.4": + "integrity" "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + "resolved" "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz" + "version" "1.2.4" -scheduler@^0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" - integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== +"scheduler@^0.19.1": + "integrity" "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==" + "resolved" "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz" + "version" "0.19.1" dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" + "loose-envify" "^1.1.0" + "object-assign" "^4.1.1" -schema-utils@2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" - integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A== - dependencies: - "@types/json-schema" "^7.0.4" - ajv "^6.12.2" - ajv-keywords "^3.4.1" - -schema-utils@^2.6.5: - version "2.7.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" - integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== +"schema-utils@^2.6.5": + "integrity" "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==" + "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz" + "version" "2.7.1" dependencies: "@types/json-schema" "^7.0.5" - ajv "^6.12.4" - ajv-keywords "^3.5.2" + "ajv" "^6.12.4" + "ajv-keywords" "^3.5.2" -schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== +"schema-utils@^3.0.0", "schema-utils@^3.1.0", "schema-utils@^3.1.1": + "integrity" "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==" + "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz" + "version" "3.1.1" dependencies: "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" + "ajv" "^6.12.5" + "ajv-keywords" "^3.5.2" -schema-utils@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" - integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== +"schema-utils@^4.0.0": + "integrity" "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==" + "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz" + "version" "4.0.0" dependencies: "@types/json-schema" "^7.0.9" - ajv "^8.8.0" - ajv-formats "^2.1.1" - ajv-keywords "^5.0.0" + "ajv" "^8.8.0" + "ajv-formats" "^2.1.1" + "ajv-keywords" "^5.0.0" -section-matter@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167" - integrity sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA== +"schema-utils@2.7.0": + "integrity" "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==" + "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz" + "version" "2.7.0" dependencies: - extend-shallow "^2.0.1" - kind-of "^6.0.0" + "@types/json-schema" "^7.0.4" + "ajv" "^6.12.2" + "ajv-keywords" "^3.4.1" -select-hose@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" - integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= - -selfsigned@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.0.tgz#e927cd5377cbb0a1075302cff8df1042cc2bce5b" - integrity sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ== +"section-matter@^1.0.0": + "integrity" "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==" + "resolved" "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz" + "version" "1.0.0" dependencies: - node-forge "^1.2.0" + "extend-shallow" "^2.0.1" + "kind-of" "^6.0.0" -semver-diff@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" - integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== +"select-hose@^2.0.0": + "integrity" "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=" + "resolved" "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz" + "version" "2.0.0" + +"selfsigned@^2.0.0": + "integrity" "sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ==" + "resolved" "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.0.tgz" + "version" "2.0.0" dependencies: - semver "^6.3.0" + "node-forge" "^1.2.0" -semver@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" - integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== - -semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== +"semver-diff@^3.1.1": + "integrity" "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==" + "resolved" "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz" + "version" "3.1.1" dependencies: - lru-cache "^6.0.0" + "semver" "^6.3.0" -send@0.17.2: - version "0.17.2" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" - integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww== +"semver@^5.4.1": + "integrity" "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "resolved" "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" + "version" "5.7.1" + +"semver@^6.0.0", "semver@^6.1.1", "semver@^6.1.2", "semver@^6.2.0", "semver@^6.3.0": + "integrity" "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "resolved" "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" + "version" "6.3.0" + +"semver@^7.3.2": + "integrity" "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==" + "resolved" "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz" + "version" "7.3.5" dependencies: - debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "1.8.1" - mime "1.6.0" - ms "2.1.3" - on-finished "~2.3.0" - range-parser "~1.2.1" - statuses "~1.5.0" + "lru-cache" "^6.0.0" -serialize-javascript@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== +"semver@^7.3.4": + "integrity" "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==" + "resolved" "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz" + "version" "7.3.5" dependencies: - randombytes "^2.1.0" + "lru-cache" "^6.0.0" -serve-handler@^6.1.3: - version "6.1.3" - resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.3.tgz#1bf8c5ae138712af55c758477533b9117f6435e8" - integrity sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w== +"semver@^7.3.5": + "integrity" "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==" + "resolved" "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz" + "version" "7.3.5" dependencies: - bytes "3.0.0" - content-disposition "0.5.2" - fast-url-parser "1.1.3" - mime-types "2.1.18" - minimatch "3.0.4" - path-is-inside "1.0.2" - path-to-regexp "2.2.1" - range-parser "1.2.0" + "lru-cache" "^6.0.0" -serve-index@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" - integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= +"semver@7.0.0": + "integrity" "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==" + "resolved" "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz" + "version" "7.0.0" + +"send@0.17.2": + "integrity" "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==" + "resolved" "https://registry.npmjs.org/send/-/send-0.17.2.tgz" + "version" "0.17.2" dependencies: - accepts "~1.3.4" - batch "0.6.1" - debug "2.6.9" - escape-html "~1.0.3" - http-errors "~1.6.2" - mime-types "~2.1.17" - parseurl "~1.3.2" + "debug" "2.6.9" + "depd" "~1.1.2" + "destroy" "~1.0.4" + "encodeurl" "~1.0.2" + "escape-html" "~1.0.3" + "etag" "~1.8.1" + "fresh" "0.5.2" + "http-errors" "1.8.1" + "mime" "1.6.0" + "ms" "2.1.3" + "on-finished" "~2.3.0" + "range-parser" "~1.2.1" + "statuses" "~1.5.0" -serve-static@1.14.2: - version "1.14.2" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa" - integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ== +"serialize-javascript@^6.0.0": + "integrity" "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==" + "resolved" "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz" + "version" "6.0.0" dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.17.2" + "randombytes" "^2.1.0" -setimmediate@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= - -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== - -setprototypeof@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" - integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== - -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== +"serve-handler@^6.1.3": + "integrity" "sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w==" + "resolved" "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.3.tgz" + "version" "6.1.3" dependencies: - kind-of "^6.0.2" + "bytes" "3.0.0" + "content-disposition" "0.5.2" + "fast-url-parser" "1.1.3" + "mime-types" "2.1.18" + "minimatch" "3.0.4" + "path-is-inside" "1.0.2" + "path-to-regexp" "2.2.1" + "range-parser" "1.2.0" -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== +"serve-index@^1.9.1": + "integrity" "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=" + "resolved" "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz" + "version" "1.9.1" dependencies: - shebang-regex "^3.0.0" + "accepts" "~1.3.4" + "batch" "0.6.1" + "debug" "2.6.9" + "escape-html" "~1.0.3" + "http-errors" "~1.6.2" + "mime-types" "~2.1.17" + "parseurl" "~1.3.2" -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -shell-quote@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" - integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== - -shelljs@^0.8.4: - version "0.8.5" - resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c" - integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow== +"serve-static@1.14.2": + "integrity" "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==" + "resolved" "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz" + "version" "1.14.2" dependencies: - glob "^7.0.0" - interpret "^1.0.0" - rechoir "^0.6.2" + "encodeurl" "~1.0.2" + "escape-html" "~1.0.3" + "parseurl" "~1.3.3" + "send" "0.17.2" -signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== +"setimmediate@^1.0.5": + "integrity" "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + "resolved" "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz" + "version" "1.0.5" -sirv@^1.0.7: - version "1.0.19" - resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49" - integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ== +"setprototypeof@1.1.0": + "integrity" "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" + "resolved" "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz" + "version" "1.1.0" + +"setprototypeof@1.2.0": + "integrity" "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + "resolved" "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz" + "version" "1.2.0" + +"shallow-clone@^3.0.0": + "integrity" "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==" + "resolved" "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz" + "version" "3.0.1" + dependencies: + "kind-of" "^6.0.2" + +"shebang-command@^2.0.0": + "integrity" "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==" + "resolved" "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz" + "version" "2.0.0" + dependencies: + "shebang-regex" "^3.0.0" + +"shebang-regex@^3.0.0": + "integrity" "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + "resolved" "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz" + "version" "3.0.0" + +"shell-quote@^1.7.3": + "integrity" "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==" + "resolved" "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz" + "version" "1.7.3" + +"shelljs@^0.8.4": + "integrity" "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==" + "resolved" "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz" + "version" "0.8.5" + dependencies: + "glob" "^7.0.0" + "interpret" "^1.0.0" + "rechoir" "^0.6.2" + +"signal-exit@^3.0.2", "signal-exit@^3.0.3": + "integrity" "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + "resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz" + "version" "3.0.7" + +"sirv@^1.0.7": + "integrity" "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==" + "resolved" "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz" + "version" "1.0.19" dependencies: "@polka/url" "^1.0.0-next.20" - mrmime "^1.0.0" - totalist "^1.0.0" + "mrmime" "^1.0.0" + "totalist" "^1.0.0" -sisteransi@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" - integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== +"sisteransi@^1.0.5": + "integrity" "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" + "resolved" "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz" + "version" "1.0.5" -sitemap@^7.0.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/sitemap/-/sitemap-7.1.1.tgz#eeed9ad6d95499161a3eadc60f8c6dce4bea2bef" - integrity sha512-mK3aFtjz4VdJN0igpIJrinf3EO8U8mxOPsTBzSsy06UtjZQJ3YY3o3Xa7zSc5nMqcMrRwlChHZ18Kxg0caiPBg== +"sitemap@^7.0.0": + "integrity" "sha512-mK3aFtjz4VdJN0igpIJrinf3EO8U8mxOPsTBzSsy06UtjZQJ3YY3o3Xa7zSc5nMqcMrRwlChHZ18Kxg0caiPBg==" + "resolved" "https://registry.npmjs.org/sitemap/-/sitemap-7.1.1.tgz" + "version" "7.1.1" dependencies: "@types/node" "^17.0.5" "@types/sax" "^1.2.1" - arg "^5.0.0" - sax "^1.2.4" + "arg" "^5.0.0" + "sax" "^1.2.4" -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== +"slash@^3.0.0": + "integrity" "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" + "resolved" "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz" + "version" "3.0.0" -slash@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" - integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== +"slash@^4.0.0": + "integrity" "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==" + "resolved" "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz" + "version" "4.0.0" -sockjs@^0.3.21: - version "0.3.24" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" - integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== +"sockjs@^0.3.21": + "integrity" "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==" + "resolved" "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz" + "version" "0.3.24" dependencies: - faye-websocket "^0.11.3" - uuid "^8.3.2" - websocket-driver "^0.7.4" + "faye-websocket" "^0.11.3" + "uuid" "^8.3.2" + "websocket-driver" "^0.7.4" -sort-css-media-queries@2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/sort-css-media-queries/-/sort-css-media-queries-2.0.4.tgz#b2badfa519cb4a938acbc6d3aaa913d4949dc908" - integrity sha512-PAIsEK/XupCQwitjv7XxoMvYhT7EAfyzI3hsy/MyDgTvc+Ft55ctdkctJLOy6cQejaIC+zjpUL4djFVm2ivOOw== +"sort-css-media-queries@2.0.4": + "integrity" "sha512-PAIsEK/XupCQwitjv7XxoMvYhT7EAfyzI3hsy/MyDgTvc+Ft55ctdkctJLOy6cQejaIC+zjpUL4djFVm2ivOOw==" + "resolved" "https://registry.npmjs.org/sort-css-media-queries/-/sort-css-media-queries-2.0.4.tgz" + "version" "2.0.4" -source-list-map@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" - integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== +"source-list-map@^2.0.0": + "integrity" "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==" + "resolved" "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz" + "version" "2.0.1" -source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== +"source-map-js@^1.0.2": + "integrity" "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" + "resolved" "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" + "version" "1.0.2" -source-map-support@~0.5.20: - version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== +"source-map-support@~0.5.20": + "integrity" "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==" + "resolved" "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz" + "version" "0.5.21" dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" + "buffer-from" "^1.0.0" + "source-map" "^0.6.0" -source-map@^0.5.0: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= +"source-map@^0.5.0": + "integrity" "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" + "version" "0.5.7" -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +"source-map@^0.6.0", "source-map@^0.6.1", "source-map@~0.6.0", "source-map@~0.6.1": + "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" + "version" "0.6.1" -sourcemap-codec@^1.4.4: - version "1.4.8" - resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" - integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== +"sourcemap-codec@^1.4.4": + "integrity" "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==" + "resolved" "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz" + "version" "1.4.8" -space-separated-tokens@^1.0.0: - version "1.1.5" - resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899" - integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA== +"space-separated-tokens@^1.0.0": + "integrity" "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==" + "resolved" "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz" + "version" "1.1.5" -spdy-transport@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" - integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== +"spdy-transport@^3.0.0": + "integrity" "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==" + "resolved" "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz" + "version" "3.0.0" dependencies: - debug "^4.1.0" - detect-node "^2.0.4" - hpack.js "^2.1.6" - obuf "^1.1.2" - readable-stream "^3.0.6" - wbuf "^1.7.3" + "debug" "^4.1.0" + "detect-node" "^2.0.4" + "hpack.js" "^2.1.6" + "obuf" "^1.1.2" + "readable-stream" "^3.0.6" + "wbuf" "^1.7.3" -spdy@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" - integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== +"spdy@^4.0.2": + "integrity" "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==" + "resolved" "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz" + "version" "4.0.2" dependencies: - debug "^4.1.0" - handle-thing "^2.0.0" - http-deceiver "^1.2.7" - select-hose "^2.0.0" - spdy-transport "^3.0.0" + "debug" "^4.1.0" + "handle-thing" "^2.0.0" + "http-deceiver" "^1.2.7" + "select-hose" "^2.0.0" + "spdy-transport" "^3.0.0" -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= +"sprintf-js@~1.0.2": + "integrity" "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "resolved" "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" + "version" "1.0.3" -stable@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" - integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== +"stable@^0.1.8": + "integrity" "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==" + "resolved" "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz" + "version" "0.1.8" -state-toggle@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" - integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ== +"state-toggle@^1.0.0": + "integrity" "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==" + "resolved" "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz" + "version" "1.0.3" -"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= +"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", "statuses@~1.5.0": + "integrity" "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + "resolved" "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz" + "version" "1.5.0" -std-env@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" - integrity sha512-mC1Ps9l77/97qeOZc+HrOL7TIaOboHqMZ24dGVQrlxFcpPpfCHpH+qfUT7Dz+6mlG8+JPA1KfBQo19iC/+Ngcw== +"std-env@^3.0.1": + "integrity" "sha512-mC1Ps9l77/97qeOZc+HrOL7TIaOboHqMZ24dGVQrlxFcpPpfCHpH+qfUT7Dz+6mlG8+JPA1KfBQo19iC/+Ngcw==" + "resolved" "https://registry.npmjs.org/std-env/-/std-env-3.0.1.tgz" + "version" "3.0.1" -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.2: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== +"string_decoder@^1.1.1": + "integrity" "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==" + "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" + "version" "1.3.0" dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" + "safe-buffer" "~5.2.0" -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== +"string_decoder@~1.1.1": + "integrity" "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==" + "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" + "version" "1.1.1" dependencies: - safe-buffer "~5.2.0" + "safe-buffer" "~5.1.0" -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== +"string-width@^4.0.0", "string-width@^4.1.0", "string-width@^4.2.2": + "integrity" "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==" + "resolved" "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" + "version" "4.2.3" dependencies: - safe-buffer "~5.1.0" + "emoji-regex" "^8.0.0" + "is-fullwidth-code-point" "^3.0.0" + "strip-ansi" "^6.0.1" -stringify-object@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" - integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw== +"stringify-object@^3.3.0": + "integrity" "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==" + "resolved" "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz" + "version" "3.3.0" dependencies: - get-own-enumerable-property-symbols "^3.0.0" - is-obj "^1.0.1" - is-regexp "^1.0.0" + "get-own-enumerable-property-symbols" "^3.0.0" + "is-obj" "^1.0.1" + "is-regexp" "^1.0.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== +"strip-ansi@^6.0.0", "strip-ansi@^6.0.1": + "integrity" "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==" + "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" + "version" "6.0.1" dependencies: - ansi-regex "^5.0.1" + "ansi-regex" "^5.0.1" -strip-ansi@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" - integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== +"strip-ansi@^7.0.0": + "integrity" "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==" + "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz" + "version" "7.0.1" dependencies: - ansi-regex "^6.0.1" + "ansi-regex" "^6.0.1" -strip-bom-string@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" - integrity sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI= +"strip-bom-string@^1.0.0": + "integrity" "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=" + "resolved" "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz" + "version" "1.0.0" -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== +"strip-final-newline@^2.0.0": + "integrity" "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" + "resolved" "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz" + "version" "2.0.0" -strip-json-comments@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== +"strip-json-comments@^3.1.1": + "integrity" "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==" + "resolved" "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" + "version" "3.1.1" -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= +"strip-json-comments@~2.0.1": + "integrity" "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + "resolved" "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz" + "version" "2.0.1" -style-to-object@0.3.0, style-to-object@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" - integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA== +"style-to-object@^0.3.0", "style-to-object@0.3.0": + "integrity" "sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==" + "resolved" "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz" + "version" "0.3.0" dependencies: - inline-style-parser "0.1.1" + "inline-style-parser" "0.1.1" -stylehacks@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.3.tgz#2ef3de567bfa2be716d29a93bf3d208c133e8d04" - integrity sha512-ENcUdpf4yO0E1rubu8rkxI+JGQk4CgjchynZ4bDBJDfqdy+uhTRSWb8/F3Jtu+Bw5MW45Po3/aQGeIyyxgQtxg== +"stylehacks@^5.0.3": + "integrity" "sha512-ENcUdpf4yO0E1rubu8rkxI+JGQk4CgjchynZ4bDBJDfqdy+uhTRSWb8/F3Jtu+Bw5MW45Po3/aQGeIyyxgQtxg==" + "resolved" "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.3.tgz" + "version" "5.0.3" dependencies: - browserslist "^4.16.6" - postcss-selector-parser "^6.0.4" + "browserslist" "^4.16.6" + "postcss-selector-parser" "^6.0.4" -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== +"supports-color@^5.3.0": + "integrity" "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==" + "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" + "version" "5.5.0" dependencies: - has-flag "^3.0.0" + "has-flag" "^3.0.0" -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== +"supports-color@^7.1.0": + "integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==" + "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz" + "version" "7.2.0" dependencies: - has-flag "^4.0.0" + "has-flag" "^4.0.0" -supports-color@^8.0.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== +"supports-color@^8.0.0": + "integrity" "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==" + "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" + "version" "8.1.1" dependencies: - has-flag "^4.0.0" + "has-flag" "^4.0.0" -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== +"supports-preserve-symlinks-flag@^1.0.0": + "integrity" "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" + "resolved" "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" + "version" "1.0.0" -svg-parser@^2.0.2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" - integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ== +"svg-parser@^2.0.2": + "integrity" "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==" + "resolved" "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz" + "version" "2.0.4" -svgo@^2.5.0, svgo@^2.7.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" - integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== +"svgo@^2.5.0", "svgo@^2.7.0": + "integrity" "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==" + "resolved" "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz" + "version" "2.8.0" dependencies: "@trysound/sax" "0.2.0" - commander "^7.2.0" - css-select "^4.1.3" - css-tree "^1.1.3" - csso "^4.2.0" - picocolors "^1.0.0" - stable "^0.1.8" + "commander" "^7.2.0" + "css-select" "^4.1.3" + "css-tree" "^1.1.3" + "csso" "^4.2.0" + "picocolors" "^1.0.0" + "stable" "^0.1.8" -tapable@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" - integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== +"tapable@^1.0.0": + "integrity" "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==" + "resolved" "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz" + "version" "1.1.3" -tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== +"tapable@^2.0.0", "tapable@^2.1.1", "tapable@^2.2.0": + "integrity" "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" + "resolved" "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz" + "version" "2.2.1" -terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.4: - version "5.3.1" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54" - integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g== +"terser-webpack-plugin@^5.1.3", "terser-webpack-plugin@^5.2.4": + "integrity" "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==" + "resolved" "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz" + "version" "5.3.1" dependencies: - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - source-map "^0.6.1" - terser "^5.7.2" + "jest-worker" "^27.4.5" + "schema-utils" "^3.1.1" + "serialize-javascript" "^6.0.0" + "source-map" "^0.6.1" + "terser" "^5.7.2" -terser@^5.10.0, terser@^5.7.2: - version "5.14.2" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" - integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA== +"terser@^5.10.0", "terser@^5.7.2": + "integrity" "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==" + "resolved" "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz" + "version" "5.14.2" dependencies: "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" + "acorn" "^8.5.0" + "commander" "^2.20.0" + "source-map-support" "~0.5.20" -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= +"text-table@^0.2.0": + "integrity" "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" + "resolved" "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" + "version" "0.2.0" -thunky@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" - integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== +"thunky@^1.0.2": + "integrity" "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" + "resolved" "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz" + "version" "1.1.0" -timsort@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" - integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= +"timsort@^0.3.0": + "integrity" "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" + "resolved" "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz" + "version" "0.3.0" -tiny-invariant@^1.0.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" - integrity sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg== +"tiny-invariant@^1.0.2": + "integrity" "sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg==" + "resolved" "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.2.0.tgz" + "version" "1.2.0" -tiny-warning@^1.0.0, tiny-warning@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" - integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== +"tiny-warning@^1.0.0", "tiny-warning@^1.0.3": + "integrity" "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" + "resolved" "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz" + "version" "1.0.3" -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= +"to-fast-properties@^2.0.0": + "integrity" "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" + "resolved" "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz" + "version" "2.0.0" -to-readable-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" - integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== +"to-readable-stream@^1.0.0": + "integrity" "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" + "resolved" "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz" + "version" "1.0.0" -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== +"to-regex-range@^5.0.1": + "integrity" "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==" + "resolved" "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" + "version" "5.0.1" dependencies: - is-number "^7.0.0" + "is-number" "^7.0.0" -toidentifier@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" - integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== +"toidentifier@1.0.1": + "integrity" "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" + "resolved" "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz" + "version" "1.0.1" -totalist@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df" - integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g== +"totalist@^1.0.0": + "integrity" "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==" + "resolved" "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz" + "version" "1.1.0" -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= +"tr46@~0.0.3": + "integrity" "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + "resolved" "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz" + "version" "0.0.3" -trim-trailing-lines@^1.0.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0" - integrity sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ== +"trim-trailing-lines@^1.0.0": + "integrity" "sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==" + "resolved" "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz" + "version" "1.1.4" -trim@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" - integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0= +"trim@0.0.1": + "integrity" "sha1-WFhUf2spB1fulczMZm+1AITEYN0=" + "resolved" "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz" + "version" "0.0.1" -trough@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" - integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== +"trough@^1.0.0": + "integrity" "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==" + "resolved" "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz" + "version" "1.0.5" -tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== +"tslib@^2.0.3", "tslib@^2.1.0", "tslib@^2.2.0", "tslib@^2.3.1": + "integrity" "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz" + "version" "2.3.1" -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== +"type-fest@^0.20.2": + "integrity" "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" + "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz" + "version" "0.20.2" -type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== +"type-is@~1.6.18": + "integrity" "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==" + "resolved" "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz" + "version" "1.6.18" dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" + "media-typer" "0.3.0" + "mime-types" "~2.1.24" -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== +"typedarray-to-buffer@^3.1.5": + "integrity" "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==" + "resolved" "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz" + "version" "3.1.5" dependencies: - is-typedarray "^1.0.0" + "is-typedarray" "^1.0.0" -ua-parser-js@^0.7.30: - version "0.7.33" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532" - integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw== +"typescript@>= 2.7": + "integrity" "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==" + "resolved" "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz" + "version" "4.9.5" -unherit@^1.0.4: - version "1.1.3" - resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" - integrity sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ== +"ua-parser-js@^0.7.30": + "integrity" "sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==" + "resolved" "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz" + "version" "0.7.33" + +"unherit@^1.0.4": + "integrity" "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==" + "resolved" "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz" + "version" "1.1.3" dependencies: - inherits "^2.0.0" - xtend "^4.0.0" + "inherits" "^2.0.0" + "xtend" "^4.0.0" -unicode-canonical-property-names-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" - integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== +"unicode-canonical-property-names-ecmascript@^2.0.0": + "integrity" "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==" + "resolved" "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz" + "version" "2.0.0" -unicode-match-property-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" - integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q== +"unicode-match-property-ecmascript@^2.0.0": + "integrity" "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==" + "resolved" "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz" + "version" "2.0.0" dependencies: - unicode-canonical-property-names-ecmascript "^2.0.0" - unicode-property-aliases-ecmascript "^2.0.0" + "unicode-canonical-property-names-ecmascript" "^2.0.0" + "unicode-property-aliases-ecmascript" "^2.0.0" -unicode-match-property-value-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" - integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw== +"unicode-match-property-value-ecmascript@^2.0.0": + "integrity" "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==" + "resolved" "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz" + "version" "2.0.0" -unicode-property-aliases-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" - integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ== +"unicode-property-aliases-ecmascript@^2.0.0": + "integrity" "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==" + "resolved" "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz" + "version" "2.0.0" -unified@9.2.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" - integrity sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg== +"unified@^8.4.2": + "integrity" "sha512-JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA==" + "resolved" "https://registry.npmjs.org/unified/-/unified-8.4.2.tgz" + "version" "8.4.2" dependencies: - bail "^1.0.0" - extend "^3.0.0" - is-buffer "^2.0.0" - is-plain-obj "^2.0.0" - trough "^1.0.0" - vfile "^4.0.0" + "bail" "^1.0.0" + "extend" "^3.0.0" + "is-plain-obj" "^2.0.0" + "trough" "^1.0.0" + "vfile" "^4.0.0" -unified@^8.4.2: - version "8.4.2" - resolved "https://registry.yarnpkg.com/unified/-/unified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" - integrity sha512-JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA== +"unified@9.2.0": + "integrity" "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==" + "resolved" "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz" + "version" "9.2.0" dependencies: - bail "^1.0.0" - extend "^3.0.0" - is-plain-obj "^2.0.0" - trough "^1.0.0" - vfile "^4.0.0" + "bail" "^1.0.0" + "extend" "^3.0.0" + "is-buffer" "^2.0.0" + "is-plain-obj" "^2.0.0" + "trough" "^1.0.0" + "vfile" "^4.0.0" -unique-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" - integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== +"unique-string@^2.0.0": + "integrity" "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==" + "resolved" "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz" + "version" "2.0.0" dependencies: - crypto-random-string "^2.0.0" + "crypto-random-string" "^2.0.0" -unist-builder@2.0.3, unist-builder@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" - integrity sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw== +"unist-builder@^2.0.0", "unist-builder@2.0.3": + "integrity" "sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==" + "resolved" "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz" + "version" "2.0.3" -unist-util-generated@^1.0.0: - version "1.1.6" - resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" - integrity sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg== +"unist-util-generated@^1.0.0": + "integrity" "sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==" + "resolved" "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.6.tgz" + "version" "1.1.6" -unist-util-is@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797" - integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg== +"unist-util-is@^4.0.0": + "integrity" "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==" + "resolved" "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz" + "version" "4.1.0" -unist-util-position@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" - integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA== +"unist-util-position@^3.0.0": + "integrity" "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==" + "resolved" "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz" + "version" "3.1.0" -unist-util-remove-position@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" - integrity sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA== +"unist-util-remove-position@^2.0.0": + "integrity" "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==" + "resolved" "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz" + "version" "2.0.1" dependencies: - unist-util-visit "^2.0.0" + "unist-util-visit" "^2.0.0" -unist-util-remove@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-2.0.0.tgz#32c2ad5578802f2ca62ab808173d505b2c898488" - integrity sha512-HwwWyNHKkeg/eXRnE11IpzY8JT55JNM1YCwwU9YNCnfzk6s8GhPXrVBBZWiwLeATJbI7euvoGSzcy9M29UeW3g== +"unist-util-remove@^2.0.0": + "integrity" "sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q==" + "resolved" "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.1.0.tgz" + "version" "2.1.0" dependencies: - unist-util-is "^4.0.0" + "unist-util-is" "^4.0.0" -unist-util-remove@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-2.1.0.tgz#b0b4738aa7ee445c402fda9328d604a02d010588" - integrity sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q== +"unist-util-remove@2.0.0": + "integrity" "sha512-HwwWyNHKkeg/eXRnE11IpzY8JT55JNM1YCwwU9YNCnfzk6s8GhPXrVBBZWiwLeATJbI7euvoGSzcy9M29UeW3g==" + "resolved" "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.0.0.tgz" + "version" "2.0.0" dependencies: - unist-util-is "^4.0.0" + "unist-util-is" "^4.0.0" -unist-util-stringify-position@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" - integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g== +"unist-util-stringify-position@^2.0.0": + "integrity" "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==" + "resolved" "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz" + "version" "2.0.3" dependencies: "@types/unist" "^2.0.2" -unist-util-visit-parents@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6" - integrity sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg== +"unist-util-visit-parents@^3.0.0": + "integrity" "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==" + "resolved" "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz" + "version" "3.1.1" dependencies: "@types/unist" "^2.0.0" - unist-util-is "^4.0.0" + "unist-util-is" "^4.0.0" -unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist-util-visit@^2.0.2, unist-util-visit@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" - integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q== +"unist-util-visit@^2.0.0", "unist-util-visit@^2.0.1", "unist-util-visit@^2.0.2", "unist-util-visit@^2.0.3", "unist-util-visit@2.0.3": + "integrity" "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==" + "resolved" "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz" + "version" "2.0.3" dependencies: "@types/unist" "^2.0.0" - unist-util-is "^4.0.0" - unist-util-visit-parents "^3.0.0" + "unist-util-is" "^4.0.0" + "unist-util-visit-parents" "^3.0.0" -universalify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" - integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== +"universalify@^2.0.0": + "integrity" "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" + "resolved" "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz" + "version" "2.0.0" -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= +"unpipe@~1.0.0", "unpipe@1.0.0": + "integrity" "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + "resolved" "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" + "version" "1.0.0" -update-notifier@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" - integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== +"update-browserslist-db@^1.0.10": + "integrity" "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==" + "resolved" "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz" + "version" "1.0.10" dependencies: - boxen "^5.0.0" - chalk "^4.1.0" - configstore "^5.0.1" - has-yarn "^2.1.0" - import-lazy "^2.1.0" - is-ci "^2.0.0" - is-installed-globally "^0.4.0" - is-npm "^5.0.0" - is-yarn-global "^0.3.0" - latest-version "^5.1.0" - pupa "^2.1.1" - semver "^7.3.4" - semver-diff "^3.1.1" - xdg-basedir "^4.0.0" + "escalade" "^3.1.1" + "picocolors" "^1.0.0" -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== +"update-notifier@^5.1.0": + "integrity" "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==" + "resolved" "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz" + "version" "5.1.0" dependencies: - punycode "^2.1.0" + "boxen" "^5.0.0" + "chalk" "^4.1.0" + "configstore" "^5.0.1" + "has-yarn" "^2.1.0" + "import-lazy" "^2.1.0" + "is-ci" "^2.0.0" + "is-installed-globally" "^0.4.0" + "is-npm" "^5.0.0" + "is-yarn-global" "^0.3.0" + "latest-version" "^5.1.0" + "pupa" "^2.1.1" + "semver" "^7.3.4" + "semver-diff" "^3.1.1" + "xdg-basedir" "^4.0.0" -url-loader@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2" - integrity sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA== +"uri-js@^4.2.2": + "integrity" "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==" + "resolved" "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz" + "version" "4.4.1" dependencies: - loader-utils "^2.0.0" - mime-types "^2.1.27" - schema-utils "^3.0.0" + "punycode" "^2.1.0" -url-parse-lax@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= +"url-loader@^4.1.1": + "integrity" "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==" + "resolved" "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz" + "version" "4.1.1" dependencies: - prepend-http "^2.0.0" + "loader-utils" "^2.0.0" + "mime-types" "^2.1.27" + "schema-utils" "^3.0.0" -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= +"url-parse-lax@^3.0.0": + "integrity" "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=" + "resolved" "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz" + "version" "3.0.0" dependencies: - punycode "1.3.2" - querystring "0.2.0" + "prepend-http" "^2.0.0" -use-composed-ref@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.2.1.tgz#9bdcb5ccd894289105da2325e1210079f56bf849" - integrity sha512-6+X1FLlIcjvFMAeAD/hcxDT8tmyrWnbSPMU0EnxQuDLIxokuFzWliXBiYZuGIx+mrAMLBw0WFfCkaPw8ebzAhw== - -use-isomorphic-layout-effect@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz#7bb6589170cd2987a152042f9084f9effb75c225" - integrity sha512-L7Evj8FGcwo/wpbv/qvSfrkHFtOpCzvM5yl2KVyDJoylVuSvzphiiasmjgQPttIGBAy2WKiBNR98q8w7PiNgKQ== - -use-latest@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/use-latest/-/use-latest-1.2.0.tgz#a44f6572b8288e0972ec411bdd0840ada366f232" - integrity sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw== +"url@^0.11.0": + "integrity" "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=" + "resolved" "https://registry.npmjs.org/url/-/url-0.11.0.tgz" + "version" "0.11.0" dependencies: - use-isomorphic-layout-effect "^1.0.0" + "punycode" "1.3.2" + "querystring" "0.2.0" -util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= +"use-composed-ref@^1.0.0": + "integrity" "sha512-6+X1FLlIcjvFMAeAD/hcxDT8tmyrWnbSPMU0EnxQuDLIxokuFzWliXBiYZuGIx+mrAMLBw0WFfCkaPw8ebzAhw==" + "resolved" "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.2.1.tgz" + "version" "1.2.1" -utila@~0.4: - version "0.4.0" - resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" - integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw= +"use-isomorphic-layout-effect@^1.0.0": + "integrity" "sha512-L7Evj8FGcwo/wpbv/qvSfrkHFtOpCzvM5yl2KVyDJoylVuSvzphiiasmjgQPttIGBAy2WKiBNR98q8w7PiNgKQ==" + "resolved" "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz" + "version" "1.1.1" -utility-types@^3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/utility-types/-/utility-types-3.10.0.tgz#ea4148f9a741015f05ed74fd615e1d20e6bed82b" - integrity sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg== +"use-latest@^1.0.0": + "integrity" "sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw==" + "resolved" "https://registry.npmjs.org/use-latest/-/use-latest-1.2.0.tgz" + "version" "1.2.0" + dependencies: + "use-isomorphic-layout-effect" "^1.0.0" -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= +"util-deprecate@^1.0.1", "util-deprecate@^1.0.2", "util-deprecate@~1.0.1": + "integrity" "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "resolved" "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + "version" "1.0.2" -uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +"utila@~0.4": + "integrity" "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=" + "resolved" "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz" + "version" "0.4.0" -value-equal@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" - integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== +"utility-types@^3.10.0": + "integrity" "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg==" + "resolved" "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz" + "version" "3.10.0" -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= +"utils-merge@1.0.1": + "integrity" "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + "resolved" "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz" + "version" "1.0.1" -vfile-location@^3.0.0, vfile-location@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.2.0.tgz#d8e41fbcbd406063669ebf6c33d56ae8721d0f3c" - integrity sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA== +"uuid@^8.3.2": + "integrity" "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + "resolved" "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz" + "version" "8.3.2" -vfile-message@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" - integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ== +"value-equal@^1.0.1": + "integrity" "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==" + "resolved" "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz" + "version" "1.0.1" + +"vary@~1.1.2": + "integrity" "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + "resolved" "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz" + "version" "1.1.2" + +"vfile-location@^3.0.0", "vfile-location@^3.2.0": + "integrity" "sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==" + "resolved" "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz" + "version" "3.2.0" + +"vfile-message@^2.0.0": + "integrity" "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==" + "resolved" "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz" + "version" "2.0.4" dependencies: "@types/unist" "^2.0.0" - unist-util-stringify-position "^2.0.0" + "unist-util-stringify-position" "^2.0.0" -vfile@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624" - integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA== +"vfile@^4.0.0": + "integrity" "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==" + "resolved" "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz" + "version" "4.2.1" dependencies: "@types/unist" "^2.0.0" - is-buffer "^2.0.0" - unist-util-stringify-position "^2.0.0" - vfile-message "^2.0.0" + "is-buffer" "^2.0.0" + "unist-util-stringify-position" "^2.0.0" + "vfile-message" "^2.0.0" -wait-on@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-6.0.1.tgz#16bbc4d1e4ebdd41c5b4e63a2e16dbd1f4e5601e" - integrity sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw== +"wait-on@^6.0.0": + "integrity" "sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==" + "resolved" "https://registry.npmjs.org/wait-on/-/wait-on-6.0.1.tgz" + "version" "6.0.1" dependencies: - axios "^0.25.0" - joi "^17.6.0" - lodash "^4.17.21" - minimist "^1.2.5" - rxjs "^7.5.4" + "axios" "^0.25.0" + "joi" "^17.6.0" + "lodash" "^4.17.21" + "minimist" "^1.2.5" + "rxjs" "^7.5.4" -watchpack@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25" - integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA== +"watchpack@^2.3.1": + "integrity" "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==" + "resolved" "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz" + "version" "2.3.1" dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" + "glob-to-regexp" "^0.4.1" + "graceful-fs" "^4.1.2" -wbuf@^1.1.0, wbuf@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" - integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== +"wbuf@^1.1.0", "wbuf@^1.7.3": + "integrity" "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==" + "resolved" "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz" + "version" "1.7.3" dependencies: - minimalistic-assert "^1.0.0" + "minimalistic-assert" "^1.0.0" -web-namespaces@^1.0.0, web-namespaces@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec" - integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw== +"web-namespaces@^1.0.0", "web-namespaces@^1.1.2": + "integrity" "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==" + "resolved" "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz" + "version" "1.1.4" -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= +"webidl-conversions@^3.0.0": + "integrity" "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + "resolved" "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz" + "version" "3.0.1" -webpack-bundle-analyzer@^4.4.2: - version "4.5.0" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" - integrity sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ== +"webpack-bundle-analyzer@^4.4.2": + "integrity" "sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==" + "resolved" "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz" + "version" "4.5.0" dependencies: - acorn "^8.0.4" - acorn-walk "^8.0.0" - chalk "^4.1.0" - commander "^7.2.0" - gzip-size "^6.0.0" - lodash "^4.17.20" - opener "^1.5.2" - sirv "^1.0.7" - ws "^7.3.1" + "acorn" "^8.0.4" + "acorn-walk" "^8.0.0" + "chalk" "^4.1.0" + "commander" "^7.2.0" + "gzip-size" "^6.0.0" + "lodash" "^4.17.20" + "opener" "^1.5.2" + "sirv" "^1.0.7" + "ws" "^7.3.1" -webpack-dev-middleware@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f" - integrity sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg== +"webpack-dev-middleware@^5.3.1": + "integrity" "sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==" + "resolved" "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz" + "version" "5.3.1" dependencies: - colorette "^2.0.10" - memfs "^3.4.1" - mime-types "^2.1.31" - range-parser "^1.2.1" - schema-utils "^4.0.0" + "colorette" "^2.0.10" + "memfs" "^3.4.1" + "mime-types" "^2.1.31" + "range-parser" "^1.2.1" + "schema-utils" "^4.0.0" -webpack-dev-server@^4.7.1: - version "4.7.4" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz#d0ef7da78224578384e795ac228d8efb63d5f945" - integrity sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A== +"webpack-dev-server@^4.7.1": + "integrity" "sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A==" + "resolved" "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz" + "version" "4.7.4" dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" @@ -7519,212 +7582,217 @@ webpack-dev-server@^4.7.1: "@types/serve-index" "^1.9.1" "@types/sockjs" "^0.3.33" "@types/ws" "^8.2.2" - ansi-html-community "^0.0.8" - bonjour "^3.5.0" - chokidar "^3.5.3" - colorette "^2.0.10" - compression "^1.7.4" - connect-history-api-fallback "^1.6.0" - default-gateway "^6.0.3" - del "^6.0.0" - express "^4.17.1" - graceful-fs "^4.2.6" - html-entities "^2.3.2" - http-proxy-middleware "^2.0.0" - ipaddr.js "^2.0.1" - open "^8.0.9" - p-retry "^4.5.0" - portfinder "^1.0.28" - schema-utils "^4.0.0" - selfsigned "^2.0.0" - serve-index "^1.9.1" - sockjs "^0.3.21" - spdy "^4.0.2" - strip-ansi "^7.0.0" - webpack-dev-middleware "^5.3.1" - ws "^8.4.2" + "ansi-html-community" "^0.0.8" + "bonjour" "^3.5.0" + "chokidar" "^3.5.3" + "colorette" "^2.0.10" + "compression" "^1.7.4" + "connect-history-api-fallback" "^1.6.0" + "default-gateway" "^6.0.3" + "del" "^6.0.0" + "express" "^4.17.1" + "graceful-fs" "^4.2.6" + "html-entities" "^2.3.2" + "http-proxy-middleware" "^2.0.0" + "ipaddr.js" "^2.0.1" + "open" "^8.0.9" + "p-retry" "^4.5.0" + "portfinder" "^1.0.28" + "schema-utils" "^4.0.0" + "selfsigned" "^2.0.0" + "serve-index" "^1.9.1" + "sockjs" "^0.3.21" + "spdy" "^4.0.2" + "strip-ansi" "^7.0.0" + "webpack-dev-middleware" "^5.3.1" + "ws" "^8.4.2" -webpack-merge@^5.8.0: - version "5.8.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" - integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== +"webpack-merge@^5.8.0": + "integrity" "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==" + "resolved" "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz" + "version" "5.8.0" dependencies: - clone-deep "^4.0.1" - wildcard "^2.0.0" + "clone-deep" "^4.0.1" + "wildcard" "^2.0.0" -webpack-sources@^1.1.0, webpack-sources@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" - integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== +"webpack-sources@^1.1.0", "webpack-sources@^1.4.3": + "integrity" "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==" + "resolved" "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz" + "version" "1.4.3" dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" + "source-list-map" "^2.0.0" + "source-map" "~0.6.1" -webpack-sources@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" - integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== +"webpack-sources@^3.2.3": + "integrity" "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==" + "resolved" "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz" + "version" "3.2.3" -webpack@^5.61.0: - version "5.69.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.69.1.tgz#8cfd92c192c6a52c99ab00529b5a0d33aa848dc5" - integrity sha512-+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A== +"webpack@^4.0.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", "webpack@^4.4.0 || ^5.0.0", "webpack@^5.0.0", "webpack@^5.1.0", "webpack@^5.20.0", "webpack@^5.61.0", "webpack@>= 4", "webpack@>=2", "webpack@>=4.41.1 || 5.x", "webpack@3 || 4 || 5", "webpack@5.x": + "integrity" "sha512-+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A==" + "resolved" "https://registry.npmjs.org/webpack/-/webpack-5.69.1.tgz" + "version" "5.69.1" dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^0.0.51" "@webassemblyjs/ast" "1.11.1" "@webassemblyjs/wasm-edit" "1.11.1" "@webassemblyjs/wasm-parser" "1.11.1" - acorn "^8.4.1" - acorn-import-assertions "^1.7.6" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.8.3" - es-module-lexer "^0.9.0" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" - json-parse-better-errors "^1.0.2" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.1.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" - watchpack "^2.3.1" - webpack-sources "^3.2.3" + "acorn" "^8.4.1" + "acorn-import-assertions" "^1.7.6" + "browserslist" "^4.14.5" + "chrome-trace-event" "^1.0.2" + "enhanced-resolve" "^5.8.3" + "es-module-lexer" "^0.9.0" + "eslint-scope" "5.1.1" + "events" "^3.2.0" + "glob-to-regexp" "^0.4.1" + "graceful-fs" "^4.2.9" + "json-parse-better-errors" "^1.0.2" + "loader-runner" "^4.2.0" + "mime-types" "^2.1.27" + "neo-async" "^2.6.2" + "schema-utils" "^3.1.0" + "tapable" "^2.1.1" + "terser-webpack-plugin" "^5.1.3" + "watchpack" "^2.3.1" + "webpack-sources" "^3.2.3" -webpackbar@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/webpackbar/-/webpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" - integrity sha512-BmFJo7veBDgQzfWXl/wwYXr/VFus0614qZ8i9znqcl9fnEdiVkdbi0TedLQ6xAK92HZHDJ0QmyQ0fmuZPAgCYQ== +"webpackbar@^5.0.2": + "integrity" "sha512-BmFJo7veBDgQzfWXl/wwYXr/VFus0614qZ8i9znqcl9fnEdiVkdbi0TedLQ6xAK92HZHDJ0QmyQ0fmuZPAgCYQ==" + "resolved" "https://registry.npmjs.org/webpackbar/-/webpackbar-5.0.2.tgz" + "version" "5.0.2" dependencies: - chalk "^4.1.0" - consola "^2.15.3" - pretty-time "^1.1.0" - std-env "^3.0.1" + "chalk" "^4.1.0" + "consola" "^2.15.3" + "pretty-time" "^1.1.0" + "std-env" "^3.0.1" -websocket-driver@>=0.5.1, websocket-driver@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" - integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== +"websocket-driver@^0.7.4", "websocket-driver@>=0.5.1": + "integrity" "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==" + "resolved" "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz" + "version" "0.7.4" dependencies: - http-parser-js ">=0.5.1" - safe-buffer ">=5.1.0" - websocket-extensions ">=0.1.1" + "http-parser-js" ">=0.5.1" + "safe-buffer" ">=5.1.0" + "websocket-extensions" ">=0.1.1" -websocket-extensions@>=0.1.1: - version "0.1.4" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" - integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== +"websocket-extensions@>=0.1.1": + "integrity" "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==" + "resolved" "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz" + "version" "0.1.4" -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= +"whatwg-url@^5.0.0": + "integrity" "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=" + "resolved" "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz" + "version" "5.0.0" dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" + "tr46" "~0.0.3" + "webidl-conversions" "^3.0.0" -which@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== +"which@^1.3.1": + "integrity" "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==" + "resolved" "https://registry.npmjs.org/which/-/which-1.3.1.tgz" + "version" "1.3.1" dependencies: - isexe "^2.0.0" + "isexe" "^2.0.0" -which@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== +"which@^2.0.1": + "integrity" "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==" + "resolved" "https://registry.npmjs.org/which/-/which-2.0.2.tgz" + "version" "2.0.2" dependencies: - isexe "^2.0.0" + "isexe" "^2.0.0" -widest-line@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" - integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== +"widest-line@^3.1.0": + "integrity" "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==" + "resolved" "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz" + "version" "3.1.0" dependencies: - string-width "^4.0.0" + "string-width" "^4.0.0" -wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== +"wildcard@^2.0.0": + "integrity" "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==" + "resolved" "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz" + "version" "2.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== +"wrap-ansi@^7.0.0": + "integrity" "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==" + "resolved" "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" + "version" "7.0.0" dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" + "ansi-styles" "^4.0.0" + "string-width" "^4.1.0" + "strip-ansi" "^6.0.0" -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= +"wrappy@1": + "integrity" "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "resolved" "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "version" "1.0.2" -write-file-atomic@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" - integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== +"write-file-atomic@^3.0.0": + "integrity" "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==" + "resolved" "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz" + "version" "3.0.3" dependencies: - imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" + "imurmurhash" "^0.1.4" + "is-typedarray" "^1.0.0" + "signal-exit" "^3.0.2" + "typedarray-to-buffer" "^3.1.5" -ws@^7.3.1: - version "7.5.7" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" - integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== +"ws@^7.3.1": + "integrity" "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==" + "resolved" "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz" + "version" "7.5.7" -ws@^8.4.2: - version "8.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" - integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== +"ws@^8.4.2": + "integrity" "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==" + "resolved" "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz" + "version" "8.5.0" -xdg-basedir@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" - integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== +"xdg-basedir@^4.0.0": + "integrity" "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" + "resolved" "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz" + "version" "4.0.0" -xml-js@^1.6.11: - version "1.6.11" - resolved "https://registry.yarnpkg.com/xml-js/-/xml-js-1.6.11.tgz#927d2f6947f7f1c19a316dd8eea3614e8b18f8e9" - integrity sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g== +"xml-js@^1.6.11": + "integrity" "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==" + "resolved" "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz" + "version" "1.6.11" dependencies: - sax "^1.2.4" + "sax" "^1.2.4" -xtend@^4.0.0, xtend@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== +"xtend@^4.0.0", "xtend@^4.0.1": + "integrity" "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" + "resolved" "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz" + "version" "4.0.2" -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== +"yallist@^3.0.2": + "integrity" "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + "resolved" "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz" + "version" "3.1.1" -yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: - version "1.10.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" - integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== +"yallist@^4.0.0": + "integrity" "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "resolved" "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" + "version" "4.0.0" -yarn@^1.17.3: - version "1.22.17" - resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.17.tgz#bf910747d22497b573131f7341c0e1d15c74036c" - integrity sha512-H0p241BXaH0UN9IeH//RT82tl5PfNraVpSpEoW+ET7lmopNC61eZ+A+IDvU8FM6Go5vx162SncDL8J1ZjRBriQ== +"yaml@^1.10.0", "yaml@^1.10.2", "yaml@^1.7.2": + "integrity" "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==" + "resolved" "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz" + "version" "1.10.2" -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== +"yarn@^1.17.3": + "integrity" "sha512-H0p241BXaH0UN9IeH//RT82tl5PfNraVpSpEoW+ET7lmopNC61eZ+A+IDvU8FM6Go5vx162SncDL8J1ZjRBriQ==" + "resolved" "https://registry.npmjs.org/yarn/-/yarn-1.22.17.tgz" + "version" "1.22.17" -zwitch@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" - integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw== +"yocto-queue@^0.1.0": + "integrity" "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" + "resolved" "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz" + "version" "0.1.0" + +"zwitch@^1.0.0": + "integrity" "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==" + "resolved" "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz" + "version" "1.0.5" From dad56a3ab8794b01efd06947881c7b7c9782f718 Mon Sep 17 00:00:00 2001 From: Toke Jepsen Date: Tue, 14 Mar 2023 15:45:26 +0000 Subject: [PATCH 876/912] Update artist_hosts_maya_arnold.md --- website/docs/artist_hosts_maya_arnold.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/artist_hosts_maya_arnold.md b/website/docs/artist_hosts_maya_arnold.md index b3c02a0894..da16ba66c0 100644 --- a/website/docs/artist_hosts_maya_arnold.md +++ b/website/docs/artist_hosts_maya_arnold.md @@ -6,7 +6,7 @@ sidebar_label: Arnold ## Arnold Scene Source (.ass) Arnold Scene Source can be published as a single file or a sequence of files, determined by the frame range. -When creating the instance, two objectsets are created; `content` and `proxy`. Meshes in the `proxy` objectset will be the viewport representation when loading as `standin`. Proxy representations are stored as `resources` of the subset. +When creating the instance, two objectsets are created; `content` and `proxy`. Meshes in the `proxy` objectset will be the viewport representation when loading as `standin`. ### Arnold Scene Source Proxy Workflow In order to utilize operators and proxies, the content and proxy nodes need to share the same names (including the shape names). This is done by parenting the content and proxy nodes into separate groups. For example: From 87655075a9d5e4cc47b5a760fa5d31056444b634 Mon Sep 17 00:00:00 2001 From: Ynbot Date: Wed, 15 Mar 2023 03:26:53 +0000 Subject: [PATCH 877/912] [Automated] Bump version --- openpype/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/version.py b/openpype/version.py index 6ab03c2121..39a7dc9344 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.15.2" +__version__ = "3.15.3-nightly.1" From 0cb3585d91e63352dff24a861c0a19fc3a96425b Mon Sep 17 00:00:00 2001 From: mre7a <68907585+mre7a@users.noreply.github.com> Date: Wed, 15 Mar 2023 12:55:50 +0100 Subject: [PATCH 878/912] Resolve missing OPENPYPE_MONGO in deadline global job preload (#4484) * replace SpawnProcess with subprocess * clean up * replace spawn process with run process --------- Co-authored-by: Seyedmohammadreza Hashemizadeh --- .../repository/custom/plugins/GlobalJobPreLoad.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py b/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py index 20a58c9131..15226bb773 100644 --- a/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py +++ b/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py @@ -362,11 +362,11 @@ def inject_openpype_environment(deadlinePlugin): args_str = subprocess.list2cmdline(args) print(">>> Executing: {} {}".format(exe, args_str)) - process = ProcessUtils.SpawnProcess( - exe, args_str, os.path.dirname(exe) + process_exitcode = deadlinePlugin.RunProcess( + exe, args_str, os.path.dirname(exe), -1 ) - ProcessUtils.WaitForExit(process, -1) - if process.ExitCode != 0: + + if process_exitcode != 0: raise RuntimeError( "Failed to run OpenPype process to extract environments." ) From fe9c807b1fb0a9ddb56d1581c9f916c360b8c863 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 15 Mar 2023 17:13:10 +0000 Subject: [PATCH 879/912] Fix playblast panel collection --- openpype/hosts/maya/plugins/publish/collect_review.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/publish/collect_review.py b/openpype/hosts/maya/plugins/publish/collect_review.py index 65ff7cf0fe..548b1c996a 100644 --- a/openpype/hosts/maya/plugins/publish/collect_review.py +++ b/openpype/hosts/maya/plugins/publish/collect_review.py @@ -24,7 +24,9 @@ class CollectReview(pyblish.api.InstancePlugin): task = legacy_io.Session["AVALON_TASK"] # Get panel. - instance.data["panel"] = cmds.playblast(activeEditor=True) + instance.data["panel"] = cmds.playblast( + activeEditor=True + ).split("|")[-1] # get cameras members = instance.data['setMembers'] From 00a901120b3a5c0ed258af9bf03084c1c7e994de Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 16 Mar 2023 02:58:54 +0300 Subject: [PATCH 880/912] check for suported fusion version --- openpype/hosts/fusion/addon.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/openpype/hosts/fusion/addon.py b/openpype/hosts/fusion/addon.py index e3464f4be4..cb4dc76481 100644 --- a/openpype/hosts/fusion/addon.py +++ b/openpype/hosts/fusion/addon.py @@ -4,6 +4,8 @@ from openpype.modules import OpenPypeModule, IHostAddon from openpype.lib import Logger FUSION_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) +FUSION16_PROFILE_VERSIONS = (16, 17, 18) +FUSION9_PROFILE_VERSION = 9 def get_fusion_profile_number(module: str, app_data: str) -> int: @@ -15,8 +17,10 @@ def get_fusion_profile_number(module: str, app_data: str) -> int: The variable is added in case the version number will be updated or deleted so we could easily change the version or disable it. - app_data derives from `launch_context.env.get("AVALON_APP_NAME")`. - For the time being we will encourage user to set a version number + Currently valid Fusion versions are stored in FUSION16_PROFILE_VERSIONS + + app_data derives from `launch_context.env.get("AVALON_APP_NAME")`. + For the time being we will encourage user to set a version number set in the system settings key for the Blackmagic Fusion. """ @@ -24,16 +28,18 @@ def get_fusion_profile_number(module: str, app_data: str) -> int: if not app_data: return - fusion16_profile_versions = ("16", "17", "18") + try: app_version = re.search(r"fusion/(\d+)", app_data).group(1) - log.info(f"{module} found Fusion profile version: {app_version}") - if app_version in fusion16_profile_versions: + log.debug(f"{module} found Fusion profile version: {app_version}") + if app_version in map(str, FUSION16_PROFILE_VERSIONS): return 16 - elif app_version == "9": + elif app_version == str(FUSION9_PROFILE_VERSION): return 9 + else: + log.info(f"Found unsupported Fusion version: {app_version}") except AttributeError: - log.info("Fusion version was not found in the app data") + log.info("Fusion version was not found in the AVALON_APP_NAME data") class FusionAddon(OpenPypeModule, IHostAddon): From ef5c081b5fb77c7709bf780f552d0cc72f16a369 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 16 Mar 2023 02:59:18 +0300 Subject: [PATCH 881/912] add execution order --- openpype/hosts/fusion/hooks/pre_fusion_ocio_hook.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_ocio_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_ocio_hook.py index 6bf0f55081..47645b7e3f 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_ocio_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_ocio_hook.py @@ -7,6 +7,7 @@ from openpype.pipeline.template_data import get_template_data_with_names class FusionPreLaunchOCIO(PreLaunchHook): """Set OCIO environment variable for Fusion""" app_groups = ["fusion"] + order = 3 def execute(self): """Hook entry method.""" From b305aac21dd14f8d58656b8be197926ca4505316 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 16 Mar 2023 03:01:35 +0300 Subject: [PATCH 882/912] fix docs --- .../hosts/fusion/hooks/pre_fusion_profile_hook.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index dc6a4bf85d..08ba9c4157 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -25,9 +25,7 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): # Check if FUSION_PROFILE_DIR exists if fusion_var_prefs_dir and Path(fusion_var_prefs_dir).is_dir(): fu_prefs_dir = Path(fusion_var_prefs_dir, fusion_profile) - self.log.info( - f"{fusion_var_prefs_dir} is set to {fu_prefs_dir}" - ) + self.log.info(f"{fusion_var_prefs_dir} is set to {fu_prefs_dir}") return fu_prefs_dir def get_profile_source(self, app_version) -> Path: @@ -106,7 +104,7 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): ) = self.get_copy_fusion_prefs_settings() # Get launched application context and return correct app version - app_data = self.launch_context.env.get("AVALON_APP_NAME", "fusion/18") + app_data = self.launch_context.env.get("AVALON_APP_NAME") app_version = get_fusion_profile_number(__name__, app_data) fu_profile = self.get_fusion_profile_name(app_version) @@ -122,8 +120,9 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): self.log.info(f"Setting {fu_profile_dir_variable}: {fu_profile_dir}") self.launch_context.env[fu_profile_dir_variable] = str(fu_profile_dir) - # setup masterprefs file to partially alter existing or newly generated - # Fusion profile, to add OpenPype menu, scripts and and config files. + # Add custom Fusion Master Prefs and the temporary + # profile directory variables to customize Fusion + # to define where it can read custom scripts and tools from master_prefs_variable = f"FUSION{app_version}_MasterPrefs" master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") self.log.info(f"Setting {master_prefs_variable}: {master_prefs}") From f3e20c0af9c4a68858150a52720fb1be1cb1675b Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 16 Mar 2023 03:03:39 +0300 Subject: [PATCH 883/912] force check Fusion number version in app settings --- .../hosts/fusion/hooks/pre_fusion_setup.py | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index 38627b40c1..b9f568bad2 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -1,7 +1,9 @@ import os from openpype.lib import PreLaunchHook, ApplicationLaunchFailed -from openpype.hosts.fusion import FUSION_HOST_DIR -from openpype.hosts.fusion import get_fusion_profile_number +from openpype.hosts.fusion import ( + FUSION_HOST_DIR, + get_fusion_profile_number, +) class FusionPrelaunch(PreLaunchHook): @@ -22,8 +24,14 @@ class FusionPrelaunch(PreLaunchHook): def execute(self): # making sure python 3 is installed at provided path # Py 3.3-3.10 for Fusion 18+ or Py 3.6 for Fu 16-17 - app_data = self.launch_context.env.get("AVALON_APP_NAME", "fusion/18") + app_data = self.launch_context.env.get("AVALON_APP_NAME") app_version = get_fusion_profile_number(__name__, app_data) + if not app_version: + raise ApplicationLaunchFailed( + "Fusion version information not found in System settings.\n" + "The key field in the 'applications/fusion/variants' " + "should consist a number, corresponding to the Fusion version" + ) py3_var = "FUSION_PYTHON3_HOME" fusion_python3_home = self.launch_context.env.get(py3_var, "") @@ -57,10 +65,9 @@ class FusionPrelaunch(PreLaunchHook): if app_version == 9: self.launch_context.env[f"FUSION_PYTHON36_HOME"] = py3_dir elif app_version == 16: - self.launch_context.env[f"FUSION{app_version}_PYTHON36_HOME"] = py3_dir # noqa + self.launch_context.env[ + f"FUSION{app_version}_PYTHON36_HOME" + ] = py3_dir - # Add custom Fusion Master Prefs and the temporary - # profile directory variables to customize Fusion - # to define where it can read custom scripts and tools from self.log.info(f"Setting OPENPYPE_FUSION: {FUSION_HOST_DIR}") self.launch_context.env["OPENPYPE_FUSION"] = FUSION_HOST_DIR From a63e297186f2fbbda5b115db9f8027d037d86d3f Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 16 Mar 2023 03:08:20 +0300 Subject: [PATCH 884/912] remove unused import --- openpype/hosts/fusion/api/workio.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/fusion/api/workio.py b/openpype/hosts/fusion/api/workio.py index fbb5a588f4..fa4b62c123 100644 --- a/openpype/hosts/fusion/api/workio.py +++ b/openpype/hosts/fusion/api/workio.py @@ -1,5 +1,4 @@ """Host API required Work Files tool""" -import sys import os from .lib import get_fusion_module, get_current_comp From d0656e92a54e43468ab6bec24e0031a685cc9145 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov <11698866+movalex@users.noreply.github.com> Date: Thu, 16 Mar 2023 12:47:19 +0300 Subject: [PATCH 885/912] Update openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py Co-authored-by: Roy Nieterau --- openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index 08ba9c4157..c69ac10b67 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -46,7 +46,7 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): ).expanduser() elif platform.system() == "Linux": profile_source = Path("~/.fusion", fu_prefs_dir).expanduser() - self.log.info(f"Got Fusion prefs file: {profile_source}") + self.log.info(f"Locating source Fusion prefs directory: {profile_source}") return profile_source def get_copy_fusion_prefs_settings(self): From d0f74f134865a95c1fa1d8e6e5135f842f424509 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov <11698866+movalex@users.noreply.github.com> Date: Thu, 16 Mar 2023 12:48:04 +0300 Subject: [PATCH 886/912] Update openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py Co-authored-by: Roy Nieterau --- openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index c69ac10b67..ba8997fd74 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -75,7 +75,7 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): """ if copy_to.exists() and not force_sync: self.log.info( - "Local Fusion preferences folder exists, skipping profile copy" + "Destination Fusion preferences folder exists, skipping profile copy" ) return self.log.info(f"Starting copying Fusion preferences") From f96670d9dfa482174584b85f93f386aff472e841 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 16 Mar 2023 11:20:00 +0100 Subject: [PATCH 887/912] use right validation for ffmpeg executable --- openpype/lib/vendor_bin_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/lib/vendor_bin_utils.py b/openpype/lib/vendor_bin_utils.py index b6797dbba0..00dd1955fe 100644 --- a/openpype/lib/vendor_bin_utils.py +++ b/openpype/lib/vendor_bin_utils.py @@ -375,7 +375,7 @@ def get_ffmpeg_tool_path(tool="ffmpeg"): # Look to PATH for the tool if not tool_executable_path: from_path = find_executable(tool) - if from_path and _oiio_executable_validation(from_path): + if from_path and _ffmpeg_executable_validation(from_path): tool_executable_path = from_path CachedToolPaths.cache_executable_path(tool, tool_executable_path) From 1c97ec027fcfb2991c3a38a2cde309cb13543f0d Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 16 Mar 2023 23:10:39 +0800 Subject: [PATCH 888/912] adding 3dsmax into apps_group at add_last_workfile_arg --- openpype/hooks/pre_add_last_workfile_arg.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hooks/pre_add_last_workfile_arg.py b/openpype/hooks/pre_add_last_workfile_arg.py index 1c8746c559..2558daef30 100644 --- a/openpype/hooks/pre_add_last_workfile_arg.py +++ b/openpype/hooks/pre_add_last_workfile_arg.py @@ -14,6 +14,7 @@ class AddLastWorkfileToLaunchArgs(PreLaunchHook): # Execute after workfile template copy order = 10 app_groups = [ + "3dsmax", "maya", "nuke", "nukex", From 3396784820145e0656b6905b4f5e99697e9f9994 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 16 Mar 2023 21:32:48 +0300 Subject: [PATCH 889/912] use dictionary to store fusion versions and variables --- openpype/hosts/fusion/__init__.py | 6 ++-- openpype/hosts/fusion/addon.py | 50 +++++++++++++++++-------------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/openpype/hosts/fusion/__init__.py b/openpype/hosts/fusion/__init__.py index f0e7843fff..1da11ba9d1 100644 --- a/openpype/hosts/fusion/__init__.py +++ b/openpype/hosts/fusion/__init__.py @@ -1,12 +1,14 @@ from .addon import ( - get_fusion_profile_number, + get_fusion_version, FusionAddon, FUSION_HOST_DIR, + FUSION_VERSIONS_DICT, ) __all__ = ( - "get_fusion_profile_number", + "get_fusion_version", "FusionAddon", "FUSION_HOST_DIR", + "FUSION_VERSIONS_DICT", ) diff --git a/openpype/hosts/fusion/addon.py b/openpype/hosts/fusion/addon.py index cb4dc76481..2ea16e0d6b 100644 --- a/openpype/hosts/fusion/addon.py +++ b/openpype/hosts/fusion/addon.py @@ -4,24 +4,29 @@ from openpype.modules import OpenPypeModule, IHostAddon from openpype.lib import Logger FUSION_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) -FUSION16_PROFILE_VERSIONS = (16, 17, 18) -FUSION9_PROFILE_VERSION = 9 + +# FUSION_VERSIONS_DICT is used by the pre-launch hooks +# The keys correspond to all currently supported Fusion versions +# Values is the list of corresponding python_home variables and a profile +# number, which is used to specify pufion profile derectory variable. +FUSION_VERSIONS_DICT = { + 9: ["FUSION_PYTHON36_HOME", 9], + 16: ["FUSION16_PYTHON36_HOME", 16], + 17: ["FUSION16_PYTHON36_HOME", 16], + 18: ["FUSION_PYTHON3_HOME", 16], +} -def get_fusion_profile_number(module: str, app_data: str) -> int: +def get_fusion_version(app_data): """ - FUSION_PROFILE_VERSION variable is used by the pre-launch hooks. - Since Fusion v16, the profile folder variable became version-specific, - but then it was abandoned by BlackmagicDesign devs, and now, despite it is - already Fusion version 18, still FUSION16_PROFILE_DIR is used. - The variable is added in case the version number will be - updated or deleted so we could easily change the version or disable it. + The function is triggered by the prelaunch hooks to get the fusion version. - Currently valid Fusion versions are stored in FUSION16_PROFILE_VERSIONS + `app_data` is obtained by prelaunch hooks from the + `launch_context.env.get("AVALON_APP_NAME")`. - app_data derives from `launch_context.env.get("AVALON_APP_NAME")`. - For the time being we will encourage user to set a version number - set in the system settings key for the Blackmagic Fusion. + To get a correct Fusion version, a version number should be present + in the `applications/fusion/variants` key + int the Blackmagic Fusion Application Settings. """ log = Logger.get_logger(__name__) @@ -29,17 +34,16 @@ def get_fusion_profile_number(module: str, app_data: str) -> int: if not app_data: return - try: - app_version = re.search(r"fusion/(\d+)", app_data).group(1) - log.debug(f"{module} found Fusion profile version: {app_version}") - if app_version in map(str, FUSION16_PROFILE_VERSIONS): - return 16 - elif app_version == str(FUSION9_PROFILE_VERSION): - return 9 + app_version_candidates = re.findall("\d+", app_data) + for app_version in app_version_candidates: + if int(app_version) in FUSION_VERSIONS_DICT: + return int(app_version) else: - log.info(f"Found unsupported Fusion version: {app_version}") - except AttributeError: - log.info("Fusion version was not found in the AVALON_APP_NAME data") + log.info( + "Unsupported Fusion version: {app_version}".format( + app_version=app_version + ) + ) class FusionAddon(OpenPypeModule, IHostAddon): From e61ec028e24f5e0dfcceb3de1902c03f66c8edd7 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 16 Mar 2023 21:33:11 +0300 Subject: [PATCH 890/912] delete unused module --- openpype/hosts/fusion/api/workio.py | 38 ----------------------------- 1 file changed, 38 deletions(-) delete mode 100644 openpype/hosts/fusion/api/workio.py diff --git a/openpype/hosts/fusion/api/workio.py b/openpype/hosts/fusion/api/workio.py deleted file mode 100644 index fa4b62c123..0000000000 --- a/openpype/hosts/fusion/api/workio.py +++ /dev/null @@ -1,38 +0,0 @@ -"""Host API required Work Files tool""" -import os - -from .lib import get_fusion_module, get_current_comp - - -def file_extensions(): - return [".comp"] - - -def has_unsaved_changes(): - comp = get_current_comp() - return comp.GetAttrs()["COMPB_Modified"] - - -def save_file(filepath): - comp = get_current_comp() - comp.Save(filepath) - - -def open_file(filepath): - fusion = get_fusion_module() - return fusion.LoadComp(filepath) - - -def current_file(): - comp = get_current_comp() - current_filepath = comp.GetAttrs()["COMPS_FileName"] - return current_filepath or None - - -def work_root(session): - work_dir = session["AVALON_WORKDIR"] - scene_dir = session.get("AVALON_SCENEDIR") - if scene_dir: - return os.path.join(work_dir, scene_dir) - else: - return work_dir From 502198d00b4420d766a4a87c6f71c63d7e35ebf8 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 16 Mar 2023 21:53:12 +0300 Subject: [PATCH 891/912] update fusion hooks to get correct version and variables --- .../fusion/hooks/pre_fusion_profile_hook.py | 61 +++++++++++++------ .../hosts/fusion/hooks/pre_fusion_setup.py | 38 +++++------- 2 files changed, 56 insertions(+), 43 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index ba8997fd74..b6ddacb571 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -3,24 +3,38 @@ import shutil import platform from pathlib import Path from openpype.lib import PreLaunchHook -from openpype.hosts.fusion import FUSION_HOST_DIR, get_fusion_profile_number +from openpype.hosts.fusion import ( + FUSION_HOST_DIR, + FUSION_VERSIONS_DICT, + get_fusion_version, +) class FusionCopyPrefsPrelaunch(PreLaunchHook): - """Prepares local Fusion profile directory, copies existing Fusion profile + """ + Prepares local Fusion profile directory, copies existing Fusion profile. + This also sets FUSION MasterPrefs variable, which is used + to apply Master.prefs file to override some Fusion profile settings to: + - enable the OpenPype menu + - force Python 3 over Python 2 + - force English interface + - force grey color scheme (because it is better that the purple one!) + Master.prefs is defined in openpype/hosts/fusion/deploy/fusion_shared.prefs """ app_groups = ["fusion"] order = 2 - def get_fusion_profile_name(self, app_version) -> str: + def get_fusion_profile_name(self, profile_version) -> str: # Returns 'Default', unless FUSION16_PROFILE is set - return os.getenv(f"FUSION{app_version}_PROFILE", "Default") + return os.getenv(f"FUSION{profile_version}_PROFILE", "Default") - def check_profile_variable(self, app_version) -> Path: + def get_fusion_profile_dir(self, profile_version) -> Path: # Get FUSION_PROFILE_DIR variable - fusion_profile = self.get_fusion_profile_name(app_version) - fusion_var_prefs_dir = os.getenv(f"FUSION{app_version}_PROFILE_DIR") + fusion_profile = self.get_fusion_profile_name(profile_version) + fusion_var_prefs_dir = os.getenv( + f"FUSION{profile_version}_PROFILE_DIR" + ) # Check if FUSION_PROFILE_DIR exists if fusion_var_prefs_dir and Path(fusion_var_prefs_dir).is_dir(): @@ -28,12 +42,12 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): self.log.info(f"{fusion_var_prefs_dir} is set to {fu_prefs_dir}") return fu_prefs_dir - def get_profile_source(self, app_version) -> Path: + def get_profile_source(self, profile_version) -> Path: """Get Fusion preferences profile location. See Per-User_Preferences_and_Paths on VFXpedia for reference. """ - fusion_profile = self.get_fusion_profile_name(app_version) - profile_source = self.check_profile_variable(app_version) + fusion_profile = self.get_fusion_profile_name(profile_version) + profile_source = self.get_fusion_profile_dir(profile_version) if profile_source: return profile_source # otherwise get default location of the profile folder @@ -46,7 +60,9 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): ).expanduser() elif platform.system() == "Linux": profile_source = Path("~/.fusion", fu_prefs_dir).expanduser() - self.log.info(f"Locating source Fusion prefs directory: {profile_source}") + self.log.info( + f"Locating source Fusion prefs directory: {profile_source}" + ) return profile_source def get_copy_fusion_prefs_settings(self): @@ -82,14 +98,20 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): self.log.info(f"force_sync option is set to {force_sync}") try: copy_to.mkdir(exist_ok=True, parents=True) - except Exception: - self.log.warn(f"Could not create folder at {copy_to}") + except PermissionError: + self.log.warn(f"Creating the folder not permitted at {copy_to}") return if not copy_from.exists(): self.log.warning(f"Fusion preferences not found in {copy_from}") return for file in copy_from.iterdir(): - if file.suffix in (".prefs", ".def", ".blocklist", ".fu"): + if file.suffix in ( + ".prefs", + ".def", + ".blocklist", + ".fu", + ".toolbars", + ): # convert Path to str to be compatible with Python 3.6+ shutil.copy(str(file), str(copy_to)) self.log.info( @@ -105,25 +127,26 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): # Get launched application context and return correct app version app_data = self.launch_context.env.get("AVALON_APP_NAME") - app_version = get_fusion_profile_number(__name__, app_data) - fu_profile = self.get_fusion_profile_name(app_version) + app_version = get_fusion_version(app_data) + _, profile_version = FUSION_VERSIONS_DICT[app_version] + fu_profile = self.get_fusion_profile_name(profile_version) # do a copy of Fusion profile if copy_status toggle is enabled if copy_status and fu_profile_dir is not None: - profile_source = self.get_profile_source(app_version) + profile_source = self.get_profile_source(profile_version) dest_folder = Path(fu_profile_dir, fu_profile) self.copy_fusion_profile(profile_source, dest_folder, force_sync) # Add temporary profile directory variables to customize Fusion # to define where it can read custom scripts and tools from - fu_profile_dir_variable = f"FUSION{app_version}_PROFILE_DIR" + fu_profile_dir_variable = f"FUSION{profile_version}_PROFILE_DIR" self.log.info(f"Setting {fu_profile_dir_variable}: {fu_profile_dir}") self.launch_context.env[fu_profile_dir_variable] = str(fu_profile_dir) # Add custom Fusion Master Prefs and the temporary # profile directory variables to customize Fusion # to define where it can read custom scripts and tools from - master_prefs_variable = f"FUSION{app_version}_MasterPrefs" + master_prefs_variable = f"FUSION{profile_version}_MasterPrefs" master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs") self.log.info(f"Setting {master_prefs_variable}: {master_prefs}") self.launch_context.env[master_prefs_variable] = str(master_prefs) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index b9f568bad2..a014268c8f 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -2,20 +2,19 @@ import os from openpype.lib import PreLaunchHook, ApplicationLaunchFailed from openpype.hosts.fusion import ( FUSION_HOST_DIR, - get_fusion_profile_number, + FUSION_VERSIONS_DICT, + get_fusion_version, ) class FusionPrelaunch(PreLaunchHook): - """Prepares OpenPype Fusion environment - - Requires FUSION_PYTHON3_HOME to be defined in the environment for Fusion - to point at a valid Python 3 build for Fusion. That is Python 3.3-3.10 - for Fusion 18 and Fusion 3.6 for Fusion 16 and 17. - - This also sets FUSION16_MasterPrefs to apply the fusion master prefs - as set in openpype/hosts/fusion/deploy/fusion_shared.prefs to enable - the OpenPype menu and force Python 3 over Python 2. + """ + Prepares OpenPype Fusion environment. + Requires correct Python home variable to be defined in the environment + settings for Fusion to point at a valid Python 3 build for Fusion. + Python3 versions that are supported by Fusion: + Fusion 9, 16, 17 : Python 3.6 + Fusion 18 : Python 3.6 - 3.10 """ app_groups = ["fusion"] @@ -25,15 +24,14 @@ class FusionPrelaunch(PreLaunchHook): # making sure python 3 is installed at provided path # Py 3.3-3.10 for Fusion 18+ or Py 3.6 for Fu 16-17 app_data = self.launch_context.env.get("AVALON_APP_NAME") - app_version = get_fusion_profile_number(__name__, app_data) + app_version = get_fusion_version(app_data) if not app_version: raise ApplicationLaunchFailed( "Fusion version information not found in System settings.\n" "The key field in the 'applications/fusion/variants' " "should consist a number, corresponding to the Fusion version" ) - - py3_var = "FUSION_PYTHON3_HOME" + py3_var, _ = FUSION_VERSIONS_DICT[app_version] fusion_python3_home = self.launch_context.env.get(py3_var, "") for path in fusion_python3_home.split(os.pathsep): @@ -42,7 +40,6 @@ class FusionPrelaunch(PreLaunchHook): # But make to set only a single path as final variable. py3_dir = os.path.normpath(path) if os.path.isdir(py3_dir): - self.log.info(f"Looking for Python 3 in: {py3_dir}") break else: raise ApplicationLaunchFailed( @@ -57,17 +54,10 @@ class FusionPrelaunch(PreLaunchHook): self.launch_context.env[py3_var] = py3_dir # Fusion 18+ requires FUSION_PYTHON3_HOME to also be on PATH - self.launch_context.env["PATH"] += ";" + py3_dir + if app_version > 17: + self.launch_context.env["PATH"] += ";" + py3_dir - # Fusion 16 and 17 use FUSION16_PYTHON36_HOME instead of - # FUSION_PYTHON3_HOME and will only work with a Python 3.6 version - # TODO: Detect Fusion version to only set for specific Fusion build - if app_version == 9: - self.launch_context.env[f"FUSION_PYTHON36_HOME"] = py3_dir - elif app_version == 16: - self.launch_context.env[ - f"FUSION{app_version}_PYTHON36_HOME" - ] = py3_dir + self.launch_context.env[py3_var] = py3_dir self.log.info(f"Setting OPENPYPE_FUSION: {FUSION_HOST_DIR}") self.launch_context.env["OPENPYPE_FUSION"] = FUSION_HOST_DIR From 4d252b698af788f22fd18607289991fc6cac9d48 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 16 Mar 2023 21:54:45 +0300 Subject: [PATCH 892/912] fix regex escape sequence --- openpype/hosts/fusion/addon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/addon.py b/openpype/hosts/fusion/addon.py index 2ea16e0d6b..0eb7e09003 100644 --- a/openpype/hosts/fusion/addon.py +++ b/openpype/hosts/fusion/addon.py @@ -34,7 +34,7 @@ def get_fusion_version(app_data): if not app_data: return - app_version_candidates = re.findall("\d+", app_data) + app_version_candidates = re.findall(r"\d+", app_data) for app_version in app_version_candidates: if int(app_version) in FUSION_VERSIONS_DICT: return int(app_version) From 5ebdbcf2d284ec7c02f58454e81c998f64b423e2 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 16 Mar 2023 21:55:58 +0300 Subject: [PATCH 893/912] remove whitespaces --- openpype/hosts/fusion/hooks/pre_fusion_setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index a014268c8f..a337a4245e 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -10,11 +10,11 @@ from openpype.hosts.fusion import ( class FusionPrelaunch(PreLaunchHook): """ Prepares OpenPype Fusion environment. - Requires correct Python home variable to be defined in the environment + Requires correct Python home variable to be defined in the environment settings for Fusion to point at a valid Python 3 build for Fusion. Python3 versions that are supported by Fusion: Fusion 9, 16, 17 : Python 3.6 - Fusion 18 : Python 3.6 - 3.10 + Fusion 18 : Python 3.6 - 3.10 """ app_groups = ["fusion"] From dacd50061b602d73ede815cb46e1c656fe41dc9d Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 16 Mar 2023 22:19:46 +0300 Subject: [PATCH 894/912] fix line length --- openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index b6ddacb571..6e7d2558fd 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -91,7 +91,7 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): """ if copy_to.exists() and not force_sync: self.log.info( - "Destination Fusion preferences folder exists, skipping profile copy" + "Destination Fusion preferences folder already exists" ) return self.log.info(f"Starting copying Fusion preferences") From 30d38ab3d1da328551a52c9ae47391af4b49ada6 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 16 Mar 2023 22:21:02 +0300 Subject: [PATCH 895/912] fix typo, early check if no fusion version found --- openpype/hosts/fusion/addon.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/addon.py b/openpype/hosts/fusion/addon.py index 0eb7e09003..7314267124 100644 --- a/openpype/hosts/fusion/addon.py +++ b/openpype/hosts/fusion/addon.py @@ -26,7 +26,7 @@ def get_fusion_version(app_data): To get a correct Fusion version, a version number should be present in the `applications/fusion/variants` key - int the Blackmagic Fusion Application Settings. + of the Blackmagic Fusion Application Settings. """ log = Logger.get_logger(__name__) @@ -35,6 +35,8 @@ def get_fusion_version(app_data): return app_version_candidates = re.findall(r"\d+", app_data) + if not app_version_candidates: + return for app_version in app_version_candidates: if int(app_version) in FUSION_VERSIONS_DICT: return int(app_version) From 97af187f8077d987851b121b02e50dc8a351caa6 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Thu, 16 Mar 2023 22:46:20 +0300 Subject: [PATCH 896/912] catch typos, update comment --- openpype/hosts/fusion/addon.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/addon.py b/openpype/hosts/fusion/addon.py index 7314267124..e7c7a03fa2 100644 --- a/openpype/hosts/fusion/addon.py +++ b/openpype/hosts/fusion/addon.py @@ -7,8 +7,8 @@ FUSION_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) # FUSION_VERSIONS_DICT is used by the pre-launch hooks # The keys correspond to all currently supported Fusion versions -# Values is the list of corresponding python_home variables and a profile -# number, which is used to specify pufion profile derectory variable. +# Each value is a list of corresponding Python home variables and a profile +# number, which is used by the profile hook to set Fusion profile variables. FUSION_VERSIONS_DICT = { 9: ["FUSION_PYTHON36_HOME", 9], 16: ["FUSION16_PYTHON36_HOME", 16], From 3c3722d4082417bb3a2605cf2af4ee9a0448f299 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 17 Mar 2023 00:30:25 +0300 Subject: [PATCH 897/912] use os.pathsep to build the PATH variable --- openpype/hosts/fusion/hooks/pre_fusion_setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index a337a4245e..64c498dd01 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -54,8 +54,8 @@ class FusionPrelaunch(PreLaunchHook): self.launch_context.env[py3_var] = py3_dir # Fusion 18+ requires FUSION_PYTHON3_HOME to also be on PATH - if app_version > 17: - self.launch_context.env["PATH"] += ";" + py3_dir + if app_version >= 18: + self.launch_context.env["PATH"] += os.pathsep + py3_dir self.launch_context.env[py3_var] = py3_dir From fcb723068336eca63635b231cdbd6e7760182981 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 17 Mar 2023 00:57:47 +0300 Subject: [PATCH 898/912] use immutable values --- openpype/hosts/fusion/addon.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/fusion/addon.py b/openpype/hosts/fusion/addon.py index e7c7a03fa2..345e348c3b 100644 --- a/openpype/hosts/fusion/addon.py +++ b/openpype/hosts/fusion/addon.py @@ -10,10 +10,10 @@ FUSION_HOST_DIR = os.path.dirname(os.path.abspath(__file__)) # Each value is a list of corresponding Python home variables and a profile # number, which is used by the profile hook to set Fusion profile variables. FUSION_VERSIONS_DICT = { - 9: ["FUSION_PYTHON36_HOME", 9], - 16: ["FUSION16_PYTHON36_HOME", 16], - 17: ["FUSION16_PYTHON36_HOME", 16], - 18: ["FUSION_PYTHON3_HOME", 16], + 9: ("FUSION_PYTHON36_HOME", 9), + 16: ("FUSION16_PYTHON36_HOME", 16), + 17: ("FUSION16_PYTHON36_HOME", 16), + 18: ("FUSION_PYTHON3_HOME", 16), } From d299824e219a41dc2043925916d20c90ab633d32 Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 17 Mar 2023 01:02:51 +0300 Subject: [PATCH 899/912] ok, do not force grey interface in masterprefs (purple is still bad!) --- openpype/hosts/fusion/deploy/fusion_shared.prefs | 1 - openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py | 1 - 2 files changed, 2 deletions(-) diff --git a/openpype/hosts/fusion/deploy/fusion_shared.prefs b/openpype/hosts/fusion/deploy/fusion_shared.prefs index 17ac3ad37a..b379ea7c66 100644 --- a/openpype/hosts/fusion/deploy/fusion_shared.prefs +++ b/openpype/hosts/fusion/deploy/fusion_shared.prefs @@ -13,7 +13,6 @@ Global = { Python3Forced = true }, UserInterface = { - Skin = "Neutral", Language = "en_US" }, }, diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index 6e7d2558fd..15c9424990 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -18,7 +18,6 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): - enable the OpenPype menu - force Python 3 over Python 2 - force English interface - - force grey color scheme (because it is better that the purple one!) Master.prefs is defined in openpype/hosts/fusion/deploy/fusion_shared.prefs """ From 3b62d0f4a7dfba155d588cfa3c40e6fe5075a61a Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 17 Mar 2023 01:03:22 +0300 Subject: [PATCH 900/912] clarify the error message --- openpype/hosts/fusion/hooks/pre_fusion_setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_setup.py b/openpype/hosts/fusion/hooks/pre_fusion_setup.py index 64c498dd01..f27cd1674b 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_setup.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_setup.py @@ -28,8 +28,8 @@ class FusionPrelaunch(PreLaunchHook): if not app_version: raise ApplicationLaunchFailed( "Fusion version information not found in System settings.\n" - "The key field in the 'applications/fusion/variants' " - "should consist a number, corresponding to the Fusion version" + "The key field in the 'applications/fusion/variants' should " + "consist a number, corresponding to major Fusion version." ) py3_var, _ = FUSION_VERSIONS_DICT[app_version] fusion_python3_home = self.launch_context.env.get(py3_var, "") From bec46399857dd13cf482dc28688a1ffec9a15dac Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov Date: Fri, 17 Mar 2023 01:14:39 +0300 Subject: [PATCH 901/912] revert change --- openpype/hosts/fusion/hooks/pre_fusion_ocio_hook.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_ocio_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_ocio_hook.py index 47645b7e3f..6bf0f55081 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_ocio_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_ocio_hook.py @@ -7,7 +7,6 @@ from openpype.pipeline.template_data import get_template_data_with_names class FusionPreLaunchOCIO(PreLaunchHook): """Set OCIO environment variable for Fusion""" app_groups = ["fusion"] - order = 3 def execute(self): """Hook entry method.""" From 289efe25f8ec1d238ee1f95433b7aea355d42fd0 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 17 Mar 2023 10:35:53 +0100 Subject: [PATCH 902/912] Ftrack: Ftrack additional families filtering (#4633) * make sure all families are used for additional filtering * rely on instance and context data instead of legacy_io * formatting changes * fix variable values after change of condition * use 'families' variable for adding 'ftrack' family * Removed duplicated log * change variable name --- .../plugins/publish/collect_ftrack_family.py | 91 +++++++++---------- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/openpype/modules/ftrack/plugins/publish/collect_ftrack_family.py b/openpype/modules/ftrack/plugins/publish/collect_ftrack_family.py index 576a7d36c4..97815f490f 100644 --- a/openpype/modules/ftrack/plugins/publish/collect_ftrack_family.py +++ b/openpype/modules/ftrack/plugins/publish/collect_ftrack_family.py @@ -7,23 +7,22 @@ Provides: """ import pyblish.api -from openpype.pipeline import legacy_io from openpype.lib import filter_profiles class CollectFtrackFamily(pyblish.api.InstancePlugin): + """Adds explicitly 'ftrack' to families to upload instance to FTrack. + + Uses selection by combination of hosts/families/tasks names via + profiles resolution. + + Triggered everywhere, checks instance against configured. + + Checks advanced filtering which works on 'families' not on main + 'family', as some variants dynamically resolves addition of ftrack + based on 'families' (editorial drives it by presence of 'review') """ - Adds explicitly 'ftrack' to families to upload instance to FTrack. - Uses selection by combination of hosts/families/tasks names via - profiles resolution. - - Triggered everywhere, checks instance against configured. - - Checks advanced filtering which works on 'families' not on main - 'family', as some variants dynamically resolves addition of ftrack - based on 'families' (editorial drives it by presence of 'review') - """ label = "Collect Ftrack Family" order = pyblish.api.CollectorOrder + 0.4990 @@ -34,68 +33,64 @@ class CollectFtrackFamily(pyblish.api.InstancePlugin): self.log.warning("No profiles present for adding Ftrack family") return - add_ftrack_family = False - task_name = instance.data.get("task", - legacy_io.Session["AVALON_TASK"]) - host_name = legacy_io.Session["AVALON_APP"] + host_name = instance.context.data["hostName"] family = instance.data["family"] + task_name = instance.data.get("task") filtering_criteria = { "hosts": host_name, "families": family, "tasks": task_name } - profile = filter_profiles(self.profiles, filtering_criteria, - logger=self.log) + profile = filter_profiles( + self.profiles, + filtering_criteria, + logger=self.log + ) + + add_ftrack_family = False + families = instance.data.setdefault("families", []) if profile: - families = instance.data.get("families") add_ftrack_family = profile["add_ftrack_family"] - additional_filters = profile.get("advanced_filtering") if additional_filters: - self.log.info("'{}' families used for additional filtering". - format(families)) + families_set = set(families) | {family} + self.log.info( + "'{}' families used for additional filtering".format( + families_set)) add_ftrack_family = self._get_add_ftrack_f_from_addit_filters( additional_filters, - families, + families_set, add_ftrack_family ) - if add_ftrack_family: - self.log.debug("Adding ftrack family for '{}'". - format(instance.data.get("family"))) + result_str = "Not adding" + if add_ftrack_family: + result_str = "Adding" + if "ftrack" not in families: + families.append("ftrack") - if families: - if "ftrack" not in families: - instance.data["families"].append("ftrack") - else: - instance.data["families"] = ["ftrack"] - - result_str = "Adding" - if not add_ftrack_family: - result_str = "Not adding" self.log.info("{} 'ftrack' family for instance with '{}'".format( result_str, family )) - def _get_add_ftrack_f_from_addit_filters(self, - additional_filters, - families, - add_ftrack_family): - """ - Compares additional filters - working on instance's families. + def _get_add_ftrack_f_from_addit_filters( + self, additional_filters, families, add_ftrack_family + ): + """Compares additional filters - working on instance's families. - Triggered for more detailed filtering when main family matches, - but content of 'families' actually matter. - (For example 'review' in 'families' should result in adding to - Ftrack) + Triggered for more detailed filtering when main family matches, + but content of 'families' actually matter. + (For example 'review' in 'families' should result in adding to + Ftrack) - Args: - additional_filters (dict) - from Setting - families (list) - subfamilies - add_ftrack_family (bool) - add ftrack to families if True + Args: + additional_filters (dict) - from Setting + families (set[str]) - subfamilies + add_ftrack_family (bool) - add ftrack to families if True """ + override_filter = None override_filter_value = -1 for additional_filter in additional_filters: From 249bda0c8020ac5f8b00575de58cc17690cf697d Mon Sep 17 00:00:00 2001 From: Alexey Bogomolov <11698866+movalex@users.noreply.github.com> Date: Fri, 17 Mar 2023 13:41:32 +0300 Subject: [PATCH 903/912] Clockify: refresh and fix the integration (#4607) * WIP clockify fix * WIP disable wp validation, make sync work * fix launcher start timer action * fix finish time entry * fix start and stop timers, cleanup, add TODO * show task name and type in description, add TODO * change rate limiter constants * black formatting * remove task type from data * cleanup debug prints * fix hound comments * remove unused import * move ids to property, fix user validation * remove f-strings, rollback description parsing * attempt to fix ftrack actions * check if sync action got some projects * get api data on process * remove unused variable * remove ratelimiter dependency * add response validation * a bit cleanup * Update openpype/modules/clockify/clockify_module.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> * Update openpype/modules/clockify/clockify_api.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> * Update openpype/modules/clockify/clockify_api.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> * Update openpype/modules/clockify/clockify_api.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> * Update openpype/modules/clockify/ftrack/server/action_clockify_sync_server.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> * replace dunders with underscores * remove excessive variables * update set_user_id * continue check_running if no timer found * bring back come py2 compatibility * cleanup * get values directly from clockapi * hound * get task type to fill the tag field correctly * add logger, catch some json errors * remove check running timer, add project_id verification module * add current task_id check * remove package entries * make method private, fix typo * get task_type for the idle-restarted timer * remove trailing whitespace * show correct idle countdown values * finx indentation * Update openpype/modules/clockify/clockify_api.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> * Update openpype/modules/clockify/clockify_module.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> * revert lock file * remove unused constants and redundant code * import clockify_api inside the method * do not query asset docs double time, add comments * add permissions check fail Exception * rename clockapi to clockify_api * formatting * removed unused variables --------- Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Co-authored-by: Jakub Trllo --- openpype/modules/clockify/clockify_api.py | 363 ++++++++---------- openpype/modules/clockify/clockify_module.py | 173 ++++----- openpype/modules/clockify/constants.py | 2 +- .../server/action_clockify_sync_server.py | 25 +- .../ftrack/user/action_clockify_sync_local.py | 26 +- .../launcher_actions/ClockifyStart.py | 48 ++- .../clockify/launcher_actions/ClockifySync.py | 55 ++- openpype/modules/clockify/widgets.py | 16 +- .../modules/timers_manager/timers_manager.py | 4 +- 9 files changed, 361 insertions(+), 351 deletions(-) diff --git a/openpype/modules/clockify/clockify_api.py b/openpype/modules/clockify/clockify_api.py index 6af911fffc..80979c83ab 100644 --- a/openpype/modules/clockify/clockify_api.py +++ b/openpype/modules/clockify/clockify_api.py @@ -6,34 +6,22 @@ import datetime import requests from .constants import ( CLOCKIFY_ENDPOINT, - ADMIN_PERMISSION_NAMES + ADMIN_PERMISSION_NAMES, ) from openpype.lib.local_settings import OpenPypeSecureRegistry - - -def time_check(obj): - if obj.request_counter < 10: - obj.request_counter += 1 - return - - wait_time = 1 - (time.time() - obj.request_time) - if wait_time > 0: - time.sleep(wait_time) - - obj.request_time = time.time() - obj.request_counter = 0 +from openpype.lib import Logger class ClockifyAPI: + log = Logger.get_logger(__name__) + def __init__(self, api_key=None, master_parent=None): self.workspace_name = None - self.workspace_id = None self.master_parent = master_parent self.api_key = api_key - self.request_counter = 0 - self.request_time = time.time() - + self._workspace_id = None + self._user_id = None self._secure_registry = None @property @@ -44,11 +32,19 @@ class ClockifyAPI: @property def headers(self): - return {"X-Api-Key": self.api_key} + return {"x-api-key": self.api_key} + + @property + def workspace_id(self): + return self._workspace_id + + @property + def user_id(self): + return self._user_id def verify_api(self): for key, value in self.headers.items(): - if value is None or value.strip() == '': + if value is None or value.strip() == "": return False return True @@ -59,65 +55,55 @@ class ClockifyAPI: if api_key is not None and self.validate_api_key(api_key) is True: self.api_key = api_key self.set_workspace() + self.set_user_id() if self.master_parent: self.master_parent.signed_in() return True return False def validate_api_key(self, api_key): - test_headers = {'X-Api-Key': api_key} - action_url = 'workspaces/' - time_check(self) + test_headers = {"x-api-key": api_key} + action_url = "user" response = requests.get( - CLOCKIFY_ENDPOINT + action_url, - headers=test_headers + CLOCKIFY_ENDPOINT + action_url, headers=test_headers ) if response.status_code != 200: return False return True - def validate_workspace_perm(self, workspace_id=None): - user_id = self.get_user_id() + def validate_workspace_permissions(self, workspace_id=None, user_id=None): if user_id is None: + self.log.info("No user_id found during validation") return False if workspace_id is None: workspace_id = self.workspace_id - action_url = "/workspaces/{}/users/{}/permissions".format( - workspace_id, user_id - ) - time_check(self) + action_url = f"workspaces/{workspace_id}/users?includeRoles=1" response = requests.get( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers + CLOCKIFY_ENDPOINT + action_url, headers=self.headers ) - user_permissions = response.json() - for perm in user_permissions: - if perm['name'] in ADMIN_PERMISSION_NAMES: + data = response.json() + for user in data: + if user.get("id") == user_id: + roles_data = user.get("roles") + for entities in roles_data: + if entities.get("role") in ADMIN_PERMISSION_NAMES: return True return False def get_user_id(self): - action_url = 'v1/user/' - time_check(self) + action_url = "user" response = requests.get( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers + CLOCKIFY_ENDPOINT + action_url, headers=self.headers ) - # this regex is neccessary: UNICODE strings are crashing - # during json serialization - id_regex = '\"{1}id\"{1}\:{1}\"{1}\w+\"{1}' - result = re.findall(id_regex, str(response.content)) - if len(result) != 1: - # replace with log and better message? - print('User ID was not found (this is a BUG!!!)') - return None - return json.loads('{'+result[0]+'}')['id'] + result = response.json() + user_id = result.get("id", None) + + return user_id def set_workspace(self, name=None): if name is None: - name = os.environ.get('CLOCKIFY_WORKSPACE', None) + name = os.environ.get("CLOCKIFY_WORKSPACE", None) self.workspace_name = name - self.workspace_id = None if self.workspace_name is None: return try: @@ -125,7 +111,7 @@ class ClockifyAPI: except Exception: result = False if result is not False: - self.workspace_id = result + self._workspace_id = result if self.master_parent is not None: self.master_parent.start_timer_check() return True @@ -139,6 +125,14 @@ class ClockifyAPI: return all_workspaces[name] return False + def set_user_id(self): + try: + user_id = self.get_user_id() + except Exception: + user_id = None + if user_id is not None: + self._user_id = user_id + def get_api_key(self): return self.secure_registry.get_item("api_key", None) @@ -146,11 +140,9 @@ class ClockifyAPI: self.secure_registry.set_item("api_key", api_key) def get_workspaces(self): - action_url = 'workspaces/' - time_check(self) + action_url = "workspaces/" response = requests.get( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers + CLOCKIFY_ENDPOINT + action_url, headers=self.headers ) return { workspace["name"]: workspace["id"] for workspace in response.json() @@ -159,27 +151,22 @@ class ClockifyAPI: def get_projects(self, workspace_id=None): if workspace_id is None: workspace_id = self.workspace_id - action_url = 'workspaces/{}/projects/'.format(workspace_id) - time_check(self) + action_url = f"workspaces/{workspace_id}/projects" response = requests.get( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers + CLOCKIFY_ENDPOINT + action_url, headers=self.headers ) - - return { - project["name"]: project["id"] for project in response.json() - } + if response.status_code != 403: + result = response.json() + return {project["name"]: project["id"] for project in result} def get_project_by_id(self, project_id, workspace_id=None): if workspace_id is None: workspace_id = self.workspace_id - action_url = 'workspaces/{}/projects/{}/'.format( + action_url = "workspaces/{}/projects/{}".format( workspace_id, project_id ) - time_check(self) response = requests.get( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers + CLOCKIFY_ENDPOINT + action_url, headers=self.headers ) return response.json() @@ -187,32 +174,24 @@ class ClockifyAPI: def get_tags(self, workspace_id=None): if workspace_id is None: workspace_id = self.workspace_id - action_url = 'workspaces/{}/tags/'.format(workspace_id) - time_check(self) + action_url = "workspaces/{}/tags".format(workspace_id) response = requests.get( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers + CLOCKIFY_ENDPOINT + action_url, headers=self.headers ) - return { - tag["name"]: tag["id"] for tag in response.json() - } + return {tag["name"]: tag["id"] for tag in response.json()} def get_tasks(self, project_id, workspace_id=None): if workspace_id is None: workspace_id = self.workspace_id - action_url = 'workspaces/{}/projects/{}/tasks/'.format( + action_url = "workspaces/{}/projects/{}/tasks".format( workspace_id, project_id ) - time_check(self) response = requests.get( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers + CLOCKIFY_ENDPOINT + action_url, headers=self.headers ) - return { - task["name"]: task["id"] for task in response.json() - } + return {task["name"]: task["id"] for task in response.json()} def get_workspace_id(self, workspace_name): all_workspaces = self.get_workspaces() @@ -236,48 +215,64 @@ class ClockifyAPI: return None return all_tasks[tag_name] - def get_task_id( - self, task_name, project_id, workspace_id=None - ): + def get_task_id(self, task_name, project_id, workspace_id=None): if workspace_id is None: workspace_id = self.workspace_id - all_tasks = self.get_tasks( - project_id, workspace_id - ) + all_tasks = self.get_tasks(project_id, workspace_id) if task_name not in all_tasks: return None return all_tasks[task_name] def get_current_time(self): - return str(datetime.datetime.utcnow().isoformat())+'Z' + return str(datetime.datetime.utcnow().isoformat()) + "Z" def start_time_entry( - self, description, project_id, task_id=None, tag_ids=[], - workspace_id=None, billable=True + self, + description, + project_id, + task_id=None, + tag_ids=None, + workspace_id=None, + user_id=None, + billable=True, ): # Workspace if workspace_id is None: workspace_id = self.workspace_id + # User ID + if user_id is None: + user_id = self._user_id + + # get running timer to check if we need to start it + current_timer = self.get_in_progress() # Check if is currently run another times and has same values - current = self.get_in_progress(workspace_id) - if current is not None: + # DO not restart the timer, if it is already running for curent task + if current_timer: + current_timer_hierarchy = current_timer.get("description") + current_project_id = current_timer.get("projectId") + current_task_id = current_timer.get("taskId") if ( - current.get("description", None) == description and - current.get("projectId", None) == project_id and - current.get("taskId", None) == task_id + description == current_timer_hierarchy + and project_id == current_project_id + and task_id == current_task_id ): + self.log.info( + "Timer for the current project is already running" + ) self.bool_timer_run = True return self.bool_timer_run - self.finish_time_entry(workspace_id) + self.finish_time_entry() # Convert billable to strings if billable: - billable = 'true' + billable = "true" else: - billable = 'false' + billable = "false" # Rest API Action - action_url = 'workspaces/{}/timeEntries/'.format(workspace_id) + action_url = "workspaces/{}/user/{}/time-entries".format( + workspace_id, user_id + ) start = self.get_current_time() body = { "start": start, @@ -285,169 +280,135 @@ class ClockifyAPI: "description": description, "projectId": project_id, "taskId": task_id, - "tagIds": tag_ids + "tagIds": tag_ids, } - time_check(self) response = requests.post( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers, - json=body + CLOCKIFY_ENDPOINT + action_url, headers=self.headers, json=body ) - - success = False if response.status_code < 300: - success = True - return success + return True + return False - def get_in_progress(self, workspace_id=None): - if workspace_id is None: - workspace_id = self.workspace_id - action_url = 'workspaces/{}/timeEntries/inProgress'.format( - workspace_id - ) - time_check(self) - response = requests.get( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers - ) + def _get_current_timer_values(self, response): + if response is None: + return try: output = response.json() except json.decoder.JSONDecodeError: - output = None - return output + return None + if output and isinstance(output, list): + return output[0] + return None - def finish_time_entry(self, workspace_id=None): + def get_in_progress(self, user_id=None, workspace_id=None): if workspace_id is None: workspace_id = self.workspace_id - current = self.get_in_progress(workspace_id) - if current is None: - return + if user_id is None: + user_id = self.user_id - current_id = current["id"] - action_url = 'workspaces/{}/timeEntries/{}'.format( - workspace_id, current_id + action_url = ( + f"workspaces/{workspace_id}/user/" + f"{user_id}/time-entries?in-progress=1" ) - body = { - "start": current["timeInterval"]["start"], - "billable": current["billable"], - "description": current["description"], - "projectId": current["projectId"], - "taskId": current["taskId"], - "tagIds": current["tagIds"], - "end": self.get_current_time() - } - time_check(self) - response = requests.put( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers, - json=body + response = requests.get( + CLOCKIFY_ENDPOINT + action_url, headers=self.headers + ) + return self._get_current_timer_values(response) + + def finish_time_entry(self, workspace_id=None, user_id=None): + if workspace_id is None: + workspace_id = self.workspace_id + if user_id is None: + user_id = self.user_id + current_timer = self.get_in_progress() + if not current_timer: + return + action_url = "workspaces/{}/user/{}/time-entries".format( + workspace_id, user_id + ) + body = {"end": self.get_current_time()} + response = requests.patch( + CLOCKIFY_ENDPOINT + action_url, headers=self.headers, json=body ) return response.json() - def get_time_entries( - self, workspace_id=None, quantity=10 - ): + def get_time_entries(self, workspace_id=None, user_id=None, quantity=10): if workspace_id is None: workspace_id = self.workspace_id - action_url = 'workspaces/{}/timeEntries/'.format(workspace_id) - time_check(self) + if user_id is None: + user_id = self.user_id + action_url = "workspaces/{}/user/{}/time-entries".format( + workspace_id, user_id + ) response = requests.get( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers + CLOCKIFY_ENDPOINT + action_url, headers=self.headers ) return response.json()[:quantity] - def remove_time_entry(self, tid, workspace_id=None): + def remove_time_entry(self, tid, workspace_id=None, user_id=None): if workspace_id is None: workspace_id = self.workspace_id - action_url = 'workspaces/{}/timeEntries/{}'.format( - workspace_id, tid + action_url = "workspaces/{}/user/{}/time-entries/{}".format( + workspace_id, user_id, tid ) - time_check(self) response = requests.delete( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers + CLOCKIFY_ENDPOINT + action_url, headers=self.headers ) return response.json() def add_project(self, name, workspace_id=None): if workspace_id is None: workspace_id = self.workspace_id - action_url = 'workspaces/{}/projects/'.format(workspace_id) + action_url = "workspaces/{}/projects".format(workspace_id) body = { "name": name, "clientId": "", "isPublic": "false", - "estimate": { - "estimate": 0, - "type": "AUTO" - }, + "estimate": {"estimate": 0, "type": "AUTO"}, "color": "#f44336", - "billable": "true" + "billable": "true", } - time_check(self) response = requests.post( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers, - json=body + CLOCKIFY_ENDPOINT + action_url, headers=self.headers, json=body ) return response.json() def add_workspace(self, name): - action_url = 'workspaces/' + action_url = "workspaces/" body = {"name": name} - time_check(self) response = requests.post( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers, - json=body + CLOCKIFY_ENDPOINT + action_url, headers=self.headers, json=body ) return response.json() - def add_task( - self, name, project_id, workspace_id=None - ): + def add_task(self, name, project_id, workspace_id=None): if workspace_id is None: workspace_id = self.workspace_id - action_url = 'workspaces/{}/projects/{}/tasks/'.format( + action_url = "workspaces/{}/projects/{}/tasks".format( workspace_id, project_id ) - body = { - "name": name, - "projectId": project_id - } - time_check(self) + body = {"name": name, "projectId": project_id} response = requests.post( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers, - json=body + CLOCKIFY_ENDPOINT + action_url, headers=self.headers, json=body ) return response.json() def add_tag(self, name, workspace_id=None): if workspace_id is None: workspace_id = self.workspace_id - action_url = 'workspaces/{}/tags'.format(workspace_id) - body = { - "name": name - } - time_check(self) + action_url = "workspaces/{}/tags".format(workspace_id) + body = {"name": name} response = requests.post( - CLOCKIFY_ENDPOINT + action_url, - headers=self.headers, - json=body + CLOCKIFY_ENDPOINT + action_url, headers=self.headers, json=body ) return response.json() - def delete_project( - self, project_id, workspace_id=None - ): + def delete_project(self, project_id, workspace_id=None): if workspace_id is None: workspace_id = self.workspace_id - action_url = '/workspaces/{}/projects/{}'.format( + action_url = "/workspaces/{}/projects/{}".format( workspace_id, project_id ) - time_check(self) response = requests.delete( CLOCKIFY_ENDPOINT + action_url, headers=self.headers, @@ -455,12 +416,12 @@ class ClockifyAPI: return response.json() def convert_input( - self, entity_id, entity_name, mode='Workspace', project_id=None + self, entity_id, entity_name, mode="Workspace", project_id=None ): if entity_id is None: error = False error_msg = 'Missing information "{}"' - if mode.lower() == 'workspace': + if mode.lower() == "workspace": if entity_id is None and entity_name is None: if self.workspace_id is not None: entity_id = self.workspace_id @@ -471,14 +432,14 @@ class ClockifyAPI: else: if entity_id is None and entity_name is None: error = True - elif mode.lower() == 'project': + elif mode.lower() == "project": entity_id = self.get_project_id(entity_name) - elif mode.lower() == 'task': + elif mode.lower() == "task": entity_id = self.get_task_id( task_name=entity_name, project_id=project_id ) else: - raise TypeError('Unknown type') + raise TypeError("Unknown type") # Raise error if error: raise ValueError(error_msg.format(mode)) diff --git a/openpype/modules/clockify/clockify_module.py b/openpype/modules/clockify/clockify_module.py index 300d5576e2..200a268ad7 100644 --- a/openpype/modules/clockify/clockify_module.py +++ b/openpype/modules/clockify/clockify_module.py @@ -2,24 +2,13 @@ import os import threading import time -from openpype.modules import ( - OpenPypeModule, - ITrayModule, - IPluginPaths -) +from openpype.modules import OpenPypeModule, ITrayModule, IPluginPaths +from openpype.client import get_asset_by_name -from .clockify_api import ClockifyAPI -from .constants import ( - CLOCKIFY_FTRACK_USER_PATH, - CLOCKIFY_FTRACK_SERVER_PATH -) +from .constants import CLOCKIFY_FTRACK_USER_PATH, CLOCKIFY_FTRACK_SERVER_PATH -class ClockifyModule( - OpenPypeModule, - ITrayModule, - IPluginPaths -): +class ClockifyModule(OpenPypeModule, ITrayModule, IPluginPaths): name = "clockify" def initialize(self, modules_settings): @@ -33,18 +22,23 @@ class ClockifyModule( self.timer_manager = None self.MessageWidgetClass = None self.message_widget = None - - self.clockapi = ClockifyAPI(master_parent=self) + self._clockify_api = None # TimersManager attributes # - set `timers_manager_connector` only in `tray_init` self.timers_manager_connector = None self._timers_manager_module = None + @property + def clockify_api(self): + if self._clockify_api is None: + from .clockify_api import ClockifyAPI + + self._clockify_api = ClockifyAPI(master_parent=self) + return self._clockify_api + def get_global_environments(self): - return { - "CLOCKIFY_WORKSPACE": self.workspace_name - } + return {"CLOCKIFY_WORKSPACE": self.workspace_name} def tray_init(self): from .widgets import ClockifySettings, MessageWidget @@ -52,7 +46,7 @@ class ClockifyModule( self.MessageWidgetClass = MessageWidget self.message_widget = None - self.widget_settings = ClockifySettings(self.clockapi) + self.widget_settings = ClockifySettings(self.clockify_api) self.widget_settings_required = None self.thread_timer_check = None @@ -61,7 +55,7 @@ class ClockifyModule( self.bool_api_key_set = False self.bool_workspace_set = False self.bool_timer_run = False - self.bool_api_key_set = self.clockapi.set_api() + self.bool_api_key_set = self.clockify_api.set_api() # Define itself as TimersManager connector self.timers_manager_connector = self @@ -71,12 +65,11 @@ class ClockifyModule( self.show_settings() return - self.bool_workspace_set = self.clockapi.workspace_id is not None + self.bool_workspace_set = self.clockify_api.workspace_id is not None if self.bool_workspace_set is False: return self.start_timer_check() - self.set_menu_visibility() def tray_exit(self, *_a, **_kw): @@ -85,23 +78,19 @@ class ClockifyModule( def get_plugin_paths(self): """Implementaton of IPluginPaths to get plugin paths.""" actions_path = os.path.join( - os.path.dirname(os.path.abspath(__file__)), - "launcher_actions" + os.path.dirname(os.path.abspath(__file__)), "launcher_actions" ) - return { - "actions": [actions_path] - } + return {"actions": [actions_path]} def get_ftrack_event_handler_paths(self): """Function for Ftrack module to add ftrack event handler paths.""" return { "user": [CLOCKIFY_FTRACK_USER_PATH], - "server": [CLOCKIFY_FTRACK_SERVER_PATH] + "server": [CLOCKIFY_FTRACK_SERVER_PATH], } def clockify_timer_stopped(self): self.bool_timer_run = False - # Call `ITimersManager` method self.timer_stopped() def start_timer_check(self): @@ -122,45 +111,44 @@ class ClockifyModule( def check_running(self): while self.bool_thread_check_running is True: bool_timer_run = False - if self.clockapi.get_in_progress() is not None: + if self.clockify_api.get_in_progress() is not None: bool_timer_run = True if self.bool_timer_run != bool_timer_run: if self.bool_timer_run is True: self.clockify_timer_stopped() elif self.bool_timer_run is False: - actual_timer = self.clockapi.get_in_progress() - if not actual_timer: + current_timer = self.clockify_api.get_in_progress() + if current_timer is None: + continue + current_proj_id = current_timer.get("projectId") + if not current_proj_id: continue - actual_proj_id = actual_timer["projectId"] - if not actual_proj_id: - continue - - project = self.clockapi.get_project_by_id(actual_proj_id) + project = self.clockify_api.get_project_by_id( + current_proj_id + ) if project and project.get("code") == 501: continue - project_name = project["name"] + project_name = project.get("name") - actual_timer_hierarchy = actual_timer["description"] - hierarchy_items = actual_timer_hierarchy.split("/") + current_timer_hierarchy = current_timer.get("description") + if not current_timer_hierarchy: + continue + hierarchy_items = current_timer_hierarchy.split("/") # Each pype timer must have at least 2 items! if len(hierarchy_items) < 2: continue + task_name = hierarchy_items[-1] hierarchy = hierarchy_items[:-1] - task_type = None - if len(actual_timer.get("tags", [])) > 0: - task_type = actual_timer["tags"][0].get("name") data = { "task_name": task_name, "hierarchy": hierarchy, "project_name": project_name, - "task_type": task_type } - # Call `ITimersManager` method self.timer_started(data) self.bool_timer_run = bool_timer_run @@ -184,6 +172,7 @@ class ClockifyModule( def tray_menu(self, parent_menu): # Menu for Tray App from qtpy import QtWidgets + menu = QtWidgets.QMenu("Clockify", parent_menu) menu.setProperty("submenu", "on") @@ -204,7 +193,9 @@ class ClockifyModule( parent_menu.addMenu(menu) def show_settings(self): - self.widget_settings.input_api_key.setText(self.clockapi.get_api_key()) + self.widget_settings.input_api_key.setText( + self.clockify_api.get_api_key() + ) self.widget_settings.show() def set_menu_visibility(self): @@ -218,72 +209,82 @@ class ClockifyModule( def timer_started(self, data): """Tell TimersManager that timer started.""" if self._timers_manager_module is not None: - self._timers_manager_module.timer_started(self._module.id, data) + self._timers_manager_module.timer_started(self.id, data) def timer_stopped(self): """Tell TimersManager that timer stopped.""" if self._timers_manager_module is not None: - self._timers_manager_module.timer_stopped(self._module.id) + self._timers_manager_module.timer_stopped(self.id) def stop_timer(self): """Called from TimersManager to stop timer.""" - self.clockapi.finish_time_entry() + self.clockify_api.finish_time_entry() - def start_timer(self, input_data): - """Called from TimersManager to start timer.""" - # If not api key is not entered then skip - if not self.clockapi.get_api_key(): - return - - actual_timer = self.clockapi.get_in_progress() - actual_timer_hierarchy = None - actual_project_id = None - if actual_timer is not None: - actual_timer_hierarchy = actual_timer.get("description") - actual_project_id = actual_timer.get("projectId") - - # Concatenate hierarchy and task to get description - desc_items = [val for val in input_data.get("hierarchy", [])] - desc_items.append(input_data["task_name"]) - description = "/".join(desc_items) - - # Check project existence - project_name = input_data["project_name"] - project_id = self.clockapi.get_project_id(project_name) + def _verify_project_exists(self, project_name): + project_id = self.clockify_api.get_project_id(project_name) if not project_id: - self.log.warning(( - "Project \"{}\" was not found in Clockify. Timer won't start." - ).format(project_name)) + self.log.warning( + 'Project "{}" was not found in Clockify. Timer won\'t start.' + ).format(project_name) if not self.MessageWidgetClass: return msg = ( - "Project \"{}\" is not" - " in Clockify Workspace \"{}\"." + 'Project "{}" is not' + ' in Clockify Workspace "{}".' "

Please inform your Project Manager." - ).format(project_name, str(self.clockapi.workspace_name)) + ).format(project_name, str(self.clockify_api.workspace_name)) self.message_widget = self.MessageWidgetClass( msg, "Clockify - Info Message" ) self.message_widget.closed.connect(self.on_message_widget_close) self.message_widget.show() + return False + return project_id + def start_timer(self, input_data): + """Called from TimersManager to start timer.""" + # If not api key is not entered then skip + if not self.clockify_api.get_api_key(): return - if ( - actual_timer is not None and - description == actual_timer_hierarchy and - project_id == actual_project_id - ): + task_name = input_data.get("task_name") + + # Concatenate hierarchy and task to get description + description_items = list(input_data.get("hierarchy", [])) + description_items.append(task_name) + description = "/".join(description_items) + + # Check project existence + project_name = input_data.get("project_name") + project_id = self._verify_project_exists(project_name) + if not project_id: return + # Setup timer tags tag_ids = [] - task_tag_id = self.clockapi.get_tag_id(input_data["task_type"]) + tag_name = input_data.get("task_type") + if not tag_name: + # no task_type found in the input data + # if the timer is restarted by idle time (bug?) + asset_name = input_data["hierarchy"][-1] + asset_doc = get_asset_by_name(project_name, asset_name) + task_info = asset_doc["data"]["tasks"][task_name] + tag_name = task_info.get("type", "") + if not tag_name: + self.log.info("No tag information found for the timer") + + task_tag_id = self.clockify_api.get_tag_id(tag_name) if task_tag_id is not None: tag_ids.append(task_tag_id) - self.clockapi.start_time_entry( - description, project_id, tag_ids=tag_ids + # Start timer + self.clockify_api.start_time_entry( + description, + project_id, + tag_ids=tag_ids, + workspace_id=self.clockify_api.workspace_id, + user_id=self.clockify_api.user_id, ) diff --git a/openpype/modules/clockify/constants.py b/openpype/modules/clockify/constants.py index 66f6cb899a..4574f91be1 100644 --- a/openpype/modules/clockify/constants.py +++ b/openpype/modules/clockify/constants.py @@ -9,4 +9,4 @@ CLOCKIFY_FTRACK_USER_PATH = os.path.join( ) ADMIN_PERMISSION_NAMES = ["WORKSPACE_OWN", "WORKSPACE_ADMIN"] -CLOCKIFY_ENDPOINT = "https://api.clockify.me/api/" +CLOCKIFY_ENDPOINT = "https://api.clockify.me/api/v1/" diff --git a/openpype/modules/clockify/ftrack/server/action_clockify_sync_server.py b/openpype/modules/clockify/ftrack/server/action_clockify_sync_server.py index c6b55947da..985cf49b97 100644 --- a/openpype/modules/clockify/ftrack/server/action_clockify_sync_server.py +++ b/openpype/modules/clockify/ftrack/server/action_clockify_sync_server.py @@ -4,7 +4,7 @@ from openpype_modules.ftrack.lib import ServerAction from openpype_modules.clockify.clockify_api import ClockifyAPI -class SyncClocifyServer(ServerAction): +class SyncClockifyServer(ServerAction): '''Synchronise project names and task types.''' identifier = "clockify.sync.server" @@ -14,12 +14,12 @@ class SyncClocifyServer(ServerAction): role_list = ["Pypeclub", "Administrator", "project Manager"] def __init__(self, *args, **kwargs): - super(SyncClocifyServer, self).__init__(*args, **kwargs) + super(SyncClockifyServer, self).__init__(*args, **kwargs) workspace_name = os.environ.get("CLOCKIFY_WORKSPACE") api_key = os.environ.get("CLOCKIFY_API_KEY") - self.clockapi = ClockifyAPI(api_key) - self.clockapi.set_workspace(workspace_name) + self.clockify_api = ClockifyAPI(api_key) + self.clockify_api.set_workspace(workspace_name) if api_key is None: modified_key = "None" else: @@ -48,13 +48,16 @@ class SyncClocifyServer(ServerAction): return True def launch(self, session, entities, event): - if self.clockapi.workspace_id is None: + self.clockify_api.set_api() + if self.clockify_api.workspace_id is None: return { "success": False, "message": "Clockify Workspace or API key are not set!" } - if self.clockapi.validate_workspace_perm() is False: + if not self.clockify_api.validate_workspace_permissions( + self.clockify_api.workspace_id, self.clockify_api.user_id + ): return { "success": False, "message": "Missing permissions for this action!" @@ -88,9 +91,9 @@ class SyncClocifyServer(ServerAction): task_type["name"] for task_type in task_types ] try: - clockify_projects = self.clockapi.get_projects() + clockify_projects = self.clockify_api.get_projects() if project_name not in clockify_projects: - response = self.clockapi.add_project(project_name) + response = self.clockify_api.add_project(project_name) if "id" not in response: self.log.warning( "Project \"{}\" can't be created. Response: {}".format( @@ -105,7 +108,7 @@ class SyncClocifyServer(ServerAction): ).format(project_name) } - clockify_workspace_tags = self.clockapi.get_tags() + clockify_workspace_tags = self.clockify_api.get_tags() for task_type_name in task_type_names: if task_type_name in clockify_workspace_tags: self.log.debug( @@ -113,7 +116,7 @@ class SyncClocifyServer(ServerAction): ) continue - response = self.clockapi.add_tag(task_type_name) + response = self.clockify_api.add_tag(task_type_name) if "id" not in response: self.log.warning( "Task \"{}\" can't be created. Response: {}".format( @@ -138,4 +141,4 @@ class SyncClocifyServer(ServerAction): def register(session, **kw): - SyncClocifyServer(session).register() + SyncClockifyServer(session).register() diff --git a/openpype/modules/clockify/ftrack/user/action_clockify_sync_local.py b/openpype/modules/clockify/ftrack/user/action_clockify_sync_local.py index a430791906..0e8cf6bd37 100644 --- a/openpype/modules/clockify/ftrack/user/action_clockify_sync_local.py +++ b/openpype/modules/clockify/ftrack/user/action_clockify_sync_local.py @@ -3,7 +3,7 @@ from openpype_modules.ftrack.lib import BaseAction, statics_icon from openpype_modules.clockify.clockify_api import ClockifyAPI -class SyncClocifyLocal(BaseAction): +class SyncClockifyLocal(BaseAction): '''Synchronise project names and task types.''' #: Action identifier. @@ -18,9 +18,9 @@ class SyncClocifyLocal(BaseAction): icon = statics_icon("app_icons", "clockify-white.png") def __init__(self, *args, **kwargs): - super(SyncClocifyLocal, self).__init__(*args, **kwargs) + super(SyncClockifyLocal, self).__init__(*args, **kwargs) #: CLockifyApi - self.clockapi = ClockifyAPI() + self.clockify_api = ClockifyAPI() def discover(self, session, entities, event): if ( @@ -31,14 +31,18 @@ class SyncClocifyLocal(BaseAction): return False def launch(self, session, entities, event): - self.clockapi.set_api() - if self.clockapi.workspace_id is None: + self.clockify_api.set_api() + if self.clockify_api.workspace_id is None: return { "success": False, "message": "Clockify Workspace or API key are not set!" } - if self.clockapi.validate_workspace_perm() is False: + if ( + self.clockify_api.validate_workspace_permissions( + self.clockify_api.workspace_id, self.clockify_api.user_id) + is False + ): return { "success": False, "message": "Missing permissions for this action!" @@ -74,9 +78,9 @@ class SyncClocifyLocal(BaseAction): task_type["name"] for task_type in task_types ] try: - clockify_projects = self.clockapi.get_projects() + clockify_projects = self.clockify_api.get_projects() if project_name not in clockify_projects: - response = self.clockapi.add_project(project_name) + response = self.clockify_api.add_project(project_name) if "id" not in response: self.log.warning( "Project \"{}\" can't be created. Response: {}".format( @@ -91,7 +95,7 @@ class SyncClocifyLocal(BaseAction): ).format(project_name) } - clockify_workspace_tags = self.clockapi.get_tags() + clockify_workspace_tags = self.clockify_api.get_tags() for task_type_name in task_type_names: if task_type_name in clockify_workspace_tags: self.log.debug( @@ -99,7 +103,7 @@ class SyncClocifyLocal(BaseAction): ) continue - response = self.clockapi.add_tag(task_type_name) + response = self.clockify_api.add_tag(task_type_name) if "id" not in response: self.log.warning( "Task \"{}\" can't be created. Response: {}".format( @@ -121,4 +125,4 @@ class SyncClocifyLocal(BaseAction): def register(session, **kw): - SyncClocifyLocal(session).register() + SyncClockifyLocal(session).register() diff --git a/openpype/modules/clockify/launcher_actions/ClockifyStart.py b/openpype/modules/clockify/launcher_actions/ClockifyStart.py index 7663aecc31..4a653c1b8d 100644 --- a/openpype/modules/clockify/launcher_actions/ClockifyStart.py +++ b/openpype/modules/clockify/launcher_actions/ClockifyStart.py @@ -6,9 +6,9 @@ from openpype_modules.clockify.clockify_api import ClockifyAPI class ClockifyStart(LauncherAction): name = "clockify_start_timer" label = "Clockify - Start Timer" - icon = "clockify_icon" + icon = "app_icons/clockify.png" order = 500 - clockapi = ClockifyAPI() + clockify_api = ClockifyAPI() def is_compatible(self, session): """Return whether the action is compatible with the session""" @@ -17,23 +17,39 @@ class ClockifyStart(LauncherAction): return False def process(self, session, **kwargs): + self.clockify_api.set_api() + user_id = self.clockify_api.user_id + workspace_id = self.clockify_api.workspace_id project_name = session["AVALON_PROJECT"] asset_name = session["AVALON_ASSET"] task_name = session["AVALON_TASK"] - description = asset_name - asset_doc = get_asset_by_name( - project_name, asset_name, fields=["data.parents"] - ) - if asset_doc is not None: - desc_items = asset_doc.get("data", {}).get("parents", []) - desc_items.append(asset_name) - desc_items.append(task_name) - description = "/".join(desc_items) - project_id = self.clockapi.get_project_id(project_name) - tag_ids = [] - tag_ids.append(self.clockapi.get_tag_id(task_name)) - self.clockapi.start_time_entry( - description, project_id, tag_ids=tag_ids + # fetch asset docs + asset_doc = get_asset_by_name(project_name, asset_name) + + # get task type to fill the timer tag + task_info = asset_doc["data"]["tasks"][task_name] + task_type = task_info["type"] + + # check if the task has hierarchy and fill the + parents_data = asset_doc["data"] + if parents_data is not None: + description_items = parents_data.get("parents", []) + description_items.append(asset_name) + description_items.append(task_name) + description = "/".join(description_items) + + project_id = self.clockify_api.get_project_id( + project_name, workspace_id + ) + tag_ids = [] + tag_name = task_type + tag_ids.append(self.clockify_api.get_tag_id(tag_name, workspace_id)) + self.clockify_api.start_time_entry( + description, + project_id, + tag_ids=tag_ids, + workspace_id=workspace_id, + user_id=user_id, ) diff --git a/openpype/modules/clockify/launcher_actions/ClockifySync.py b/openpype/modules/clockify/launcher_actions/ClockifySync.py index c346a1b4f6..cbd2519a04 100644 --- a/openpype/modules/clockify/launcher_actions/ClockifySync.py +++ b/openpype/modules/clockify/launcher_actions/ClockifySync.py @@ -3,20 +3,39 @@ from openpype_modules.clockify.clockify_api import ClockifyAPI from openpype.pipeline import LauncherAction -class ClockifySync(LauncherAction): +class ClockifyPermissionsCheckFailed(Exception): + """Timer start failed due to user permissions check. + Message should be self explanatory as traceback won't be shown. + """ + pass + + +class ClockifySync(LauncherAction): name = "sync_to_clockify" label = "Sync to Clockify" - icon = "clockify_white_icon" + icon = "app_icons/clockify-white.png" order = 500 - clockapi = ClockifyAPI() - have_permissions = clockapi.validate_workspace_perm() + clockify_api = ClockifyAPI() def is_compatible(self, session): - """Return whether the action is compatible with the session""" - return self.have_permissions + """Check if there's some projects to sync""" + try: + next(get_projects()) + return True + except StopIteration: + return False def process(self, session, **kwargs): + self.clockify_api.set_api() + workspace_id = self.clockify_api.workspace_id + user_id = self.clockify_api.user_id + if not self.clockify_api.validate_workspace_permissions( + workspace_id, user_id + ): + raise ClockifyPermissionsCheckFailed( + "Current CLockify user is missing permissions for this action!" + ) project_name = session.get("AVALON_PROJECT") or "" projects_to_sync = [] @@ -30,24 +49,28 @@ class ClockifySync(LauncherAction): task_types = project["config"]["tasks"].keys() projects_info[project["name"]] = task_types - clockify_projects = self.clockapi.get_projects() + clockify_projects = self.clockify_api.get_projects(workspace_id) for project_name, task_types in projects_info.items(): if project_name in clockify_projects: continue - response = self.clockapi.add_project(project_name) + response = self.clockify_api.add_project( + project_name, workspace_id + ) if "id" not in response: - self.log.error("Project {} can't be created".format( - project_name - )) + self.log.error( + "Project {} can't be created".format(project_name) + ) continue - clockify_workspace_tags = self.clockapi.get_tags() + clockify_workspace_tags = self.clockify_api.get_tags(workspace_id) for task_type in task_types: if task_type not in clockify_workspace_tags: - response = self.clockapi.add_tag(task_type) + response = self.clockify_api.add_tag( + task_type, workspace_id + ) if "id" not in response: - self.log.error('Task {} can\'t be created'.format( - task_type - )) + self.log.error( + "Task {} can't be created".format(task_type) + ) continue diff --git a/openpype/modules/clockify/widgets.py b/openpype/modules/clockify/widgets.py index 122b6212c0..8c28f38b6e 100644 --- a/openpype/modules/clockify/widgets.py +++ b/openpype/modules/clockify/widgets.py @@ -77,15 +77,15 @@ class MessageWidget(QtWidgets.QWidget): class ClockifySettings(QtWidgets.QWidget): - SIZE_W = 300 + SIZE_W = 500 SIZE_H = 130 loginSignal = QtCore.Signal(object, object, object) - def __init__(self, clockapi, optional=True): + def __init__(self, clockify_api, optional=True): super(ClockifySettings, self).__init__() - self.clockapi = clockapi + self.clockify_api = clockify_api self.optional = optional self.validated = False @@ -162,17 +162,17 @@ class ClockifySettings(QtWidgets.QWidget): def click_ok(self): api_key = self.input_api_key.text().strip() if self.optional is True and api_key == '': - self.clockapi.save_api_key(None) - self.clockapi.set_api(api_key) + self.clockify_api.save_api_key(None) + self.clockify_api.set_api(api_key) self.validated = False self._close_widget() return - validation = self.clockapi.validate_api_key(api_key) + validation = self.clockify_api.validate_api_key(api_key) if validation: - self.clockapi.save_api_key(api_key) - self.clockapi.set_api(api_key) + self.clockify_api.save_api_key(api_key) + self.clockify_api.set_api(api_key) self.validated = True self._close_widget() else: diff --git a/openpype/modules/timers_manager/timers_manager.py b/openpype/modules/timers_manager/timers_manager.py index 0ba68285a4..43286f7da4 100644 --- a/openpype/modules/timers_manager/timers_manager.py +++ b/openpype/modules/timers_manager/timers_manager.py @@ -141,7 +141,9 @@ class TimersManager( signal_handler = SignalHandler(self) idle_manager = IdleManager() widget_user_idle = WidgetUserIdle(self) - widget_user_idle.set_countdown_start(self.time_show_message) + widget_user_idle.set_countdown_start( + self.time_stop_timer - self.time_show_message + ) idle_manager.signal_reset_timer.connect( widget_user_idle.reset_countdown From 00b83e58792db4e33d5d218ce942a8667d724265 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 17 Mar 2023 16:21:27 +0100 Subject: [PATCH 904/912] Refactor `app_data` -> `app_name` --- openpype/hosts/fusion/addon.py | 8 ++++---- openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/fusion/addon.py b/openpype/hosts/fusion/addon.py index 345e348c3b..45683cfbde 100644 --- a/openpype/hosts/fusion/addon.py +++ b/openpype/hosts/fusion/addon.py @@ -17,11 +17,11 @@ FUSION_VERSIONS_DICT = { } -def get_fusion_version(app_data): +def get_fusion_version(app_name): """ The function is triggered by the prelaunch hooks to get the fusion version. - `app_data` is obtained by prelaunch hooks from the + `app_name` is obtained by prelaunch hooks from the `launch_context.env.get("AVALON_APP_NAME")`. To get a correct Fusion version, a version number should be present @@ -31,10 +31,10 @@ def get_fusion_version(app_data): log = Logger.get_logger(__name__) - if not app_data: + if not app_name: return - app_version_candidates = re.findall(r"\d+", app_data) + app_version_candidates = re.findall(r"\d+", app_name) if not app_version_candidates: return for app_version in app_version_candidates: diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index 15c9424990..cf168194c3 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -125,8 +125,8 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): ) = self.get_copy_fusion_prefs_settings() # Get launched application context and return correct app version - app_data = self.launch_context.env.get("AVALON_APP_NAME") - app_version = get_fusion_version(app_data) + app_name = self.launch_context.env.get("AVALON_APP_NAME") + app_version = get_fusion_version(app_name) _, profile_version = FUSION_VERSIONS_DICT[app_version] fu_profile = self.get_fusion_profile_name(profile_version) From 35157c81de68b6bcb049ce610b31809856273624 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 17 Mar 2023 16:30:04 +0100 Subject: [PATCH 905/912] Report if Fusion version not detected --- .../hosts/fusion/hooks/pre_fusion_profile_hook.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index cf168194c3..3a4d827428 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -2,7 +2,7 @@ import os import shutil import platform from pathlib import Path -from openpype.lib import PreLaunchHook +from openpype.lib import PreLaunchHook, ApplicationLaunchFailed from openpype.hosts.fusion import ( FUSION_HOST_DIR, FUSION_VERSIONS_DICT, @@ -127,6 +127,15 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): # Get launched application context and return correct app version app_name = self.launch_context.env.get("AVALON_APP_NAME") app_version = get_fusion_version(app_name) + if app_version is None or True: + version_names = ", ".join(str(x) for x in FUSION_VERSIONS_DICT) + raise ApplicationLaunchFailed( + "Unable to detect valid Fusion version number from app " + f"name: {app_name}.\nMake sure to include at least a digit " + "to indicate the Fusion version like '18'.\n" + f"Detectable Fusion versions are: {version_names}" + ) + _, profile_version = FUSION_VERSIONS_DICT[app_version] fu_profile = self.get_fusion_profile_name(profile_version) From 3160a0ede09c859f1a40651af3bf805d1dca2fc7 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 17 Mar 2023 16:30:21 +0100 Subject: [PATCH 906/912] Remove the debugging logic :) --- openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index 3a4d827428..ee80a9c90a 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -127,7 +127,7 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): # Get launched application context and return correct app version app_name = self.launch_context.env.get("AVALON_APP_NAME") app_version = get_fusion_version(app_name) - if app_version is None or True: + if app_version is None: version_names = ", ".join(str(x) for x in FUSION_VERSIONS_DICT) raise ApplicationLaunchFailed( "Unable to detect valid Fusion version number from app " From f6be90d7a415636e2e848ee4c0f3766dbf87eda6 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 17 Mar 2023 16:33:16 +0100 Subject: [PATCH 907/912] Debug log instead of info log --- openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index ee80a9c90a..4e5ff4159b 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -93,8 +93,8 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): "Destination Fusion preferences folder already exists" ) return - self.log.info(f"Starting copying Fusion preferences") - self.log.info(f"force_sync option is set to {force_sync}") + self.log.info("Starting copying Fusion preferences") + self.log.debug(f"force_sync option is set to {force_sync}") try: copy_to.mkdir(exist_ok=True, parents=True) except PermissionError: From c71651e29e7c51e13513095c5f43180645375404 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 17 Mar 2023 16:37:51 +0100 Subject: [PATCH 908/912] Match other method calls to `warning` --- openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index 4e5ff4159b..b0a4e19f44 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -98,7 +98,7 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): try: copy_to.mkdir(exist_ok=True, parents=True) except PermissionError: - self.log.warn(f"Creating the folder not permitted at {copy_to}") + self.log.warning(f"Creating the folder not permitted at {copy_to}") return if not copy_from.exists(): self.log.warning(f"Fusion preferences not found in {copy_from}") From 6a06f80db0e600fdc28d85a8ccac839a38c64ead Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 17 Mar 2023 16:39:39 +0100 Subject: [PATCH 909/912] Cosmetics + do not add new line because its confusing in command line logs --- openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index b0a4e19f44..339cf35a7d 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -114,7 +114,7 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): # convert Path to str to be compatible with Python 3.6+ shutil.copy(str(file), str(copy_to)) self.log.info( - f"successfully copied preferences:\n {copy_from} to {copy_to}" + f"Successfully copied preferences: {copy_from} to {copy_to}" ) def execute(self): From ae44c0de29af77db9d3e9a342acc5b341cab4954 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 17 Mar 2023 16:42:23 +0100 Subject: [PATCH 910/912] Report the existing folder in the log --- openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py index 339cf35a7d..fd726ccda1 100644 --- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py @@ -90,7 +90,8 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook): """ if copy_to.exists() and not force_sync: self.log.info( - "Destination Fusion preferences folder already exists" + "Destination Fusion preferences folder already exists: " + f"{copy_to} " ) return self.log.info("Starting copying Fusion preferences") From a13f80ef972a4aec8c2a972d9566fa1c4afdef60 Mon Sep 17 00:00:00 2001 From: Toke Jepsen Date: Fri, 17 Mar 2023 17:14:22 +0100 Subject: [PATCH 911/912] Maya: Yeti Validate Rig Input - OP-3454 (#4554) * Collect input_SET children in instance. * Fix docs. * Only validate yeti if there are nodes in the scene. * Revert code * Remove connection logic from loader * Connection inventory action * Hound * Revert "Collect input_SET children in instance." This reverts commit 052e65ca1befb19049ee9f02f472d20cf78d8dc1. * Update docs * Update openpype/hosts/maya/plugins/inventory/connect_yeti_rig.py Co-authored-by: Roy Nieterau * Update openpype/hosts/maya/plugins/inventory/connect_yeti_rig.py Co-authored-by: Roy Nieterau * Update openpype/hosts/maya/plugins/inventory/connect_yeti_rig.py Co-authored-by: Roy Nieterau * Update website/docs/artist_hosts_maya_yeti.md Co-authored-by: Roy Nieterau * BigRoy feedback * Hound * Fix typo * Update openpype/hosts/maya/plugins/inventory/connect_yeti_rig.py Co-authored-by: Roy Nieterau * Update openpype/hosts/maya/plugins/publish/validate_yeti_renderscript_callbacks.py Co-authored-by: Roy Nieterau * Update openpype/hosts/maya/plugins/inventory/connect_yeti_rig.py Co-authored-by: Roy Nieterau * Dont use AVALON_PROJECT * Hound * Update openpype/hosts/maya/plugins/publish/validate_yeti_renderscript_callbacks.py Co-authored-by: Roy Nieterau --------- Co-authored-by: Roy Nieterau --- .../plugins/inventory/connect_yeti_rig.py | 178 ++++++++++++++++++ .../hosts/maya/plugins/load/load_yeti_rig.py | 94 +++------ .../validate_yeti_renderscript_callbacks.py | 12 ++ website/docs/artist_hosts_maya_yeti.md | 79 ++++---- website/docs/assets/maya-yeti_hair_setup.png | Bin 0 -> 138812 bytes .../assets/maya-yeti_load_connections.png | Bin 0 -> 125692 bytes .../docs/assets/maya-yeti_publish_setup.png | Bin 0 -> 133890 bytes website/docs/assets/maya-yeti_rig.jpg | Bin 59405 -> 0 bytes website/docs/assets/maya-yeti_rig_setup.png | Bin 0 -> 111360 bytes website/docs/assets/maya-yeti_simple_rig.png | Bin 0 -> 96188 bytes 10 files changed, 258 insertions(+), 105 deletions(-) create mode 100644 openpype/hosts/maya/plugins/inventory/connect_yeti_rig.py create mode 100644 website/docs/assets/maya-yeti_hair_setup.png create mode 100644 website/docs/assets/maya-yeti_load_connections.png create mode 100644 website/docs/assets/maya-yeti_publish_setup.png delete mode 100644 website/docs/assets/maya-yeti_rig.jpg create mode 100644 website/docs/assets/maya-yeti_rig_setup.png create mode 100644 website/docs/assets/maya-yeti_simple_rig.png diff --git a/openpype/hosts/maya/plugins/inventory/connect_yeti_rig.py b/openpype/hosts/maya/plugins/inventory/connect_yeti_rig.py new file mode 100644 index 0000000000..924a1a4627 --- /dev/null +++ b/openpype/hosts/maya/plugins/inventory/connect_yeti_rig.py @@ -0,0 +1,178 @@ +import os +import json +from collections import defaultdict + +from maya import cmds + +from openpype.pipeline import ( + InventoryAction, get_representation_context, get_representation_path +) +from openpype.hosts.maya.api.lib import get_container_members, get_id + + +class ConnectYetiRig(InventoryAction): + """Connect Yeti Rig with an animation or pointcache.""" + + label = "Connect Yeti Rig" + icon = "link" + color = "white" + + def process(self, containers): + # Validate selection is more than 1. + message = ( + "Only 1 container selected. 2+ containers needed for this action." + ) + if len(containers) == 1: + self.display_warning(message) + return + + # Categorize containers by family. + containers_by_family = defaultdict(list) + for container in containers: + family = get_representation_context( + container["representation"] + )["subset"]["data"]["family"] + containers_by_family[family].append(container) + + # Validate to only 1 source container. + source_containers = containers_by_family.get("animation", []) + source_containers += containers_by_family.get("pointcache", []) + source_container_namespaces = [ + x["namespace"] for x in source_containers + ] + message = ( + "{} animation containers selected:\n\n{}\n\nOnly select 1 of type " + "\"animation\" or \"pointcache\".".format( + len(source_containers), source_container_namespaces + ) + ) + if len(source_containers) != 1: + self.display_warning(message) + return + + source_container = source_containers[0] + source_ids = self.nodes_by_id(source_container) + + # Target containers. + target_ids = {} + inputs = [] + + yeti_rig_containers = containers_by_family.get("yetiRig") + if not yeti_rig_containers: + self.display_warning( + "Select at least one yetiRig container" + ) + return + + for container in yeti_rig_containers: + target_ids.update(self.nodes_by_id(container)) + + maya_file = get_representation_path( + get_representation_context( + container["representation"] + )["representation"] + ) + _, ext = os.path.splitext(maya_file) + settings_file = maya_file.replace(ext, ".rigsettings") + if not os.path.exists(settings_file): + continue + + with open(settings_file) as f: + inputs.extend(json.load(f)["inputs"]) + + # Compare loaded connections to scene. + for input in inputs: + source_node = source_ids.get(input["sourceID"]) + target_node = target_ids.get(input["destinationID"]) + + if not source_node or not target_node: + self.log.debug( + "Could not find nodes for input:\n" + + json.dumps(input, indent=4, sort_keys=True) + ) + continue + source_attr, target_attr = input["connections"] + + if not cmds.attributeQuery( + source_attr, node=source_node, exists=True + ): + self.log.debug( + "Could not find attribute {} on node {} for " + "input:\n{}".format( + source_attr, + source_node, + json.dumps(input, indent=4, sort_keys=True) + ) + ) + continue + + if not cmds.attributeQuery( + target_attr, node=target_node, exists=True + ): + self.log.debug( + "Could not find attribute {} on node {} for " + "input:\n{}".format( + target_attr, + target_node, + json.dumps(input, indent=4, sort_keys=True) + ) + ) + continue + + source_plug = "{}.{}".format( + source_node, source_attr + ) + target_plug = "{}.{}".format( + target_node, target_attr + ) + if cmds.isConnected( + source_plug, target_plug, ignoreUnitConversion=True + ): + self.log.debug( + "Connection already exists: {} -> {}".format( + source_plug, target_plug + ) + ) + continue + + cmds.connectAttr(source_plug, target_plug, force=True) + self.log.debug( + "Connected attributes: {} -> {}".format( + source_plug, target_plug + ) + ) + + def nodes_by_id(self, container): + ids = {} + for member in get_container_members(container): + id = get_id(member) + if not id: + continue + ids[id] = member + + return ids + + def display_warning(self, message, show_cancel=False): + """Show feedback to user. + + Returns: + bool + """ + + from qtpy import QtWidgets + + accept = QtWidgets.QMessageBox.Ok + if show_cancel: + buttons = accept | QtWidgets.QMessageBox.Cancel + else: + buttons = accept + + state = QtWidgets.QMessageBox.warning( + None, + "", + message, + buttons=buttons, + defaultButton=accept + ) + + return state == accept diff --git a/openpype/hosts/maya/plugins/load/load_yeti_rig.py b/openpype/hosts/maya/plugins/load/load_yeti_rig.py index 651607de8a..6a13d2e145 100644 --- a/openpype/hosts/maya/plugins/load/load_yeti_rig.py +++ b/openpype/hosts/maya/plugins/load/load_yeti_rig.py @@ -1,17 +1,12 @@ -import os -from collections import defaultdict +import maya.cmds as cmds -from openpype.settings import get_project_settings +from openpype.settings import get_current_project_settings import openpype.hosts.maya.api.plugin from openpype.hosts.maya.api import lib class YetiRigLoader(openpype.hosts.maya.api.plugin.ReferenceLoader): - """ - This loader will load Yeti rig. You can select something in scene and if it - has same ID as mesh published with rig, their shapes will be linked - together. - """ + """This loader will load Yeti rig.""" families = ["yetiRig"] representations = ["ma"] @@ -22,72 +17,31 @@ class YetiRigLoader(openpype.hosts.maya.api.plugin.ReferenceLoader): color = "orange" def process_reference( - self, context, name=None, namespace=None, options=None): + self, context, name=None, namespace=None, options=None + ): - import maya.cmds as cmds - - # get roots of selected hierarchies - selected_roots = [] - for sel in cmds.ls(sl=True, long=True): - selected_roots.append(sel.split("|")[1]) - - # get all objects under those roots - selected_hierarchy = [] - for root in selected_roots: - selected_hierarchy.append(cmds.listRelatives( - root, - allDescendents=True) or []) - - # flatten the list and filter only shapes - shapes_flat = [] - for root in selected_hierarchy: - shapes = cmds.ls(root, long=True, type="mesh") or [] - for shape in shapes: - shapes_flat.append(shape) - - # create dictionary of cbId and shape nodes - scene_lookup = defaultdict(list) - for node in shapes_flat: - cb_id = lib.get_id(node) - scene_lookup[cb_id] = node - - # load rig + group_name = "{}:{}".format(namespace, name) with lib.maintained_selection(): - file_url = self.prepare_root_value(self.fname, - context["project"]["name"]) - nodes = cmds.file(file_url, - namespace=namespace, - reference=True, - returnNewNodes=True, - groupReference=True, - groupName="{}:{}".format(namespace, name)) + file_url = self.prepare_root_value( + self.fname, context["project"]["name"] + ) + nodes = cmds.file( + file_url, + namespace=namespace, + reference=True, + returnNewNodes=True, + groupReference=True, + groupName=group_name + ) - # for every shape node we've just loaded find matching shape by its - # cbId in selection. If found outMesh of scene shape will connect to - # inMesh of loaded shape. - for destination_node in nodes: - source_node = scene_lookup[lib.get_id(destination_node)] - if source_node: - self.log.info("found: {}".format(source_node)) - self.log.info( - "creating connection to {}".format(destination_node)) - - cmds.connectAttr("{}.outMesh".format(source_node), - "{}.inMesh".format(destination_node), - force=True) - - groupName = "{}:{}".format(namespace, name) - - settings = get_project_settings(os.environ['AVALON_PROJECT']) - colors = settings['maya']['load']['colors'] - - c = colors.get('yetiRig') + settings = get_current_project_settings() + colors = settings["maya"]["load"]["colors"] + c = colors.get("yetiRig") if c is not None: - cmds.setAttr(groupName + ".useOutlinerColor", 1) - cmds.setAttr(groupName + ".outlinerColor", - (float(c[0])/255), - (float(c[1])/255), - (float(c[2])/255) + cmds.setAttr(group_name + ".useOutlinerColor", 1) + cmds.setAttr( + group_name + ".outlinerColor", + (float(c[0]) / 255), (float(c[1]) / 255), (float(c[2]) / 255) ) self[:] = nodes diff --git a/openpype/hosts/maya/plugins/publish/validate_yeti_renderscript_callbacks.py b/openpype/hosts/maya/plugins/publish/validate_yeti_renderscript_callbacks.py index a864a18cee..06250f5779 100644 --- a/openpype/hosts/maya/plugins/publish/validate_yeti_renderscript_callbacks.py +++ b/openpype/hosts/maya/plugins/publish/validate_yeti_renderscript_callbacks.py @@ -48,6 +48,18 @@ class ValidateYetiRenderScriptCallbacks(pyblish.api.InstancePlugin): yeti_loaded = cmds.pluginInfo("pgYetiMaya", query=True, loaded=True) + if not yeti_loaded and not cmds.ls(type="pgYetiMaya"): + # The yeti plug-in is available and loaded so at + # this point we don't really care whether the scene + # has any yeti callback set or not since if the callback + # is there it wouldn't error and if it weren't then + # nothing happens because there are no yeti nodes. + cls.log.info( + "Yeti is loaded but no yeti nodes were found. " + "Callback validation skipped.." + ) + return False + renderer = instance.data["renderer"] if renderer == "redshift": cls.log.info("Redshift ignores any pre and post render callbacks") diff --git a/website/docs/artist_hosts_maya_yeti.md b/website/docs/artist_hosts_maya_yeti.md index f5a6a4d2c9..aa783cc8b6 100644 --- a/website/docs/artist_hosts_maya_yeti.md +++ b/website/docs/artist_hosts_maya_yeti.md @@ -9,7 +9,9 @@ sidebar_label: Yeti OpenPype can work with [Yeti](https://peregrinelabs.com/yeti/) in two data modes. It can handle Yeti caches and Yeti rigs. -### Creating and publishing Yeti caches +## Yeti Caches + +### Creating and publishing Let start by creating simple Yeti setup, just one object and Yeti node. Open new empty scene in Maya and create sphere. Then select sphere and go **Yeti → Create Yeti Node on Mesh** @@ -44,7 +46,15 @@ You can now publish Yeti cache as any other types. **OpenPype → Publish**. It create sequence of `.fur` files and `.fursettings` metadata file with Yeti node setting. -### Loading Yeti caches +:::note Collect Yeti Cache failure +If you encounter **Collect Yeti Cache** failure during collecting phase, and the error is like +```fix +No object matches name: pgYetiMaya1Shape.cbId +``` +then it is probably caused by scene not being saved before publishing. +::: + +### Loading You can load Yeti cache by **OpenPype → Load ...**. Select your cache, right+click on it and select **Load Yeti cache**. This will create Yeti node in scene and set its @@ -52,26 +62,39 @@ cache path to point to your published cache files. Note that this Yeti node will be named with same name as the one you've used to publish cache. Also notice that when you open graph on this Yeti node, all nodes are as they were in publishing node. -### Creating and publishing Yeti Rig +## Yeti Rigs -Yeti Rigs are working in similar way as caches, but are more complex and they deal with -other data used by Yeti, like geometry and textures. +### Creating and publishing -Let's start by [loading](artist_hosts_maya.md#loading-model) into new scene some model. -I've loaded my Buddha model. +Yeti Rigs are designed to connect to published models or animation rig. The workflow gives the Yeti Rig full control on that geometry to do additional things on top of whatever input comes in, e.g. deleting faces, pushing faces in/out, subdividing, etc. -Create select model mesh, create Yeti node - **Yeti → Create Yeti Node on Mesh** and -setup similar Yeti graph as in cache example above. +Let's start with a [model](artist_hosts_maya.md#loading-model) or [rig](artist_hosts_maya.md#loading-rigs) loaded into the scene. Here we are using a simple rig. -Then select this Yeti node (mine is called with default name `pgYetiMaya1`) and -create *Yeti Rig instance* - **OpenPype → Create...** and select **Yeti Cache**. +![Maya - Yeti Simple Rig](assets/maya-yeti_simple_rig.png) + +We'll need to prepare the scene a bit. We want some Yeti hair on the ball geometry, so duplicating the geometry, adding the Yeti hair and grouping it together. + +![Maya - Yeti Hair Setup](assets/maya-yeti_hair_setup.png) + +:::note yeti nodes and types +You can use any number of Yeti nodes and types, but they have to have unique names. +::: + +Now we need to connect the Yeti Rig with the animation rig. Yeti Rigs work by publishing the attribute connections from its input nodes and reconnect them later in the pipeline. This means we can only use attribute connections to from outside of the Yeti Rig hierarchy. Internal to the Yeti Rig hierarchy, we can use any complexity of node connections. We'll connnect the Yeti Rig geometry to the animation rig, with the transform and mesh attributes. + +![Maya - Yeti Rig Setup](assets/maya-yeti_rig_setup.png) + +Now we are ready for publishing. Select the Yeti Rig group (`rig_GRP`) and +create *Yeti Rig instance* - **OpenPype → Create...** and select **Yeti Rig**. Leave `Use selection` checked. -Last step is to add our model geometry to rig instance, so middle+drag its -geometry to `input_SET` under `yetiRigDefault` set representing rig instance. +Last step is to add our geometry to the rig instance, so middle+drag its +geometry to `input_SET` under the `yetiRigMain` set representing rig instance. Note that its name can differ and is based on your subset name. -![Maya - Yeti Rig Setup](assets/maya-yeti_rig.jpg) +![Maya - Yeti Publish Setup](assets/maya-yeti_publish_setup.png) + +You can have any number of nodes in the Yeti Rig, but only nodes with incoming attribute connections from outside of the Yeti Rig hierarchy is needed in the `input_SET`. Save your scene and ready for publishing our new simple Yeti Rig! @@ -81,28 +104,14 @@ the beginning of your timeline. It will also collect all textures used in Yeti node, copy them to publish folder `resource` directory and set *Image search path* of published node to this location. -:::note Collect Yeti Cache failure -If you encounter **Collect Yeti Cache** failure during collecting phase, and the error is like -```fix -No object matches name: pgYetiMaya1Shape.cbId -``` -then it is probably caused by scene not being saved before publishing. -::: +### Loading -### Loading Yeti Rig - -You can load published Yeti Rigs as any other thing in OpenPype - **OpenPype → Load ...**, +You can load published Yeti Rigs in OpenPype with **OpenPype → Load ...**, select you Yeti rig and right+click on it. In context menu you should see -**Load Yeti Cache** and **Load Yeti Rig** items (among others). First one will -load that one frame cache. The other one will load whole rig. +**Load Yeti Rig** item (among others). -Notice that although we put only geometry into `input_SET`, whole hierarchy was -pulled inside also. This allows you to store complex scene element along Yeti -node. +To connect the Yeti Rig with published animation, we'll load in the animation and use the Inventory to establish the connections. -:::tip auto-connecting rig mesh to existing one -If you select some objects before loading rig it will try to find shapes -under selected hierarchies and match them with shapes loaded with rig (published -under `input_SET`). This mechanism uses *cbId* attribute on those shapes. -If match is found shapes are connected using their `outMesh` and `outMesh`. Thus you can easily connect existing animation to loaded rig. -::: +![Maya - Yeti Publish Setup](assets/maya-yeti_load_connections.png) + +The Yeti Rig should now be following the animation. :tada: diff --git a/website/docs/assets/maya-yeti_hair_setup.png b/website/docs/assets/maya-yeti_hair_setup.png new file mode 100644 index 0000000000000000000000000000000000000000..8cd7f5f97a259bb653d7bdbe171d9a12cf8ac7be GIT binary patch literal 138812 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 MZWh2!_Zu@zC-RKjZe8Y@R=?oKtf2P(R@GSfdH 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

6UB=BTN2JGQDhT}p%k(-!~F@xZG> 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≦Kv8 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 literal 0 HcmV?d00001 diff --git a/website/docs/assets/maya-yeti_rig.jpg b/website/docs/assets/maya-yeti_rig.jpg deleted file mode 100644 index 07b13db409d0ad6bf1f887896e6f3d0fd5e7e10b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59405 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%0D1;wn^$71V{3R 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 EFKbZ!`Tzg` diff --git a/website/docs/assets/maya-yeti_rig_setup.png b/website/docs/assets/maya-yeti_rig_setup.png new file mode 100644 index 0000000000000000000000000000000000000000..876ecba0a2b0e4496f590a650de56532c3b104f0 GIT binary patch literal 111360 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
^s@U(eB2|H$bp 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 literal 0 HcmV?d00001 diff --git a/website/docs/assets/maya-yeti_simple_rig.png b/website/docs/assets/maya-yeti_simple_rig.png new file mode 100644 index 0000000000000000000000000000000000000000..31a60ac40b3f712e7ecd1bcdac4fc80017977594 GIT binary patch literal 96188 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

`}O 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 literal 0 HcmV?d00001 From 3159bcb878a4002459d2dbcd52f63216453475e0 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 17 Mar 2023 17:39:54 +0100 Subject: [PATCH 912/912] Use right plugic class for 'CollectInstanceCommentDef' --- openpype/plugins/publish/collect_comment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/collect_comment.py b/openpype/plugins/publish/collect_comment.py index 5be04731ac..9f41e37f22 100644 --- a/openpype/plugins/publish/collect_comment.py +++ b/openpype/plugins/publish/collect_comment.py @@ -29,7 +29,7 @@ from openpype.pipeline.publish import OpenPypePyblishPluginMixin class CollectInstanceCommentDef( - pyblish.api.ContextPlugin, + pyblish.api.InstancePlugin, OpenPypePyblishPluginMixin ): label = "Comment per instance"