From 994cd8dfb18c32a93444d04b28ef1c9b814e822d Mon Sep 17 00:00:00 2001
From: Nina Doschek
Date: Tue, 30 Aug 2022 19:45:30 +0200
Subject: [PATCH 01/34] #455 #456 Update to latest versions and run servers as
JAR products
#455 Update to Model Server V2 and latest GLSP version
- Migrate Model Server to latest version and to V2
#456 Consider running backend services as JAR products
- Run Model Server product as Java application instead of Eclipse product
- TODO: Package as standalone JAR
---
.../META-INF/MANIFEST.MF | 1 +
.../coffee/common/ModelServerClientUtil.java | 6 +-
.../emfcloud/coffee/util/CoffeeResource.java | 4 +-
.../.checkstyle | 13 -
.../.classpath | 7 -
.../.project | 51 --
.../org.eclipse.core.resources.prefs | 2 -
.../.settings/org.eclipse.jdt.core.prefs | 520 ------------------
.../.settings/org.eclipse.jdt.launching.prefs | 3 -
.../.settings/org.eclipse.jdt.ui.prefs | 137 -----
.../META-INF/MANIFEST.MF | 12 -
.../build.properties | 5 -
.../plugin.properties | 2 -
.../plugin.xml | 15 -
.../pom.xml | 22 -
.../coffee/modelserver/app/Application.java | 44 --
.../.checkstyle | 13 -
.../.project | 40 --
.../org.eclipse.core.resources.prefs | 2 -
.../.settings/org.eclipse.jdt.core.prefs | 520 ------------------
.../.settings/org.eclipse.jdt.launching.prefs | 3 -
.../.settings/org.eclipse.jdt.ui.prefs | 137 -----
.../build.properties | 1 -
.../feature.xml | 82 ---
.../pom.xml | 16 -
.../META-INF/MANIFEST.MF | 57 +-
.../coffee/modelserver/CoffeeCodec.java | 9 +-
.../modelserver/CoffeeCodecProvider.java | 55 ++
.../CoffeeModelResourceManager.java | 55 +-
.../modelserver/CoffeeModelServerClient.java | 12 +-
.../modelserver/CoffeeModelServerModule.java | 25 +-
.../CoffeePackageConfiguration.java | 7 +-
.../modelserver/CoffeeResourceSetFactory.java | 43 ++
.../notation/AddFlowShapeCommand.java | 16 +-
.../notation/AddNodeShapeCommand.java | 16 +-
.../notation/RemoveFlowEdgeCommand.java | 4 +-
.../notation/RemoveNodeShapeCommand.java | 4 +-
.../CoffeeModelServerLauncher.java | 19 +-
.../pom.xml | 4 +-
.../launch/CoffeeModelServer.launch | 196 +------
.../modelserver.product | 47 --
.../pom.xml | 6 +-
.../org.eclipse.emfcloud.coffee.target.target | 38 +-
.../org.eclipse.emfcloud.coffee.target.tpd | 32 +-
44 files changed, 293 insertions(+), 2010 deletions(-)
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.checkstyle
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.classpath
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.project
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.core.resources.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.core.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.launching.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.ui.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/META-INF/MANIFEST.MF
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/build.properties
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/plugin.properties
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/plugin.xml
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/pom.xml
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/src/org/eclipse/emfcloud/coffee/modelserver/app/Application.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.checkstyle
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.project
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.core.resources.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.jdt.core.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.jdt.launching.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.jdt.ui.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/build.properties
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/feature.xml
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/pom.xml
create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeCodecProvider.java
create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeResourceSetFactory.java
rename backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/{ => launch}/CoffeeModelServerLauncher.java (50%)
delete mode 100644 backend/releng/org.eclipse.emfcloud.coffee.product/modelserver.product
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.common/META-INF/MANIFEST.MF b/backend/plugins/org.eclipse.emfcloud.coffee.common/META-INF/MANIFEST.MF
index 22d5cf18..9a29db7f 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.common/META-INF/MANIFEST.MF
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.common/META-INF/MANIFEST.MF
@@ -9,5 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.emfcloud.modelserver.client;bundle-version="0.7.0",
org.eclipse.emfcloud.modelserver.common;bundle-version="0.7.0",
org.eclipse.emfcloud.modelserver.emf;bundle-version="0.7.0",
+ org.eclipse.emfcloud.modelserver.lib;bundle-version="0.7.0",
org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)"
Export-Package: org.eclipse.emfcloud.coffee.common
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.common/src/org/eclipse/emfcloud/coffee/common/ModelServerClientUtil.java b/backend/plugins/org.eclipse.emfcloud.coffee.common/src/org/eclipse/emfcloud/coffee/common/ModelServerClientUtil.java
index 7adfac6f..162a202c 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.common/src/org/eclipse/emfcloud/coffee/common/ModelServerClientUtil.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.common/src/org/eclipse/emfcloud/coffee/common/ModelServerClientUtil.java
@@ -16,10 +16,10 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emfcloud.modelserver.client.ModelServerClient;
+import org.eclipse.emfcloud.modelserver.common.ModelServerPathParametersV2;
public final class ModelServerClientUtil {
- private static final String FORMAT = "xmi";
- private static final String MODEL_SERVER_BASE_URL = "http://localhost:8081/api/v1/";
+ private static final String MODEL_SERVER_BASE_URL = "http://localhost:8081/api/v2/";
private ModelServerClientUtil() {}
@@ -27,7 +27,7 @@ private ModelServerClientUtil() {}
public static EObject loadResource(final URI uri) throws Exception {
@SuppressWarnings("resource")
ModelServerClient client = new ModelServerClient(MODEL_SERVER_BASE_URL);
- return client.get(Paths.get(uri).getFileName().toString(), FORMAT).get().body();
+ return client.get(Paths.get(uri).getFileName().toString(), ModelServerPathParametersV2.FORMAT_XMI).get().body();
}
@SuppressWarnings("IllegalThrows")
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeResource.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeResource.java
index c7da61d9..4b3c212a 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeResource.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeResource.java
@@ -15,9 +15,7 @@
public interface CoffeeResource extends XMIResource {
- public interface Factory extends Resource.Factory {
- Factory INSTANCE = new CoffeeResourceFactoryImpl();
- }
+ Resource.Factory FACTORY = new CoffeeResourceFactoryImpl();
String FILE_EXTENSION = "coffee";
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.checkstyle b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.checkstyle
deleted file mode 100644
index c654b811..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.checkstyle
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.classpath b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.classpath
deleted file mode 100644
index 1db08c6b..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.project b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.project
deleted file mode 100644
index 675a9ceb..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.project
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
- org.eclipse.emfcloud.coffee.modelserver.app
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
- net.sf.eclipsecs.core.CheckstyleBuilder
-
-
-
-
-
- org.eclipse.m2e.core.maven2Nature
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
- net.sf.eclipsecs.core.CheckstyleNature
-
-
-
- 0
-
- 30
-
- org.eclipse.core.resources.regexFilterMatcher
- node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
-
-
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.core.resources.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c02..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.core.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ded3a412..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,520 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.APILeak=warning
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
-org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
-org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
-org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
-org.eclipse.jdt.core.formatter.align_with_spaces=false
-org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
-org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0
-org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
-org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true
-org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=3
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=3
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
-org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.launching.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index d177941e..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=ignore
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.ui.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 54b6f7a9..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,137 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=true
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=true
-cleanup.convert_to_enhanced_for_loop=true
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=false
-cleanup.make_parameters_final=true
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=false
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_modifiers=true
-cleanup.remove_redundant_semicolons=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_autoboxing=true
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_unboxing=true
-cleanup_profile=_EMF.cloud Cleanup Profile
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_EMF.cloud Formatter Profile
-formatter_settings_version=16
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=/**\n * @return the ${bare_field_name}\n */ /**\n * @param ${param} the ${bare_field_name} to set\n */ /**\n * ${tags}\n */ /**\n * \n */ /**\n * @author ${user}\n *\n * ${tags}\n */ /**\n * \n */ /**\n * ${tags}\n */ /**\n * ${tags}\n * ${see_to_target}\n */ /********************************************************************************\n * Copyright (c) ${year} EclipseSource and others.\n *\n * This program and the accompanying materials are made available under the\n * terms of the Eclipse Public License v. 2.0 which is available at\n * https\://www.eclipse.org/legal/epl-2.0, or the MIT License which is\n * available at https\://opensource.org/licenses/MIT.\n *\n * SPDX-License-Identifier\: EPL-2.0 OR MIT\n ********************************************************************************/\n${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration} \n \n \n \n // ${todo} Auto-generated catch block\n${exception_var}.printStackTrace(); // ${todo} Auto-generated method stub\n${body_statement} ${body_statement}\n// ${todo} Auto-generated constructor stub return ${field}; ${field} \= ${param}; /**\n * @author ${user}\n *\n * ${tags}\n */ \n
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=true
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.insert_inferred_type_arguments=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=true
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_redundant_modifiers=true
-sp_cleanup.remove_redundant_semicolons=true
-sp_cleanup.remove_redundant_type_arguments=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_anonymous_class_creation=false
-sp_cleanup.use_autoboxing=true
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=true
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-sp_cleanup.use_unboxing=true
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/META-INF/MANIFEST.MF b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/META-INF/MANIFEST.MF
deleted file mode 100644
index db81e238..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emfcloud.coffee.modelserver.app;singleton:=true
-Bundle-Version: 0.1.0.qualifier
-Bundle-Vendor: %providerName
-Automatic-Module-Name: org.eclipse.emfcloud.coffee.modelserver.app;
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.eclipse.emfcloud.coffee.modelserver.app
-Require-Bundle: org.eclipse.equinox.app;bundle-version="1.5.0",
- org.eclipse.emfcloud.coffee.modelserver;bundle-version="0.1.0",
- org.eclipse.equinox.event;bundle-version="1.6.0"
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/build.properties b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/build.properties
deleted file mode 100644
index caab4c1f..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = target/classes/
-bin.includes = plugin.xml,\
- META-INF/,\
- .
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/plugin.properties b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/plugin.properties
deleted file mode 100644
index a215a2f5..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pluginName = Coffee Editor Model Server App plugin
-providerName = EclipseSource
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/plugin.xml b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/plugin.xml
deleted file mode 100644
index 85f9a671..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/pom.xml b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/pom.xml
deleted file mode 100644
index 64c99386..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- 4.0.0
- org.eclipse.emfcloud.coffee.modelserver.app
- eclipse-plugin
-
-
- org.eclipse.emfcloud.coffee
- org.eclipse.emfcloud.coffee.parent
- 0.1.0-SNAPSHOT
- ../../releng/org.eclipse.emfcloud.coffee.parent/
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/src/org/eclipse/emfcloud/coffee/modelserver/app/Application.java b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/src/org/eclipse/emfcloud/coffee/modelserver/app/Application.java
deleted file mode 100644
index c68e0b93..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/src/org/eclipse/emfcloud/coffee/modelserver/app/Application.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ******************************************************************************/
-package org.eclipse.emfcloud.coffee.modelserver.app;
-
-import org.eclipse.emfcloud.coffee.modelserver.CoffeeModelServerLauncher;
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-
-/**
- * This class controls all aspects of the application's execution.
- */
-public class Application implements IApplication {
-
- @Override
- public Object start(final IApplicationContext context) throws Exception {
- System.setProperty("org.eclipse.jetty.util.log.class", "org.eclipse.jetty.util.log.StdErrLog");
- System.setProperty("org.eclipse.jetty.LEVEL", "WARN");
- String[] args = getArgs(context);
- CoffeeModelServerLauncher.main(args);
- System.in.read();
- return null;
- }
-
- private String[] getArgs(final IApplicationContext context) {
- Object object = context.getArguments().get(IApplicationContext.APPLICATION_ARGS);
- if (object instanceof String[]) {
- return (String[]) object;
- }
- return new String[0];
- }
-
- @Override
- public void stop() {
- // Nothing
- }
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.checkstyle b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.checkstyle
deleted file mode 100644
index c654b811..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.checkstyle
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.project b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.project
deleted file mode 100644
index c06da574..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
- org.eclipse.emfcloud.coffee.modelserver.feature
-
-
-
-
-
- org.eclipse.pde.FeatureBuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
- net.sf.eclipsecs.core.CheckstyleBuilder
-
-
-
-
-
- org.eclipse.m2e.core.maven2Nature
- org.eclipse.pde.FeatureNature
- net.sf.eclipsecs.core.CheckstyleNature
-
-
-
- 1646939925507
-
- 30
-
- org.eclipse.core.resources.regexFilterMatcher
- node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
-
-
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.core.resources.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c02..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.jdt.core.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ded3a412..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,520 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.APILeak=warning
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
-org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
-org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
-org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
-org.eclipse.jdt.core.formatter.align_with_spaces=false
-org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
-org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0
-org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
-org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true
-org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=3
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=3
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
-org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.jdt.launching.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index d177941e..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=ignore
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.jdt.ui.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 54b6f7a9..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,137 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=true
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=true
-cleanup.convert_to_enhanced_for_loop=true
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=false
-cleanup.make_parameters_final=true
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=false
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_modifiers=true
-cleanup.remove_redundant_semicolons=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_autoboxing=true
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_unboxing=true
-cleanup_profile=_EMF.cloud Cleanup Profile
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_EMF.cloud Formatter Profile
-formatter_settings_version=16
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=/**\n * @return the ${bare_field_name}\n */ /**\n * @param ${param} the ${bare_field_name} to set\n */ /**\n * ${tags}\n */ /**\n * \n */ /**\n * @author ${user}\n *\n * ${tags}\n */ /**\n * \n */ /**\n * ${tags}\n */ /**\n * ${tags}\n * ${see_to_target}\n */ /********************************************************************************\n * Copyright (c) ${year} EclipseSource and others.\n *\n * This program and the accompanying materials are made available under the\n * terms of the Eclipse Public License v. 2.0 which is available at\n * https\://www.eclipse.org/legal/epl-2.0, or the MIT License which is\n * available at https\://opensource.org/licenses/MIT.\n *\n * SPDX-License-Identifier\: EPL-2.0 OR MIT\n ********************************************************************************/\n${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration} \n \n \n \n // ${todo} Auto-generated catch block\n${exception_var}.printStackTrace(); // ${todo} Auto-generated method stub\n${body_statement} ${body_statement}\n// ${todo} Auto-generated constructor stub return ${field}; ${field} \= ${param}; /**\n * @author ${user}\n *\n * ${tags}\n */ \n
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=true
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.insert_inferred_type_arguments=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=true
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_redundant_modifiers=true
-sp_cleanup.remove_redundant_semicolons=true
-sp_cleanup.remove_redundant_type_arguments=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_anonymous_class_creation=false
-sp_cleanup.use_autoboxing=true
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=true
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-sp_cleanup.use_unboxing=true
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/build.properties b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/build.properties
deleted file mode 100644
index 64f93a9f..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/feature.xml b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/feature.xml
deleted file mode 100644
index db1b3fc7..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/feature.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
- Coffee Modelserver Application, for creating and editing workflow
-diagrams.
-
-
-
- Copyright (c) 2021 EclipseSource and others.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- available at https://opensource.org/licenses/MIT.
-
- SPDX-License-Identifier: EPL-2.0 OR MIT
-
-
-
- EPL-2.0 or MIT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/pom.xml b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/pom.xml
deleted file mode 100644
index f6eed031..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
- 4.0.0
-
-
- org.eclipse.emfcloud.coffee
- org.eclipse.emfcloud.coffee.parent
- 0.1.0-SNAPSHOT
- ../../releng/org.eclipse.emfcloud.coffee.parent/
-
-
- org.eclipse.emfcloud.coffee.modelserver.feature
- eclipse-feature
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/META-INF/MANIFEST.MF b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/META-INF/MANIFEST.MF
index ff6fee72..07f78ddf 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/META-INF/MANIFEST.MF
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/META-INF/MANIFEST.MF
@@ -6,34 +6,41 @@ Bundle-Version: 0.1.0.qualifier
Automatic-Module-Name: org.eclipse.emfcloud.coffee.modelserver
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: ECLIPSESOURCE
-Require-Bundle: org.eclipse.emf.ecore,
- org.eclipse.emf.edit,
- org.eclipse.glsp.graph,
- org.eclipse.emfcloud.coffee.model,
- org.eclipse.emf.transaction,
- org.eclipse.emfcloud.modelserver.client;bundle-version="0.7.0",
- org.eclipse.emfcloud.modelserver.common;bundle-version="0.7.0",
- org.eclipse.emfcloud.modelserver.edit;bundle-version="0.7.0",
- org.eclipse.emfcloud.modelserver.emf;bundle-version="0.7.0",
- org.eclipse.emfcloud.modelserver.lib;bundle-version="0.7.0",
- org.eclipse.emfcloud.modelserver.glsp.notation.commands;bundle-version="0.7.0",
- org.eclipse.emfcloud.modelserver.glsp.notation.model;bundle-version="0.7.0",
- org.eclipse.emfcloud.modelserver.glsp.integration;bundle-version="0.7.0",
- com.google.inject;bundle-version="5.0.1",
- org.eclipse.jetty.http;bundle-version="[9.4.43,10.0.0)",
- org.eclipse.jetty.io;bundle-version="[9.4.43,10.0.0)",
- org.eclipse.jetty.util;bundle-version="[9.4.43,10.0.0)",
- org.eclipse.jetty.server;bundle-version="[9.4.43,10.0.0)",
- org.eclipse.jetty.servlet;bundle-version="[9.4.43,10.0.0)",
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.26.0,3.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.17.0,3.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)",
+ org.eclipse.glsp.graph;bundle-version="[1.1.0,2.2.0)",
+ org.eclipse.glsp.server;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.glsp.server.emf;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.emfcloud.coffee.model;bundle-version="[0.1.0,0.2.0)",
+ org.eclipse.emf.transaction;bundle-version="[1.9.1,2.0.0)",
+ org.eclipse.emfcloud.modelserver.client;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.emfcloud.modelserver.common;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.emfcloud.modelserver.edit;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.emfcloud.modelserver.emf;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.emfcloud.modelserver.lib;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.emfcloud.modelserver.glsp.notation.commands;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.emfcloud.modelserver.glsp.integration;bundle-version="[0.7.0,1.0.0)",
+ com.google.inject;bundle-version="[5.0.1,6.0.0)",
+ org.eclipse.jetty.http;bundle-version="[9.4.44,10.0.0)",
+ org.eclipse.jetty.io;bundle-version="[9.4.44,10.0.0)",
+ org.eclipse.jetty.util;bundle-version="[9.4.44,10.0.0)",
+ org.eclipse.jetty.security;bundle-version="[9.4.44,10.0.0)",
+ org.eclipse.jetty.server;bundle-version="[9.4.44,10.0.0)",
+ org.eclipse.jetty.servlet;bundle-version="[9.4.44,10.0.0)",
javax.servlet;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="2.16.0",
- com.fasterxml.jackson.core.jackson-core;bundle-version="2.12.1",
- com.fasterxml.jackson.core.jackson-databind;bundle-version="2.12.1",
- org.eclipse.emfcloud.emfjson-jackson;bundle-version="1.3.1"
+ com.fasterxml.jackson.core.jackson-core;bundle-version="[2.12.1,3.0.0)",
+ com.fasterxml.jackson.core.jackson-databind;bundle-version="[2.12.1,3.0.0)",
+ com.fasterxml.jackson.core.jackson-annotations;bundle-version="[2.12.1,3.0.0)",
+ org.eclipse.emfcloud.emfjson-jackson;bundle-version="[2.0.0,2.1.0)",
+ org.slf4j.api;bundle-version="[1.7.30,2.0.0)",
+ org.apache.logging.log4j;bundle-version="2.17.1",
+ org.aopalliance;bundle-version="[1.0.0,2.0.0)"
Export-Package: org.eclipse.emfcloud.coffee.modelserver,
org.eclipse.emfcloud.coffee.modelserver.commands.compound,
org.eclipse.emfcloud.coffee.modelserver.commands.contributions,
org.eclipse.emfcloud.coffee.modelserver.commands.notation,
org.eclipse.emfcloud.coffee.modelserver.commands.semantic,
- org.eclipse.emfcloud.coffee.modelserver.commands.util
-Import-Package: org.apache.log4j;version="1.2.15"
+ org.eclipse.emfcloud.coffee.modelserver.commands.util,
+ org.eclipse.emfcloud.coffee.modelserver.launch
+Import-Package: javax.inject;version="[1.0.0,2.0.0)"
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeCodec.java b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeCodec.java
index bb307d08..e2f72646 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeCodec.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeCodec.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,7 +16,8 @@
import java.util.Map;
import java.util.Optional;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
@@ -33,7 +34,7 @@
public class CoffeeCodec implements Codec {
- private static Logger LOGGER = Logger.getLogger(CoffeeCodec.class.getSimpleName());
+ private static Logger LOGGER = LogManager.getLogger(CoffeeCodec.class.getSimpleName());
@Override
public JsonNode encode(final EObject eObject) throws EncodingException {
@@ -84,7 +85,7 @@ public Optional decode(final ResourceSet resourceSet, final String mod
result = null;
}
if (result == null) {
- result = CoffeeResource.Factory.INSTANCE.createResource(URI.createURI(modelURI));
+ result = CoffeeResource.FACTORY.createResource(URI.createURI(modelURI));
resourceSet.getResources().add(result);
}
try {
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeCodecProvider.java b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeCodecProvider.java
new file mode 100644
index 00000000..5ba27121
--- /dev/null
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeCodecProvider.java
@@ -0,0 +1,55 @@
+/********************************************************************************
+ * Copyright (c) 2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ ********************************************************************************/
+package org.eclipse.emfcloud.coffee.modelserver;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Supplier;
+
+import org.eclipse.emfcloud.coffee.util.CoffeeResource;
+import org.eclipse.emfcloud.modelserver.common.ModelServerPathParametersV2;
+import org.eclipse.emfcloud.modelserver.common.codecs.Codec;
+import org.eclipse.emfcloud.modelserver.emf.common.codecs.CodecProvider;
+
+public class CoffeeCodecProvider implements CodecProvider {
+
+ private final Map> supportedFormats = new LinkedHashMap<>();
+
+ public CoffeeCodecProvider() {
+ this.supportedFormats.put(CoffeeResource.FILE_EXTENSION, CoffeeCodec::new);
+ this.supportedFormats.put(ModelServerPathParametersV2.FORMAT_JSON, CoffeeTreeJsonCodec::new);
+
+ }
+
+ @Override
+ public Optional getCodec(final String modelUri, final String format) {
+ // if (!modelUri.endsWith(CoffeeResource.FILE_EXTENSION)) {
+ // return Optional.empty();
+ // }
+ Supplier codecSupplier = supportedFormats.get(format);
+ if (codecSupplier == null) {
+ return Optional.empty();
+ }
+ return Optional.of(codecSupplier.get());
+ }
+
+ @Override
+ public Set getAllFormats() { return supportedFormats.keySet(); }
+
+ @Override
+ public int getPriority(final String modelUri, final String format) {
+ return (modelUri.endsWith(CoffeeResource.FILE_EXTENSION) && getAllFormats().contains(format)) ? 10
+ : NOT_SUPPORTED;
+ }
+
+}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelResourceManager.java b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelResourceManager.java
index 5a682ab5..0c87006a 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelResourceManager.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelResourceManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,18 +24,26 @@
import org.eclipse.emfcloud.modelserver.emf.configuration.EPackageConfiguration;
import org.eclipse.emfcloud.modelserver.emf.configuration.ServerConfiguration;
import org.eclipse.emfcloud.modelserver.emf.util.JsonPatchHelper;
-import org.eclipse.emfcloud.modelserver.glsp.notation.epackage.NotationUtil;
+import org.eclipse.emfcloud.modelserver.integration.SemanticFileExtension;
+import org.eclipse.emfcloud.modelserver.notation.integration.NotationFileExtension;
import com.google.inject.Inject;
import com.google.inject.Provider;
public class CoffeeModelResourceManager extends RecordingModelResourceManager {
+ @Inject
+ @SemanticFileExtension
+ protected String semanticFileExtension;
+ @Inject
+ @NotationFileExtension
+ protected String notationFileExtension;
+
@Inject
public CoffeeModelResourceManager(final Set configurations,
- final AdapterFactory adapterFactory,
- final ServerConfiguration serverConfiguration, final ModelWatchersManager watchersManager,
- final Provider jsonPatchHelper) {
+ final AdapterFactory adapterFactory, final ServerConfiguration serverConfiguration,
+ final ModelWatchersManager watchersManager, final Provider jsonPatchHelper) {
+
super(configurations, adapterFactory, serverConfiguration, watchersManager, jsonPatchHelper);
}
@@ -51,31 +59,46 @@ protected void loadSourceResources(final String directoryPath) {
if (isSourceDirectory(file)) {
loadSourceResources(file.getAbsolutePath());
} else if (file.isFile()) {
- URI modelURI = createURI(file.getAbsolutePath());
- if (CoffeeResource.FILE_EXTENSION.equals(modelURI.fileExtension())) {
- resourceSets.put(modelURI, resourceSetFactory.createResourceSet(modelURI));
+ URI absolutePath = URI.createFileURI(file.getAbsolutePath());
+ if (CoffeeResource.FILE_EXTENSION.equals(absolutePath.fileExtension())) {
+ getTaskListResourceSet(absolutePath);
}
- loadResource(modelURI.toString());
+ loadResource(absolutePath.toString());
}
}
}
+ /**
+ * Get the resource set that manages the given TaskList semantic model resource, creating
+ * it if necessary.
+ *
+ * @param modelURI a TaskList semantic model resource URI
+ * @return its resource set
+ */
+ protected ResourceSet getTaskListResourceSet(final URI modelURI) {
+ ResourceSet result = resourceSets.get(modelURI);
+ if (result == null) {
+ result = resourceSetFactory.createResourceSet(modelURI);
+ resourceSets.put(modelURI, result);
+ }
+ return result;
+ }
+
@Override
public ResourceSet getResourceSet(final String modeluri) {
- URI modelURI = createURI(modeluri);
- if (NotationUtil.NOTATION_EXTENSION.equals(modelURI.fileExtension())) {
- URI semanticUri = createURI(modeluri).trimFileExtension()
- .appendFileExtension(CoffeeResource.FILE_EXTENSION);
- return resourceSets.get(semanticUri);
+ URI resourceURI = createURI(modeluri);
+ if (resourceURI.fileExtension().equals(notationFileExtension)) {
+ URI semanticUri = resourceURI.trimFileExtension().appendFileExtension(semanticFileExtension);
+ return getTaskListResourceSet(semanticUri);
}
- return resourceSets.get(createURI(modeluri));
+ return resourceSets.get(resourceURI);
}
@Override
public boolean save(final String modeluri) {
boolean result = false;
for (Resource resource : getResourceSet(modeluri).getResources()) {
- result = saveResource(resource);
+ result = saveResource(resource) || result;
}
if (result) {
getEditingDomain(getResourceSet(modeluri)).saveIsDone();
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelServerClient.java b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelServerClient.java
index daffc75d..3f426b53 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelServerClient.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelServerClient.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,18 +14,18 @@
import java.util.Map;
import org.eclipse.emfcloud.coffee.util.CoffeeResource;
-import org.eclipse.emfcloud.modelserver.client.v1.ModelServerClientV1;
-import org.eclipse.emfcloud.modelserver.common.ModelServerPathParametersV1;
+import org.eclipse.emfcloud.modelserver.client.v2.ModelServerClientV2;
+import org.eclipse.emfcloud.modelserver.common.ModelServerPathParametersV2;
import org.eclipse.emfcloud.modelserver.common.codecs.Codec;
import org.eclipse.emfcloud.modelserver.common.codecs.DefaultJsonCodec;
import org.eclipse.emfcloud.modelserver.common.codecs.XmiCodec;
import org.eclipse.emfcloud.modelserver.emf.configuration.EPackageConfiguration;
-public class CoffeeModelServerClient extends ModelServerClientV1 {
+public class CoffeeModelServerClient extends ModelServerClientV2 {
private static final Map SUPPORTED_COFFEE_FORMATS = Map.of(
- ModelServerPathParametersV1.FORMAT_JSON, new DefaultJsonCodec(),
- ModelServerPathParametersV1.FORMAT_XMI, new XmiCodec(),
+ ModelServerPathParametersV2.FORMAT_JSON, new DefaultJsonCodec(),
+ ModelServerPathParametersV2.FORMAT_XMI, new XmiCodec(),
CoffeeResource.FILE_EXTENSION, new CoffeeCodec());
public CoffeeModelServerClient(final String baseUrl, final EPackageConfiguration... configurations)
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelServerModule.java b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelServerModule.java
index 61cc9dfb..a10ff39a 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelServerModule.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelServerModule.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,14 +21,15 @@
import org.eclipse.emfcloud.coffee.modelserver.commands.contributions.SetFlowSourceCommandContribution;
import org.eclipse.emfcloud.coffee.modelserver.commands.contributions.SetFlowTargetCommandContribution;
import org.eclipse.emfcloud.coffee.util.CoffeeResource;
-import org.eclipse.emfcloud.modelserver.common.ModelServerPathParametersV1;
-import org.eclipse.emfcloud.modelserver.common.codecs.Codec;
import org.eclipse.emfcloud.modelserver.common.utils.MapBinding;
import org.eclipse.emfcloud.modelserver.common.utils.MultiBinding;
import org.eclipse.emfcloud.modelserver.edit.CommandContribution;
import org.eclipse.emfcloud.modelserver.emf.common.ModelResourceManager;
+import org.eclipse.emfcloud.modelserver.emf.common.ResourceSetFactory;
+import org.eclipse.emfcloud.modelserver.emf.common.codecs.CodecProvider;
import org.eclipse.emfcloud.modelserver.emf.configuration.EPackageConfiguration;
-import org.eclipse.emfcloud.modelserver.glsp.notation.integration.EMSNotationModelServerModule;
+import org.eclipse.emfcloud.modelserver.notation.integration.EMSNotationModelServerModule;
+import org.eclipse.emfcloud.modelserver.notation.integration.NotationResource;
public class CoffeeModelServerModule extends EMSNotationModelServerModule {
@@ -44,10 +45,14 @@ protected void configureEPackages(final MultiBinding bind
}
@Override
- protected void configureCodecs(final MapBinding binding) {
+ protected void configureCodecs(final MultiBinding binding) {
super.configureCodecs(binding);
- binding.put(CoffeeResource.FILE_EXTENSION, CoffeeCodec.class);
- binding.put(ModelServerPathParametersV1.FORMAT_JSON, CoffeeTreeJsonCodec.class);
+ binding.add(CoffeeCodecProvider.class);
+ }
+
+ @Override
+ protected Class extends ResourceSetFactory> bindResourceSetFactory() {
+ return CoffeeResourceSetFactory.class;
}
@Override
@@ -69,4 +74,10 @@ protected void configureCommandCodecs(final MapBinding getFileExtensions() { return Lists.newArrayList(CoffeeResource.FILE_EXTENSION, "json"); }
+ public Collection getFileExtensions() {
+ return Lists.newArrayList(CoffeeResource.FILE_EXTENSION, ModelServerPathParametersV2.FORMAT_JSON);
+ }
@Override
public void registerEPackage() {
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeResourceSetFactory.java b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeResourceSetFactory.java
new file mode 100644
index 00000000..f86e69ad
--- /dev/null
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeResourceSetFactory.java
@@ -0,0 +1,43 @@
+/********************************************************************************
+ * Copyright (c) 2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ ********************************************************************************/
+package org.eclipse.emfcloud.coffee.modelserver;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emfcloud.coffee.util.CoffeeResource;
+import org.eclipse.emfcloud.modelserver.emf.common.DefaultResourceSetFactory;
+import org.eclipse.emfcloud.modelserver.integration.SemanticFileExtension;
+import org.eclipse.emfcloud.modelserver.notation.integration.NotationFileExtension;
+import org.eclipse.emfcloud.modelserver.notation.integration.NotationResource;
+
+import com.google.inject.Inject;
+
+public class CoffeeResourceSetFactory extends DefaultResourceSetFactory {
+
+ @Inject
+ @SemanticFileExtension
+ protected String semanticFileExtension;
+ @Inject
+ @NotationFileExtension
+ protected String notationFileExtension;
+
+ @Override
+ public ResourceSet createResourceSet(final URI modelURI) {
+ ResourceSet result = super.createResourceSet(modelURI);
+
+ result.getResourceFactoryRegistry().getExtensionToFactoryMap().put(
+ semanticFileExtension, CoffeeResource.FACTORY);
+ result.getResourceFactoryRegistry().getExtensionToFactoryMap().put(
+ notationFileExtension, NotationResource.FACTORY);
+
+ return result;
+ }
+}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/AddFlowShapeCommand.java b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/AddFlowShapeCommand.java
index af58182a..5e7b06b0 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/AddFlowShapeCommand.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/AddFlowShapeCommand.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,10 +16,10 @@
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emfcloud.coffee.Flow;
-import org.eclipse.emfcloud.modelserver.glsp.notation.Edge;
-import org.eclipse.emfcloud.modelserver.glsp.notation.NotationFactory;
-import org.eclipse.emfcloud.modelserver.glsp.notation.SemanticProxy;
import org.eclipse.emfcloud.modelserver.glsp.notation.commands.NotationElementCommand;
+import org.eclipse.glsp.server.emf.model.notation.Edge;
+import org.eclipse.glsp.server.emf.model.notation.NotationFactory;
+import org.eclipse.glsp.server.emf.model.notation.SemanticElementReference;
public class AddFlowShapeCommand extends NotationElementCommand {
@@ -44,13 +44,13 @@ public AddFlowShapeCommand(final EditingDomain domain, final URI modelUri, final
protected void doExecute() {
Edge edge = NotationFactory.eINSTANCE.createEdge();
- SemanticProxy proxy = NotationFactory.eINSTANCE.createSemanticProxy();
+ SemanticElementReference semanticReference = NotationFactory.eINSTANCE.createSemanticElementReference();
if (this.semanticProxyUri != null) {
- proxy.setUri(this.semanticProxyUri);
+ semanticReference.setElementId(this.semanticProxyUri);
} else {
- proxy.setUri(EcoreUtil.getURI(flowSupplier.get()).fragment());
+ semanticReference.setElementId(EcoreUtil.getURI(flowSupplier.get()).fragment());
}
- edge.setSemanticElement(proxy);
+ edge.setSemanticElement(semanticReference);
notationDiagram.getElements().add(edge);
}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/AddNodeShapeCommand.java b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/AddNodeShapeCommand.java
index 064ea9b8..20be709d 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/AddNodeShapeCommand.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/AddNodeShapeCommand.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,11 +16,11 @@
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emfcloud.coffee.Node;
-import org.eclipse.emfcloud.modelserver.glsp.notation.NotationFactory;
-import org.eclipse.emfcloud.modelserver.glsp.notation.SemanticProxy;
-import org.eclipse.emfcloud.modelserver.glsp.notation.Shape;
import org.eclipse.emfcloud.modelserver.glsp.notation.commands.NotationElementCommand;
import org.eclipse.glsp.graph.GPoint;
+import org.eclipse.glsp.server.emf.model.notation.NotationFactory;
+import org.eclipse.glsp.server.emf.model.notation.SemanticElementReference;
+import org.eclipse.glsp.server.emf.model.notation.Shape;
public class AddNodeShapeCommand extends NotationElementCommand {
@@ -52,13 +52,13 @@ protected void doExecute() {
Shape shape = NotationFactory.eINSTANCE.createShape();
shape.setPosition(shapePosition);
- SemanticProxy proxy = NotationFactory.eINSTANCE.createSemanticProxy();
+ SemanticElementReference semanticReference = NotationFactory.eINSTANCE.createSemanticElementReference();
if (this.semanticProxyUri != null) {
- proxy.setUri(this.semanticProxyUri);
+ semanticReference.setElementId(this.semanticProxyUri);
} else {
- proxy.setUri(EcoreUtil.getURI(nodeSupplier.get()).fragment());
+ semanticReference.setElementId(EcoreUtil.getURI(nodeSupplier.get()).fragment());
}
- shape.setSemanticElement(proxy);
+ shape.setSemanticElement(semanticReference);
notationDiagram.getElements().add(shape);
}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/RemoveFlowEdgeCommand.java b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/RemoveFlowEdgeCommand.java
index 22edbfa6..bae9b695 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/RemoveFlowEdgeCommand.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/RemoveFlowEdgeCommand.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,9 +12,9 @@
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emfcloud.modelserver.glsp.notation.Edge;
import org.eclipse.emfcloud.modelserver.glsp.notation.commands.NotationElementCommand;
import org.eclipse.emfcloud.modelserver.glsp.notation.commands.util.NotationCommandUtil;
+import org.eclipse.glsp.server.emf.model.notation.Edge;
public class RemoveFlowEdgeCommand extends NotationElementCommand {
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/RemoveNodeShapeCommand.java b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/RemoveNodeShapeCommand.java
index 5a78e4b5..43138276 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/RemoveNodeShapeCommand.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/RemoveNodeShapeCommand.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,9 +12,9 @@
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emfcloud.modelserver.glsp.notation.Shape;
import org.eclipse.emfcloud.modelserver.glsp.notation.commands.NotationElementCommand;
import org.eclipse.emfcloud.modelserver.glsp.notation.commands.util.NotationCommandUtil;
+import org.eclipse.glsp.server.emf.model.notation.Shape;
public class RemoveNodeShapeCommand extends NotationElementCommand {
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelServerLauncher.java b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/launch/CoffeeModelServerLauncher.java
similarity index 50%
rename from backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelServerLauncher.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/launch/CoffeeModelServerLauncher.java
index fd682c44..3e62a9e9 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelServerLauncher.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/launch/CoffeeModelServerLauncher.java
@@ -8,22 +8,35 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.modelserver;
+package org.eclipse.emfcloud.coffee.modelserver.launch;
+import java.io.IOException;
+
+import org.eclipse.emfcloud.coffee.modelserver.CoffeeModelServerModule;
+import org.eclipse.emfcloud.modelserver.emf.launch.CLIBasedModelServerLauncher;
+import org.eclipse.emfcloud.modelserver.emf.launch.CLIParser;
import org.eclipse.emfcloud.modelserver.emf.launch.ModelServerLauncher;
@SuppressWarnings("UncommentedMain")
public final class CoffeeModelServerLauncher {
private CoffeeModelServerLauncher() {}
+ private static String EXECUTABLE_NAME = "org.eclipse.emfcloud.coffee.modelserver-0.1.0-standalone.jar";
+
/**
* Launch Coffee Model Server.
*
* @param args arguments
*/
- public static void main(final String[] args) {
- final ModelServerLauncher launcher = new ModelServerLauncher(new CoffeeModelServerModule());
+ public static void main(final String[] args) throws IOException {
+ final ModelServerLauncher launcher = new CLIBasedModelServerLauncher(createCLIParser(args),
+ new CoffeeModelServerModule());
launcher.run();
}
+ protected static CLIParser createCLIParser(final String[] args) {
+ CLIParser parser = new CLIParser(args, CLIParser.getDefaultCLIOptions(), EXECUTABLE_NAME, 8081);
+ return parser;
+ }
+
}
diff --git a/backend/releng/org.eclipse.emfcloud.coffee.parent/pom.xml b/backend/releng/org.eclipse.emfcloud.coffee.parent/pom.xml
index 3e895e0c..b5763e08 100644
--- a/backend/releng/org.eclipse.emfcloud.coffee.parent/pom.xml
+++ b/backend/releng/org.eclipse.emfcloud.coffee.parent/pom.xml
@@ -1,5 +1,5 @@
-
-
+
@@ -20,7 +20,6 @@
-
@@ -39,30 +38,30 @@
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
@@ -70,10 +69,9 @@
-
-
-
-
+
+
+
diff --git a/backend/releng/org.eclipse.emfcloud.coffee.target/org.eclipse.emfcloud.coffee.target.tpd b/backend/releng/org.eclipse.emfcloud.coffee.target/org.eclipse.emfcloud.coffee.target.tpd
index f50c1d80..9883c4c3 100644
--- a/backend/releng/org.eclipse.emfcloud.coffee.target/org.eclipse.emfcloud.coffee.target.tpd
+++ b/backend/releng/org.eclipse.emfcloud.coffee.target/org.eclipse.emfcloud.coffee.target.tpd
@@ -12,7 +12,7 @@ target "Coffee Editor Targetplatform" with source, requirements
location "https://download.eclipse.org/tools/orbit/R-builds/R20220302172233/repository" orbit-release {
// Transitive dependencies
- ch.qos.logback.slf4j [1.1.2,2.0.0)
+ ch.qos.logback.slf4j [1.2.3,2.0.0)
com.google.gson [2.8.6,3.0.0)
com.google.inject [5.0.1,5.0.2)
com.google.guava [30.1.0,31.0.0)
@@ -28,7 +28,6 @@ location "https://download.eclipse.org/tools/orbit/R-builds/R20220302172233/repo
com.fasterxml.jackson.core.jackson-annotations [2.10.3,3.0.0)
com.fasterxml.jackson.core.jackson-core [2.10.3,3.0.0)
com.fasterxml.jackson.core.jackson-databind [2.10.3,3.0.0)
- org.slf4j.binding.simple [1.7.30,2.0.0)
}
location "http://download.eclipse.org/releases/2022-03" {
@@ -46,39 +45,38 @@ location "http://download.eclipse.org/releases/2022-03" {
org.eclipse.emf.transaction.feature.group [1.12.0,2.0.0)
}
-location "https://download.eclipse.org/emfcloud/modelserver/p2/integration/0.8.0.I20220323/" {
- org.eclipse.emfcloud.modelserver.feature.feature.group lazy
+location "https://download.eclipse.org/emfcloud/modelserver/p2/integration/0.8.0.I20220803/" {
+ org.eclipse.emfcloud.modelserver.feature.feature.group [0.8.0,0.9.0)
}
location "https://download.eclipse.org/emfcloud/emfjson-jackson/p2/releases/2.0.0/" {
- org.eclipse.emfcloud.emfjson-jackson lazy
+ org.eclipse.emfcloud.emfjson-jackson [2.0.0,2.1.0)
}
-location "https://download.eclipse.org/glsp/server/p2/releases/0.9.0/" {
- org.eclipse.glsp.feature.feature.group lazy
- org.eclipse.glsp.layout lazy
- org.eclipse.glsp.server lazy
- org.eclipse.glsp.graph lazy
+location "https://download.eclipse.org/glsp/server/p2/nightly/1.1/1.1.0.202207140749" {
+ org.eclipse.glsp.graph [1.1.0,2.0.0)
+ org.eclipse.glsp.layout [1.1.0,2.0.0)
+ org.eclipse.glsp.server [1.1.0,2.0.0)
+ org.eclipse.glsp.server.emf [1.1.0,2.0.0)
}
-location "https://download.eclipse.org/elk/updates/releases/0.7.1/" {
+location "https://download.eclipse.org/elk/updates/releases/0.8.1/" {
org.eclipse.elk.alg.layered [0.7.1,1.0.0)
org.eclipse.elk.core [0.7.1,1.0.0)
org.eclipse.elk.graph [0.7.1,1.0.0)
org.eclipse.elk.graph.text [0.7.1,1.0.0)
}
location "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.44.v20210927/" {
+ org.eclipse.jetty.server lazy
org.eclipse.jetty.websocket.server lazy
- org.eclipse.jetty.server
}
location "https://download.eclipse.org/emfcloud/model-validation/p2/nightly/0.2/0.2.0.202203171240/" {
- org.eclipse.emfcloud.validation.framework
+ org.eclipse.emfcloud.validation.framework [0.2.0,0.3.0)
}
-location "https://download.eclipse.org/emfcloud/modelserver-glsp-integration/p2/nightly/0.7/0.7.0.202203100842/" {
- org.eclipse.emfcloud.modelserver.glsp.feature.feature.group lazy
- org.eclipse.emfcloud.modelserver.glsp.notation.model lazy
- org.eclipse.emfcloud.modelserver.glsp.notation.commands lazy
+location "https://download.eclipse.org/emfcloud/modelserver-glsp-integration/p2/integration/0.8.0.I20220803/" {
+ org.eclipse.emfcloud.modelserver.glsp.integration [0.8.0,0.9.0)
+ org.eclipse.emfcloud.modelserver.glsp.notation.commands [0.8.0,0.9.0)
}
location "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.26.0/" {
org.eclipse.xtext.sdk.feature.group [2.26.0,3.0.0)
From b3677f79b7e56e3b0c54ff5b455ba47174e726bf Mon Sep 17 00:00:00 2001
From: Nina Doschek
Date: Tue, 30 Aug 2022 21:55:11 +0200
Subject: [PATCH 02/34] #455 #456 Update to latest versions and run servers as
JAR products
#455 Update to Model Server V2 and latest GLSP version
- Migrate GLSP Server to latest version 1.1.0
- Reuse EMF server and modelserver glsp integration code and remove obsolete classes
#456 Consider running backend services as JAR products
- Run GLSP Server product as Java application instead of Eclipse product
- TODO: Package as standalone JAR
---
.../.checkstyle | 13 -
.../.classpath | 11 -
.../.project | 51 --
.../org.eclipse.core.resources.prefs | 2 -
.../.settings/org.eclipse.jdt.core.prefs | 520 ------------------
.../.settings/org.eclipse.jdt.launching.prefs | 3 -
.../.settings/org.eclipse.jdt.ui.prefs | 137 -----
.../META-INF/MANIFEST.MF | 13 -
.../build.properties | 5 -
.../plugin.properties | 2 -
.../plugin.xml | 16 -
.../pom.xml | 18 -
.../workflow/glsp/server/app/Application.java | 42 --
.../.checkstyle | 13 -
.../.project | 40 --
.../org.eclipse.core.resources.prefs | 2 -
.../.settings/org.eclipse.jdt.core.prefs | 520 ------------------
.../.settings/org.eclipse.jdt.launching.prefs | 3 -
.../.settings/org.eclipse.jdt.ui.prefs | 137 -----
.../build.properties | 1 -
.../feature.xml | 79 ---
.../pom.xml | 16 -
.../META-INF/MANIFEST.MF | 57 +-
...java => WorkflowDiagramConfiguration.java} | 22 +-
...Module.java => WorkflowDiagramModule.java} | 109 ++--
.../glsp/server/WorkflowGLSPServer.java | 45 --
.../server/WorkflowGLSPServerLauncher.java | 62 ---
.../glsp/server/WorkflowLayoutEngine.java | 42 --
.../WorkflowModelServerAccess.java | 112 ++--
...odelTypes.java => WorkflowModelTypes.java} | 8 +-
.../glsp/server/WorkflowServerModule.java | 22 -
.../server/gmodel/AbstractGModelFactory.java | 43 --
.../server/gmodel/DiagramModelFactory.java | 52 --
.../glsp/server/gmodel/FlowFactory.java | 94 ----
.../glsp/server/gmodel/GModelFactory.java | 66 ---
.../glsp/server/gmodel/NodeFactory.java | 88 ---
.../server/gmodel/WorkflowGModelFactory.java | 171 ++++++
.../gmodel/WorkflowSourceModelStorage.java | 39 ++
.../WorkflowRequestMarkersActionHandler.java | 19 +-
.../create/AbstractCreateEdgeHandler.java | 47 ++
.../AbstractCreateNodeHandler.java | 37 +-
.../CreateAutomatedTaskHandler.java | 15 +-
.../CreateDecisionNodeHandler.java | 15 +-
.../CreateFlowHandler.java | 14 +-
.../CreateManualTaskHandler.java | 15 +-
.../CreateMergeNodeHandler.java | 15 +-
.../CreateWeightedFlowHandler.java | 18 +-
.../operation/AbstractCreateEdgeHandler.java | 54 --
...owChangeRoutingPointsOperationHandler.java | 42 --
.../WorkflowCompoundOperationHandler.java | 51 --
...orkflowApplyLabelEditOperationHandler.java | 40 +-
.../WorkflowDeleteOperationHandler.java | 50 +-
.../WorkflowReconnectFlowHandler.java | 32 +-
.../launch/WorkflowGLSPServerLauncher.java | 49 ++
.../server/layout/WorkflowLayoutEngine.java | 32 ++
.../glsp/server/model/MappedGModelRoot.java | 34 --
.../server/model/WorkflowModelFactory.java | 202 -------
.../glsp/server/model/WorkflowModelIndex.java | 158 ------
.../model/WorkflowModelSourceLoader.java | 91 ---
.../glsp/server/model/WorkflowModelState.java | 119 ----
.../WorkflowCommandPaletteActionProvider.java | 14 +-
.../WorkflowContextMenuItemProvider.java | 6 +-
.../{model => util}/CoffeeTypeUtil.java | 14 +-
.../glsp/server/util/WorkflowBuilder.java | 18 +-
.../WorkflowLabelEditValidator.java | 16 +-
...orkflowValidationResultChangeListener.java | 2 +-
.../pom.xml | 2 -
.../launch/WorkflowGLSPServer.launch | 206 +------
.../workflowserver.product | 35 --
69 files changed, 658 insertions(+), 3480 deletions(-)
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.checkstyle
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.classpath
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.project
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.core.resources.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.jdt.core.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.jdt.launching.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.jdt.ui.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/META-INF/MANIFEST.MF
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/build.properties
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/plugin.properties
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/plugin.xml
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/pom.xml
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/app/Application.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.checkstyle
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.project
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.core.resources.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.jdt.core.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.jdt.launching.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.jdt.ui.prefs
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/build.properties
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/feature.xml
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/pom.xml
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{WorkflowDiagramNotationConfiguration.java => WorkflowDiagramConfiguration.java} (77%)
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{WorkflowGLSPModule.java => WorkflowDiagramModule.java} (57%)
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowGLSPServer.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowGLSPServerLauncher.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowLayoutEngine.java
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{model => }/WorkflowModelServerAccess.java (59%)
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{util/ModelTypes.java => WorkflowModelTypes.java} (88%)
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowServerModule.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/AbstractGModelFactory.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/DiagramModelFactory.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/FlowFactory.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/GModelFactory.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/NodeFactory.java
create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/WorkflowGModelFactory.java
create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/WorkflowSourceModelStorage.java
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => actions}/WorkflowRequestMarkersActionHandler.java (69%)
create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/AbstractCreateEdgeHandler.java
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => create}/AbstractCreateNodeHandler.java (52%)
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => create}/CreateAutomatedTaskHandler.java (63%)
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => create}/CreateDecisionNodeHandler.java (63%)
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => create}/CreateFlowHandler.java (63%)
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => create}/CreateManualTaskHandler.java (63%)
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => create}/CreateMergeNodeHandler.java (63%)
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => create}/CreateWeightedFlowHandler.java (57%)
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/AbstractCreateEdgeHandler.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowChangeRoutingPointsOperationHandler.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowCompoundOperationHandler.java
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => operations}/WorkflowApplyLabelEditOperationHandler.java (55%)
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => operations}/WorkflowDeleteOperationHandler.java (50%)
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => operations}/WorkflowReconnectFlowHandler.java (67%)
create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/launch/WorkflowGLSPServerLauncher.java
create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/layout/WorkflowLayoutEngine.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/MappedGModelRoot.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelFactory.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelIndex.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelSourceLoader.java
delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelState.java
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{ => provider}/WorkflowCommandPaletteActionProvider.java (88%)
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{ => provider}/WorkflowContextMenuItemProvider.java (86%)
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{model => util}/CoffeeTypeUtil.java (83%)
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{ => validation}/WorkflowLabelEditValidator.java (87%)
rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{model => validation}/WorkflowValidationResultChangeListener.java (97%)
delete mode 100644 backend/releng/org.eclipse.emfcloud.coffee.product/workflowserver.product
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.checkstyle b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.checkstyle
deleted file mode 100644
index c654b811..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.checkstyle
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.classpath b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.classpath
deleted file mode 100644
index 685a6999..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.project b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.project
deleted file mode 100644
index c15e8565..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.project
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
- org.eclipse.emfcloud.coffee.workflow.glsp.server.app
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
- net.sf.eclipsecs.core.CheckstyleBuilder
-
-
-
-
-
- org.eclipse.m2e.core.maven2Nature
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
- net.sf.eclipsecs.core.CheckstyleNature
-
-
-
- 0
-
- 30
-
- org.eclipse.core.resources.regexFilterMatcher
- node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
-
-
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.core.resources.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c02..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.jdt.core.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ded3a412..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,520 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.APILeak=warning
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
-org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
-org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
-org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
-org.eclipse.jdt.core.formatter.align_with_spaces=false
-org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
-org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0
-org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
-org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true
-org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=3
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=3
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
-org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.jdt.launching.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index d177941e..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=ignore
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.jdt.ui.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 54b6f7a9..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,137 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=true
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=true
-cleanup.convert_to_enhanced_for_loop=true
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=false
-cleanup.make_parameters_final=true
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=false
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_modifiers=true
-cleanup.remove_redundant_semicolons=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_autoboxing=true
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_unboxing=true
-cleanup_profile=_EMF.cloud Cleanup Profile
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_EMF.cloud Formatter Profile
-formatter_settings_version=16
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=/**\n * @return the ${bare_field_name}\n */ /**\n * @param ${param} the ${bare_field_name} to set\n */ /**\n * ${tags}\n */ /**\n * \n */ /**\n * @author ${user}\n *\n * ${tags}\n */ /**\n * \n */ /**\n * ${tags}\n */ /**\n * ${tags}\n * ${see_to_target}\n */ /********************************************************************************\n * Copyright (c) ${year} EclipseSource and others.\n *\n * This program and the accompanying materials are made available under the\n * terms of the Eclipse Public License v. 2.0 which is available at\n * https\://www.eclipse.org/legal/epl-2.0, or the MIT License which is\n * available at https\://opensource.org/licenses/MIT.\n *\n * SPDX-License-Identifier\: EPL-2.0 OR MIT\n ********************************************************************************/\n${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration} \n \n \n \n // ${todo} Auto-generated catch block\n${exception_var}.printStackTrace(); // ${todo} Auto-generated method stub\n${body_statement} ${body_statement}\n// ${todo} Auto-generated constructor stub return ${field}; ${field} \= ${param}; /**\n * @author ${user}\n *\n * ${tags}\n */ \n
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=true
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.insert_inferred_type_arguments=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=true
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_redundant_modifiers=true
-sp_cleanup.remove_redundant_semicolons=true
-sp_cleanup.remove_redundant_type_arguments=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_anonymous_class_creation=false
-sp_cleanup.use_autoboxing=true
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=true
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-sp_cleanup.use_unboxing=true
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/META-INF/MANIFEST.MF b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/META-INF/MANIFEST.MF
deleted file mode 100644
index 65ff7c7d..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emfcloud.coffee.workflow.glsp.server.app;singleton:=true
-Automatic-Module-Name: org.eclipse.emfcloud.coffee.workflow.glsp.server.app
-Bundle-Version: 0.1.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: org.eclipse.equinox.event;bundle-version="1.6.0",
- org.eclipse.equinox.app;bundle-version="1.5.0",
- org.eclipse.emfcloud.coffee.workflow.glsp.server;bundle-version="0.1.0"
-Export-Package: org.eclipse.emfcloud.coffee.workflow.glsp.server.app
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/build.properties b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/build.properties
deleted file mode 100644
index caab4c1f..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = target/classes/
-bin.includes = plugin.xml,\
- META-INF/,\
- .
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/plugin.properties b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/plugin.properties
deleted file mode 100644
index d49a9b31..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pluginName = Coffee Editor GLSP Server App plugin
-providerName = EclipseSource
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/plugin.xml b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/plugin.xml
deleted file mode 100644
index c5ca348b..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/plugin.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/pom.xml b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/pom.xml
deleted file mode 100644
index 3a2531c4..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
- 4.0.0
- org.eclipse.emfcloud.coffee.workflow.glsp.server.app
- eclipse-plugin
-
-
- org.eclipse.emfcloud.coffee
- org.eclipse.emfcloud.coffee.parent
- 0.1.0-SNAPSHOT
- ../../releng/org.eclipse.emfcloud.coffee.parent/
-
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/app/Application.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/app/Application.java
deleted file mode 100644
index f2e3ff46..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/app/Application.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019-2020 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- */
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.app;
-
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowGLSPServerLauncher;
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-
-/**
- * This class controls all aspects of the application's execution.
- */
-public class Application implements IApplication {
-
- @Override
- public Object start(final IApplicationContext context) throws Exception {
- String[] args = getArgs(context);
- WorkflowGLSPServerLauncher.main(args);
- return null;
- }
-
- private String[] getArgs(final IApplicationContext context) {
- Object object = context.getArguments().get(IApplicationContext.APPLICATION_ARGS);
- if (object instanceof String[]) {
- return (String[]) object;
- }
- return new String[0];
- }
-
- @Override
- public void stop() {
- // Nothing
- }
-
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.checkstyle b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.checkstyle
deleted file mode 100644
index c654b811..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.checkstyle
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.project b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.project
deleted file mode 100644
index 0424f403..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
- org.eclipse.emfcloud.coffee.workflow.glsp.server.feature
-
-
-
-
-
- org.eclipse.pde.FeatureBuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
- net.sf.eclipsecs.core.CheckstyleBuilder
-
-
-
-
-
- org.eclipse.m2e.core.maven2Nature
- org.eclipse.pde.FeatureNature
- net.sf.eclipsecs.core.CheckstyleNature
-
-
-
- 1646939925523
-
- 30
-
- org.eclipse.core.resources.regexFilterMatcher
- node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
-
-
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.core.resources.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c02..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.jdt.core.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ded3a412..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,520 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.APILeak=warning
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
-org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
-org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
-org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
-org.eclipse.jdt.core.formatter.align_with_spaces=false
-org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
-org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0
-org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
-org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true
-org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=3
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_if_empty
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=3
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
-org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.jdt.launching.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index d177941e..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=ignore
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.jdt.ui.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 54b6f7a9..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,137 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=true
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=true
-cleanup.convert_to_enhanced_for_loop=true
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=false
-cleanup.make_parameters_final=true
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=false
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_modifiers=true
-cleanup.remove_redundant_semicolons=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_autoboxing=true
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_unboxing=true
-cleanup_profile=_EMF.cloud Cleanup Profile
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_EMF.cloud Formatter Profile
-formatter_settings_version=16
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=/**\n * @return the ${bare_field_name}\n */ /**\n * @param ${param} the ${bare_field_name} to set\n */ /**\n * ${tags}\n */ /**\n * \n */ /**\n * @author ${user}\n *\n * ${tags}\n */ /**\n * \n */ /**\n * ${tags}\n */ /**\n * ${tags}\n * ${see_to_target}\n */ /********************************************************************************\n * Copyright (c) ${year} EclipseSource and others.\n *\n * This program and the accompanying materials are made available under the\n * terms of the Eclipse Public License v. 2.0 which is available at\n * https\://www.eclipse.org/legal/epl-2.0, or the MIT License which is\n * available at https\://opensource.org/licenses/MIT.\n *\n * SPDX-License-Identifier\: EPL-2.0 OR MIT\n ********************************************************************************/\n${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration} \n \n \n \n // ${todo} Auto-generated catch block\n${exception_var}.printStackTrace(); // ${todo} Auto-generated method stub\n${body_statement} ${body_statement}\n// ${todo} Auto-generated constructor stub return ${field}; ${field} \= ${param}; /**\n * @author ${user}\n *\n * ${tags}\n */ \n
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=true
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.insert_inferred_type_arguments=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=true
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_redundant_modifiers=true
-sp_cleanup.remove_redundant_semicolons=true
-sp_cleanup.remove_redundant_type_arguments=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_anonymous_class_creation=false
-sp_cleanup.use_autoboxing=true
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=true
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-sp_cleanup.use_unboxing=true
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/build.properties b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/build.properties
deleted file mode 100644
index 64f93a9f..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/feature.xml b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/feature.xml
deleted file mode 100644
index 85d6f60c..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/feature.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
- Workflow GLSP Server Application, for creating and editing workflow
-diagrams.
-
-
-
- Copyright (c) 2021 EclipseSource and others.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- available at https://opensource.org/licenses/MIT.
-
- SPDX-License-Identifier: EPL-2.0 OR MIT
-
-
-
- EPL-2.0 or MIT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/pom.xml b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/pom.xml
deleted file mode 100644
index fd5f9805..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
- 4.0.0
-
-
- org.eclipse.emfcloud.coffee
- org.eclipse.emfcloud.coffee.parent
- 0.1.0-SNAPSHOT
- ../../releng/org.eclipse.emfcloud.coffee.parent/
-
-
- org.eclipse.emfcloud.coffee.workflow.glsp.server.feature
- eclipse-feature
-
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/META-INF/MANIFEST.MF b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/META-INF/MANIFEST.MF
index 2db43602..a3dcfb86 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/META-INF/MANIFEST.MF
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/META-INF/MANIFEST.MF
@@ -7,34 +7,35 @@ Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: org.eclipse.core.runtime,
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.glsp.server;bundle-version="0.8.0",
- org.eclipse.glsp.layout;bundle-version="0.8.0",
- org.eclipse.elk.alg.layered;bundle-version="0.7.1",
- org.eclipse.emfcloud.modelserver.edit;bundle-version="0.7.0",
- org.eclipse.elk.core;bundle-version="0.7.1",
- org.eclipse.emf.edit;bundle-version="2.16.0",
- org.eclipse.emfcloud.modelserver.client;bundle-version="0.7.0",
- org.eclipse.elk.graph;bundle-version="0.7.1",
- org.eclipse.emfcloud.modelserver.common;bundle-version="0.7.0",
- org.eclipse.emf.ecore.xmi;bundle-version="2.16.0",
- org.eclipse.emfcloud.coffee.model;bundle-version="0.1.0",
- org.eclipse.emfcloud.modelserver.glsp.integration;bundle-version="0.7.0",
- org.eclipse.emfcloud.coffee.modelserver;bundle-version="0.1.0",
- org.eclipse.emfcloud.validation.framework;bundle-version="0.2.0",
- org.eclipse.jetty.http;bundle-version="[9.4.43,10.0.0)",
- org.eclipse.jetty.io;bundle-version="[9.4.43,10.0.0)",
- org.eclipse.jetty.security;bundle-version="[9.4.43,10.0.0)",
- org.eclipse.jetty.server;bundle-version="[9.4.43,10.0.0)",
- org.eclipse.jetty.servlet;bundle-version="[9.4.43,10.0.0)",
- org.eclipse.jetty.util;bundle-version="[9.4.43,10.0.0)",
- org.eclipse.jetty.util.ajax;bundle-version="[9.4.43,10.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.24.100,4.0.0)",
+ org.apache.logging.log4j;bundle-version="[2.17.1,3.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.17.0,3.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)",
+ org.eclipse.glsp.layout;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.glsp.server;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.glsp.server.emf;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.elk.alg.layered;bundle-version="[0.8.1,1.0.0)",
+ org.eclipse.elk.core;bundle-version="[0.8.1,1.0.0)",
+ org.eclipse.elk.graph;bundle-version="[0.8.1,1.0.0)",
+ org.eclipse.emfcloud.modelserver.edit;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.emfcloud.modelserver.client;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.emfcloud.modelserver.common;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.emfcloud.modelserver.emf;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.emfcloud.modelserver.lib;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.emfcloud.modelserver.glsp.integration;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.emfcloud.modelserver.glsp.notation.commands;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.emfcloud.coffee.model;bundle-version="[0.1.0,0.2.0)",
+ org.eclipse.emfcloud.coffee.modelserver;bundle-version="[0.1.0,0.2.0)",
+ org.eclipse.emfcloud.validation.framework;bundle-version="[0.2.0,0.3.0)",
+ org.eclipse.jetty.http;bundle-version="[9.4.44,10.0.0)",
+ org.eclipse.jetty.io;bundle-version="[9.4.44,10.0.0)",
+ org.eclipse.jetty.security;bundle-version="[9.4.44,10.0.0)",
+ org.eclipse.jetty.server;bundle-version="[9.4.44,10.0.0)",
+ org.eclipse.jetty.servlet;bundle-version="[9.4.44,10.0.0)",
+ org.eclipse.jetty.util;bundle-version="[9.4.44,10.0.0)",
+ org.eclipse.jetty.util.ajax;bundle-version="[9.4.44,10.0.0)",
javax.servlet;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emfcloud.modelserver.glsp.notation.model;bundle-version="0.7.0",
- org.eclipse.emfcloud.modelserver.glsp.notation.commands;bundle-version="0.7.0"
+ com.google.gson;bundle-version="[2.8.9,3.0.0)"
Export-Package: org.eclipse.emfcloud.coffee.workflow.glsp.server
-Import-Package: org.eclipse.emfcloud.modelserver.emf.common,
- org.eclipse.emfcloud.modelserver.emf.configuration,
- com.google.gson;version="2.8.6"
+Import-Package: javax.inject;version="[1.0.0,2.0.0)"
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowDiagramNotationConfiguration.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowDiagramConfiguration.java
similarity index 77%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowDiagramNotationConfiguration.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowDiagramConfiguration.java
index cc1becd0..24e6dc87 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowDiagramNotationConfiguration.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowDiagramConfiguration.java
@@ -10,16 +10,16 @@
******************************************************************************/
package org.eclipse.emfcloud.coffee.workflow.glsp.server;
-import static org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes.AUTOMATED_TASK;
-import static org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes.COMP_HEADER;
-import static org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes.DECISION_NODE;
-import static org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes.ICON;
-import static org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes.LABEL_HEADING;
-import static org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes.LABEL_ICON;
-import static org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes.LABEL_TEXT;
-import static org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes.MANUAL_TASK;
-import static org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes.MERGE_NODE;
-import static org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes.WEIGHTED_EDGE;
+import static org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes.AUTOMATED_TASK;
+import static org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes.COMP_HEADER;
+import static org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes.DECISION_NODE;
+import static org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes.ICON;
+import static org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes.LABEL_HEADING;
+import static org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes.LABEL_ICON;
+import static org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes.LABEL_TEXT;
+import static org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes.MANUAL_TASK;
+import static org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes.MERGE_NODE;
+import static org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes.WEIGHTED_EDGE;
import static org.eclipse.glsp.graph.DefaultTypes.EDGE;
import java.util.ArrayList;
@@ -36,7 +36,7 @@
import org.eclipse.glsp.server.types.EdgeTypeHint;
import org.eclipse.glsp.server.types.ShapeTypeHint;
-public class WorkflowDiagramNotationConfiguration extends BaseDiagramConfiguration {
+public class WorkflowDiagramConfiguration extends BaseDiagramConfiguration {
@Override
public String getDiagramType() { return "workflow-diagram-notation"; }
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowGLSPModule.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowDiagramModule.java
similarity index 57%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowGLSPModule.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowDiagramModule.java
index 7136d866..4f51fb08 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowGLSPModule.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowDiagramModule.java
@@ -10,25 +10,26 @@
******************************************************************************/
package org.eclipse.emfcloud.coffee.workflow.glsp.server;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation.CreateAutomatedTaskHandler;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation.CreateDecisionNodeHandler;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation.CreateFlowHandler;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation.CreateManualTaskHandler;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation.CreateMergeNodeHandler;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation.CreateWeightedFlowHandler;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation.WorkflowApplyLabelEditOperationHandler;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation.WorkflowChangeRoutingPointsOperationHandler;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation.WorkflowCompoundOperationHandler;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation.WorkflowDeleteOperationHandler;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation.WorkflowReconnectFlowHandler;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation.WorkflowRequestMarkersActionHandler;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelFactory;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelSourceLoader;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.modelserver.glsp.model.EMSModelState;
-import org.eclipse.emfcloud.modelserver.glsp.notation.integration.EMSNotationGLSPModule;
+import org.eclipse.emfcloud.coffee.CoffeePackage;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.gmodel.WorkflowGModelFactory;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.gmodel.WorkflowSourceModelStorage;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.actions.WorkflowRequestMarkersActionHandler;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.create.CreateAutomatedTaskHandler;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.create.CreateDecisionNodeHandler;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.create.CreateFlowHandler;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.create.CreateManualTaskHandler;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.create.CreateMergeNodeHandler;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.create.CreateWeightedFlowHandler;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operations.WorkflowApplyLabelEditOperationHandler;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operations.WorkflowDeleteOperationHandler;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operations.WorkflowReconnectFlowHandler;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.layout.WorkflowLayoutEngine;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.provider.WorkflowCommandPaletteActionProvider;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.provider.WorkflowContextMenuItemProvider;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.validation.WorkflowLabelEditValidator;
+import org.eclipse.emfcloud.modelserver.glsp.notation.integration.EMSGLSPNotationDiagramModule;
+import org.eclipse.emfcloud.modelserver.glsp.notation.integration.EMSNotationModelServerAccess;
+import org.eclipse.emfcloud.modelserver.glsp.notation.integration.EMSNotationSourceModelStorage;
import org.eclipse.glsp.graph.GraphExtension;
import org.eclipse.glsp.server.actions.ActionHandler;
import org.eclipse.glsp.server.di.MultiBinding;
@@ -36,25 +37,40 @@
import org.eclipse.glsp.server.features.commandpalette.CommandPaletteActionProvider;
import org.eclipse.glsp.server.features.contextmenu.ContextMenuItemProvider;
import org.eclipse.glsp.server.features.core.model.GModelFactory;
-import org.eclipse.glsp.server.features.core.model.ModelSourceLoader;
-import org.eclipse.glsp.server.features.directediting.ApplyLabelEditOperationHandler;
import org.eclipse.glsp.server.features.directediting.LabelEditValidator;
import org.eclipse.glsp.server.features.validation.RequestMarkersHandler;
import org.eclipse.glsp.server.layout.LayoutEngine;
+import org.eclipse.glsp.server.operations.CutOperationHandler;
import org.eclipse.glsp.server.operations.OperationHandler;
-import org.eclipse.glsp.server.operations.gmodel.ChangeRoutingPointsHandler;
-import org.eclipse.glsp.server.operations.gmodel.CompoundOperationHandler;
-import org.eclipse.glsp.server.operations.gmodel.CutOperationHandler;
-import org.eclipse.glsp.server.operations.gmodel.DeleteOperationHandler;
-import org.eclipse.glsp.server.operations.gmodel.LayoutOperationHandler;
-import org.eclipse.glsp.server.operations.gmodel.PasteOperationHandler;
-import org.eclipse.glsp.server.operations.gmodel.ReconnectEdgeOperationHandler;
-public class WorkflowGLSPModule extends EMSNotationGLSPModule {
+public class WorkflowDiagramModule extends EMSGLSPNotationDiagramModule {
@Override
- protected Class extends EMSModelState> bindGModelState() {
- return WorkflowModelState.class;
+ protected void registerEPackages() {
+ // register and initialize all used ePackages
+ super.registerEPackages();
+ CoffeePackage.eINSTANCE.eClass();
+ }
+
+ @Override
+ protected Class extends DiagramConfiguration> bindDiagramConfiguration() {
+ // define what operations are allowed with our elements
+ return WorkflowDiagramConfiguration.class;
+ }
+
+ @Override
+ protected Class extends GModelFactory> bindGModelFactory() {
+ return WorkflowGModelFactory.class;
+ }
+
+ @Override
+ protected Class extends EMSNotationSourceModelStorage> bindSourceModelStorage() {
+ return WorkflowSourceModelStorage.class;
+ }
+
+ @Override
+ protected Class extends EMSNotationModelServerAccess> bindModelServerAccess() {
+ return WorkflowModelServerAccess.class;
}
@Override
@@ -68,16 +84,12 @@ protected void configureOperationHandlers(final MultiBinding b
super.configureOperationHandlers(bindings);
// model server-aware operation handlers
- bindings.rebind(CompoundOperationHandler.class, WorkflowCompoundOperationHandler.class);
- bindings.rebind(ChangeRoutingPointsHandler.class, WorkflowChangeRoutingPointsOperationHandler.class);
- bindings.rebind(ApplyLabelEditOperationHandler.class, WorkflowApplyLabelEditOperationHandler.class);
- bindings.rebind(DeleteOperationHandler.class, WorkflowDeleteOperationHandler.class);
- bindings.rebind(ReconnectEdgeOperationHandler.class, WorkflowReconnectFlowHandler.class);
+ bindings.add(WorkflowApplyLabelEditOperationHandler.class);
+ bindings.add(WorkflowDeleteOperationHandler.class);
+ bindings.add(WorkflowReconnectFlowHandler.class);
// unsupported operation handlers
bindings.remove(CutOperationHandler.class);
- bindings.remove(PasteOperationHandler.class);
- bindings.remove(LayoutOperationHandler.class);
// custom workflow operation handlers
bindings.add(CreateAutomatedTaskHandler.class);
@@ -98,11 +110,6 @@ protected Class extends LabelEditValidator> bindLabelEditValidator() {
return WorkflowLabelEditValidator.class;
}
- @Override
- protected Class extends DiagramConfiguration> bindDiagramConfiguration() {
- return WorkflowDiagramNotationConfiguration.class;
- }
-
@Override
protected Class extends CommandPaletteActionProvider> bindCommandPaletteActionProvider() {
return WorkflowCommandPaletteActionProvider.class;
@@ -119,22 +126,12 @@ protected Class extends LayoutEngine> bindLayoutEngine() {
}
@Override
- public void configure() {
- super.configure();
- bind(AdapterFactory.class).toInstance(new ComposedAdapterFactory());
- }
-
- @Override
- protected Class extends ModelSourceLoader> bindSourceModelLoader() {
- return WorkflowModelSourceLoader.class;
- }
+ public String getDiagramType() { return "workflow-diagram-notation"; }
@Override
- protected Class extends GModelFactory> bindGModelFactory() {
- return WorkflowModelFactory.class;
- }
+ protected String getSemanticFileExtension() { return "coffee"; }
@Override
- public String getDiagramType() { return "workflow-diagram-notation"; }
+ protected String getNotationFileExtension() { return "notation"; }
}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowGLSPServer.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowGLSPServer.java
deleted file mode 100644
index ba3da4ba..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowGLSPServer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ********************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server;
-
-import java.net.MalformedURLException;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-
-import org.eclipse.emfcloud.coffee.modelserver.CoffeeModelServerClient;
-import org.eclipse.emfcloud.coffee.util.CoffeeResource;
-import org.eclipse.emfcloud.modelserver.client.v1.ModelServerClientV1;
-import org.eclipse.emfcloud.modelserver.glsp.EMSGLSPServer;
-import org.eclipse.emfcloud.modelserver.glsp.notation.epackage.NotationUtil;
-import org.eclipse.glsp.server.protocol.DisposeClientSessionParameters;
-import org.eclipse.glsp.server.types.GLSPServerException;
-import org.eclipse.glsp.server.utils.ClientOptionsUtil;
-
-public class WorkflowGLSPServer extends EMSGLSPServer {
-
- @Override
- protected ModelServerClientV1 createModelServerClient(final String modelServerURL) throws MalformedURLException {
- return new CoffeeModelServerClient(modelServerURL);
- }
-
- @Override
- public CompletableFuture disposeClientSession(final DisposeClientSessionParameters params) {
- Optional modelServerClient = modelServerClientProvider.get();
- if (modelServerClient.isPresent()) {
- String sourceURI = ClientOptionsUtil.getSourceUri(params.getArgs())
- .orElseThrow(() -> new GLSPServerException("No source URI given to dispose client session!"));
- modelServerClient.get()
- .unsubscribe(sourceURI.replace(NotationUtil.NOTATION_EXTENSION, CoffeeResource.FILE_EXTENSION));
- }
- return super.disposeClientSession(params);
- }
-
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowGLSPServerLauncher.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowGLSPServerLauncher.java
deleted file mode 100644
index 792908b4..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowGLSPServerLauncher.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ********************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server;
-
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-import org.eclipse.elk.alg.layered.options.LayeredMetaDataProvider;
-import org.eclipse.emfcloud.modelserver.command.CCommandPackage;
-import org.eclipse.glsp.layout.ElkLayoutEngine;
-import org.eclipse.glsp.server.di.ServerModule;
-import org.eclipse.glsp.server.launch.GLSPServerLauncher;
-import org.eclipse.glsp.server.launch.SocketGLSPServerLauncher;
-
-@SuppressWarnings("UncommentedMain")
-public final class WorkflowGLSPServerLauncher {
-
- private WorkflowGLSPServerLauncher() {}
-
- private static final Logger LOGGER = Logger.getLogger(WorkflowGLSPServerLauncher.class.getSimpleName());
-
- private static final int WORKFLOW_DEFAULT_PORT = 5008;
-
- public static void main(final String[] args) {
- int port = getPort(args);
- configureLogger();
- ElkLayoutEngine.initialize(new LayeredMetaDataProvider());
- ServerModule module = new WorkflowServerModule();
- module.configureDiagramModule(new WorkflowGLSPModule());
- GLSPServerLauncher launcher = new SocketGLSPServerLauncher(module);
- CCommandPackage.eINSTANCE.eClass();
- launcher.start("localhost", port);
- }
-
- private static int getPort(final String[] args) {
- for (int i = 0; i < args.length; i++) {
- if ("--port".contentEquals(args[i])) {
- return Integer.parseInt(args[i + 1]);
- }
- }
- LOGGER.info("The server port was not specified; using default port 5008");
- return WORKFLOW_DEFAULT_PORT;
- }
-
- public static void configureLogger() {
- Logger root = Logger.getRootLogger();
- if (!root.getAllAppenders().hasMoreElements()) {
- root.addAppender(new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN)));
- }
- root.setLevel(Level.INFO);
- }
-
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowLayoutEngine.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowLayoutEngine.java
deleted file mode 100644
index 40ee0af8..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowLayoutEngine.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019-2020 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server;
-
-import org.eclipse.elk.alg.layered.options.LayeredOptions;
-import org.eclipse.elk.core.options.Direction;
-import org.eclipse.elk.core.options.EdgeRouting;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emfcloud.modelserver.glsp.layout.EMSLayoutEngine;
-import org.eclipse.glsp.graph.DefaultTypes;
-import org.eclipse.glsp.graph.GGraph;
-import org.eclipse.glsp.graph.GModelElement;
-import org.eclipse.glsp.layout.GLSPLayoutConfigurator;
-import org.eclipse.glsp.server.model.GModelState;
-
-public class WorkflowLayoutEngine extends EMSLayoutEngine {
-
- @Override
- public GModelElement layoutRoot(final GModelState modelState) {
- GModelElement newRoot = EcoreUtil.copy(modelState.getRoot());
- if (newRoot instanceof GGraph) {
- GLSPLayoutConfigurator configurator = new GLSPLayoutConfigurator();
- // ELK Layered Algorithm Reference:
- // https://www.eclipse.org/elk/reference/algorithms/org-eclipse-elk-layered.html
- configurator.configureByType(DefaultTypes.GRAPH)//
- .setProperty(LayeredOptions.DIRECTION, Direction.DOWN)
- .setProperty(LayeredOptions.SPACING_BASE_VALUE, 35d)
- .setProperty(LayeredOptions.EDGE_ROUTING, EdgeRouting.UNDEFINED);
- this.layout((GGraph) newRoot, configurator);
- }
- return newRoot;
- }
-
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelServerAccess.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowModelServerAccess.java
similarity index 59%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelServerAccess.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowModelServerAccess.java
index d1ae4514..2513724f 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelServerAccess.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowModelServerAccess.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -8,18 +8,19 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.model;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server;
import java.io.IOException;
+import java.net.MalformedURLException;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emfcloud.coffee.Flow;
import org.eclipse.emfcloud.coffee.Node;
import org.eclipse.emfcloud.coffee.modelserver.commands.contributions.AddAutomatedTaskCommandContribution;
@@ -33,13 +34,11 @@
import org.eclipse.emfcloud.coffee.modelserver.commands.contributions.SetFlowSourceCommandContribution;
import org.eclipse.emfcloud.coffee.modelserver.commands.contributions.SetFlowTargetCommandContribution;
import org.eclipse.emfcloud.coffee.modelserver.commands.util.SemanticCommandUtil;
-import org.eclipse.emfcloud.coffee.util.CoffeeResource;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.validation.WorkflowValidationResultChangeListener;
import org.eclipse.emfcloud.modelserver.client.Response;
-import org.eclipse.emfcloud.modelserver.client.v1.ModelServerClientV1;
import org.eclipse.emfcloud.modelserver.command.CCommand;
import org.eclipse.emfcloud.modelserver.command.CCompoundCommand;
import org.eclipse.emfcloud.modelserver.emf.common.EMFFacetConstraints;
-import org.eclipse.emfcloud.modelserver.glsp.notation.epackage.NotationUtil;
import org.eclipse.emfcloud.modelserver.glsp.notation.integration.EMSNotationModelServerAccess;
import org.eclipse.emfcloud.validation.framework.ValidationFilter;
import org.eclipse.emfcloud.validation.framework.ValidationFramework;
@@ -47,123 +46,96 @@
import org.eclipse.glsp.graph.GPoint;
import org.eclipse.glsp.graph.util.GraphUtil;
import org.eclipse.glsp.server.actions.ActionDispatcher;
-import org.eclipse.glsp.server.model.GModelState;
-import org.eclipse.glsp.server.types.GLSPServerException;
-
-import com.google.common.base.Preconditions;
public class WorkflowModelServerAccess extends EMSNotationModelServerAccess {
- private static Logger LOGGER = Logger.getLogger(WorkflowModelServerAccess.class);
-
- private final ActionDispatcher actionDispatcher;
+ private static Logger LOGGER = LogManager.getLogger(WorkflowModelServerAccess.class);
+ // FIXME @sgraband Could this become an injectable similar to the modelserveraccess?
private ValidationFramework validationFramework;
- public WorkflowModelServerAccess(final String sourceURI, final ModelServerClientV1 modelServerClient,
- final ActionDispatcher actionDispatcher) {
- super(sourceURI, modelServerClient, CoffeeResource.FILE_EXTENSION, NotationUtil.NOTATION_EXTENSION);
- Preconditions.checkNotNull(modelServerClient);
- this.actionDispatcher = actionDispatcher;
- }
-
- public void createValidationFramework(final GModelState modelState) {
+ public void createValidationFramework(final String clientId, final ActionDispatcher actionDispatcher) {
WorkflowValidationResultChangeListener changeListener = new WorkflowValidationResultChangeListener(
- modelState.getClientId(), actionDispatcher);
- this.validationFramework = new ValidationFramework(this.getSemanticURI(), modelServerClient, changeListener);
- }
-
- @Override
- public EObject getSemanticModel() {
+ clientId, actionDispatcher);
try {
- // fetch model in dedicated coffee format
- return modelServerClient.get(getSemanticURI(), CoffeeResource.FILE_EXTENSION).thenApply(res -> res.body())
- .get();
- } catch (InterruptedException | ExecutionException e) {
- LOGGER.error(e);
- throw new GLSPServerException("Error during model loading", e);
+ this.validationFramework = new ValidationFramework(this.getSemanticURI(), changeListener);
+ } catch (MalformedURLException e) {
+ LOGGER.error("Creation of ValidationFramework failed!");
+ e.printStackTrace();
}
}
protected String getOwnerRefUri(final EObject element) {
return "file:" + baseSourceUri.appendFileExtension(this.semanticFileExtension)
- .appendFragment(getSemanticUriFragment(element)).toString();
- }
-
- protected String getSemanticUriFragment(final EObject element) {
- return EcoreUtil.getURI(element).fragment();
+ .appendFragment(idGenerator.getOrCreateId(element)).toString();
}
- public CompletableFuture> addManualTask(final WorkflowModelState modelState,
- final Optional position) {
+ public CompletableFuture> addManualTask(final Optional position) {
CCompoundCommand command = AddManualTaskCommandContribution.create(position.orElse(GraphUtil.point(0, 0)));
return this.edit(command);
}
- public CompletableFuture> addAutomatedTask(final WorkflowModelState modelState,
- final Optional position) {
+ public CompletableFuture> addAutomatedTask(final Optional position) {
CCompoundCommand command = AddAutomatedTaskCommandContribution.create(position.orElse(GraphUtil.point(0, 0)));
return this.edit(command);
}
- public CompletableFuture> addDecisionNode(final WorkflowModelState modelState,
- final Optional position) {
+ public CompletableFuture> addDecisionNode(final Optional position) {
CCompoundCommand command = AddDecisionNodeCommandContribution.create(position.orElse(GraphUtil.point(0, 0)));
return this.edit(command);
}
- public CompletableFuture> addMergeNode(final WorkflowModelState modelState,
- final Optional position) {
+ public CompletableFuture> addMergeNode(final Optional position) {
CCompoundCommand command = AddMergeNodeCommandContribution.create(position.orElse(GraphUtil.point(0, 0)));
return this.edit(command);
}
- public CompletableFuture> addFlow(final WorkflowModelState modelState, final Node source,
- final Node target) {
- String sourceUriFragment = getSemanticUriFragment(source);
- String targetUriFragment = getSemanticUriFragment(target);
- CCompoundCommand command = AddFlowCommandContribution.create(sourceUriFragment, targetUriFragment);
+ public CompletableFuture> addFlow(final String sourceId, final String targetId) {
+ CCompoundCommand command = AddFlowCommandContribution.create(sourceId, targetId);
return this.edit(command);
}
- public CompletableFuture> addWeightedFlow(final WorkflowModelState modelState, final Node source,
- final Node target) {
- String sourceUriFragment = getSemanticUriFragment(source);
- String targetUriFragment = getSemanticUriFragment(target);
- CCompoundCommand command = AddWeightedFlowCommandContribution.create(sourceUriFragment, targetUriFragment);
+ public CompletableFuture> addWeightedFlow(final String sourceId, final String targetId) {
+ CCompoundCommand command = AddWeightedFlowCommandContribution.create(sourceId, targetId);
return this.edit(command);
}
- public CompletableFuture> removeFlow(final WorkflowModelState modelState, final Flow flow) {
- CCompoundCommand command = RemoveFlowCommandContribution.create(getSemanticUriFragment(flow));
+ public CompletableFuture> removeFlow(final Flow flow) {
+ CCompoundCommand command = RemoveFlowCommandContribution.create(idGenerator.getOrCreateId(flow));
return this.edit(command);
}
- public CompletableFuture> removeNode(final WorkflowModelState modelState, final Node node) {
- CCompoundCommand command = RemoveNodeCommandContribution.create(getSemanticUriFragment(node));
+ public CompletableFuture> removeNode(final Node node) {
+ CCompoundCommand command = RemoveNodeCommandContribution.create(idGenerator.getOrCreateId(node));
return this.edit(command);
}
- public CompletableFuture> setTaskName(final WorkflowModelState modelState,
- final Node nodeToRename, final String newName) {
+ public CompletableFuture> setTaskName(final Node nodeToRename, final String newName) {
CCommand setCommand = SemanticCommandUtil.createSetTaskNameCommand(nodeToRename, getOwnerRefUri(nodeToRename),
newName);
return this.edit(setCommand);
}
- public CompletableFuture> reconnectFlowSource(final Flow flow, final Node newSource) {
- CCommand command = SetFlowSourceCommandContribution.create(getSemanticUriFragment(flow),
- getSemanticUriFragment(newSource));
+ public CompletableFuture> reconnectFlowSource(final Flow flow, final Node newSource) {
+ CCommand command = SetFlowSourceCommandContribution.create(idGenerator.getOrCreateId(flow),
+ idGenerator.getOrCreateId(newSource));
return this.edit(command);
}
- public CompletableFuture> reconnectFlowTarget(final Flow flow, final Node newTarget) {
- CCommand command = SetFlowTargetCommandContribution.create(getSemanticUriFragment(flow),
- getSemanticUriFragment(newTarget));
+ public CompletableFuture> reconnectFlowTarget(final Flow flow, final Node newTarget) {
+ CCommand command = SetFlowTargetCommandContribution.create(idGenerator.getOrCreateId(flow),
+ idGenerator.getOrCreateId(newTarget));
return this.edit(command);
}
- public CompletableFuture validate() throws IOException, InterruptedException, ExecutionException {
+ @Override
+ public CompletableFuture> validate() {
+ // FIXME @sgraband validation via validationframework or client?
+ return modelServerClient.validate(getSemanticURI());
+ }
+
+ public CompletableFuture validateViaFramework() throws IOException, InterruptedException, ExecutionException {
+ // FIXME @sgraband
return this.validationFramework.validate();
}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/util/ModelTypes.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowModelTypes.java
similarity index 88%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/util/ModelTypes.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowModelTypes.java
index 92342f47..ca250095 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/util/ModelTypes.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowModelTypes.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019-2020 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -8,10 +8,10 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.util;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server;
-public final class ModelTypes {
- private ModelTypes() {}
+public final class WorkflowModelTypes {
+ private WorkflowModelTypes() {}
public static final String LABEL_HEADING = "label:heading";
public static final String LABEL_TEXT = "label:text";
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowServerModule.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowServerModule.java
deleted file mode 100644
index 3d1464e1..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowServerModule.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ********************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server;
-
-import org.eclipse.glsp.server.di.ServerModule;
-import org.eclipse.glsp.server.protocol.GLSPServer;
-
-public class WorkflowServerModule extends ServerModule {
-
- @Override
- protected Class extends GLSPServer> bindGLSPServer() {
- return WorkflowGLSPServer.class;
- }
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/AbstractGModelFactory.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/AbstractGModelFactory.java
deleted file mode 100644
index 69f03c8d..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/AbstractGModelFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ********************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.gmodel;
-
-import java.util.Optional;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.glsp.graph.GModelElement;
-
-public abstract class AbstractGModelFactory {
-
- protected WorkflowModelState modelState;
-
- public AbstractGModelFactory(final WorkflowModelState modelState) {
- this.modelState = modelState;
- }
-
- public abstract E create(T semanticElement);
-
- public Optional create(final T semanticElement, final Class clazz) {
- return Optional.ofNullable(create(semanticElement)).filter(clazz::isInstance).map(clazz::cast);
- }
-
- protected String toId(final EObject semanticElement) {
- String id = modelState.getIndex().getSemanticId(semanticElement).orElse(null);
- if (id == null) {
- id = EcoreUtil.getURI(semanticElement).fragment();
- modelState.getIndex().indexSemantic(id, semanticElement);
- }
- return id;
-
- }
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/DiagramModelFactory.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/DiagramModelFactory.java
deleted file mode 100644
index 1a8cc560..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/DiagramModelFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.gmodel;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.eclipse.emfcloud.coffee.Workflow;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.modelserver.glsp.notation.Diagram;
-import org.eclipse.glsp.graph.GGraph;
-import org.eclipse.glsp.graph.GModelElement;
-
-public class DiagramModelFactory extends GModelFactory {
-
- public DiagramModelFactory(final WorkflowModelState modelState) {
- super(modelState);
- }
-
- @Override
- public GGraph create(final Diagram notationDiagram) {
- GGraph graph = getOrCreateRoot();
-
- if (notationDiagram.getSemanticElement().getResolvedElement() != null) {
- Workflow workflowModel = (Workflow) notationDiagram.getSemanticElement().getResolvedElement();
-
- graph.setId(toId(workflowModel));
-
- // Add Nodes
- List nodeElements = workflowModel.getNodes().stream().map(node -> nodeFactory.create(node))
- .collect(Collectors.toList());
- graph.getChildren().addAll(nodeElements);
-
- // Add Flows
- List flowElements = workflowModel.getFlows().stream().map(flow -> flowFactory.create(flow))
- .collect(Collectors.toList());
- graph.getChildren().addAll(flowElements);
-
- }
- return graph;
-
- }
-
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/FlowFactory.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/FlowFactory.java
deleted file mode 100644
index 874255b1..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/FlowFactory.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ********************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.gmodel;
-
-import java.util.ArrayList;
-
-import org.eclipse.emfcloud.coffee.Flow;
-import org.eclipse.emfcloud.coffee.WeightedFlow;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.WorkflowBuilder;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.WorkflowBuilder.WeightedEdgeBuilder;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.wfgraph.WeightedEdge;
-import org.eclipse.emfcloud.modelserver.glsp.notation.Edge;
-import org.eclipse.glsp.graph.GEdge;
-import org.eclipse.glsp.graph.GPoint;
-import org.eclipse.glsp.graph.builder.impl.GEdgeBuilder;
-import org.eclipse.glsp.graph.util.GConstants;
-import org.eclipse.glsp.graph.util.GraphUtil;
-
-public class FlowFactory extends AbstractGModelFactory {
-
- public FlowFactory(final WorkflowModelState modelState) {
- super(modelState);
- }
-
- @Override
- public GEdge create(final Flow element) {
- if (element instanceof WeightedFlow) {
- return createWeightedFlowEdge((WeightedFlow) element);
- }
- return createFlowEdge(element);
- }
-
- protected GEdge createFlowEdge(final Flow flow) {
- String sourceId = toId(flow.getSource());
- String targetId = toId(flow.getTarget());
-
- GEdgeBuilder builder = new GEdgeBuilder()//
- .id(toId(flow))//
- .sourceId(sourceId)//
- .targetId(targetId)//
- .routerKind(GConstants.RouterKind.POLYLINE);
-
- modelState.getIndex().getNotation(flow, Edge.class).ifPresent(edge -> {
- if (edge.getBendPoints() != null) {
- ArrayList bendPoints = new ArrayList<>();
- edge.getBendPoints().forEach(p -> bendPoints.add(GraphUtil.copy(p)));
- builder.addRoutingPoints(bendPoints);
- }
- });
-
- String change = WorkflowBuilder.getChangeCssClass(modelState, flow);
- if (change != null) {
- builder.addCssClass(change);
- }
-
- return builder.build();
- }
-
- protected WeightedEdge createWeightedFlowEdge(final WeightedFlow flow) {
- String sourceId = toId(flow.getSource());
- String targetId = toId(flow.getTarget());
-
- WeightedEdgeBuilder builder = new WeightedEdgeBuilder()//
- .id(toId(flow))//
- .probability(flow.getProbability().getName())//
- .sourceId(sourceId)//
- .targetId(targetId).routerKind(GConstants.RouterKind.POLYLINE);
-
- modelState.getIndex().getNotation(flow, Edge.class).ifPresent(edge -> {
- if (edge.getBendPoints() != null) {
- ArrayList bendPoints = new ArrayList<>();
- edge.getBendPoints().forEach(p -> bendPoints.add(GraphUtil.copy(p)));
- builder.addRoutingPoints(bendPoints);
- }
- });
-
- String change = WorkflowBuilder.getChangeCssClass(modelState, flow);
- if (change != null) {
- builder.addCssClass(change);
- }
-
- return builder.build();
- }
-
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/GModelFactory.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/GModelFactory.java
deleted file mode 100644
index 9c1369b5..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/GModelFactory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ********************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.gmodel;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.modelserver.glsp.notation.Diagram;
-import org.eclipse.glsp.graph.GGraph;
-import org.eclipse.glsp.graph.GModelElement;
-import org.eclipse.glsp.graph.GModelRoot;
-import org.eclipse.glsp.graph.builder.impl.GGraphBuilder;
-import org.eclipse.glsp.server.types.GLSPServerException;
-
-public abstract class GModelFactory extends AbstractGModelFactory {
-
- protected final NodeFactory nodeFactory;
- protected final FlowFactory flowFactory;
-
- public GModelFactory(final WorkflowModelState modelState) {
- super(modelState);
- flowFactory = new FlowFactory(modelState);
- nodeFactory = new NodeFactory(modelState);
- getOrCreateRoot();
- }
-
- @Override
- public GModelElement create(final EObject semanticElement) {
- // no-op as we focus on create(final Diagram notationDiagram)
- return null;
- }
-
- public abstract GGraph create(Diagram notationDiagram);
-
- public GGraph create() {
- return create(modelState.getNotationModel());
- }
-
- public static GLSPServerException createFailed(final EObject semanticElement) {
- return new GLSPServerException("Error during model initialization!", new Throwable(
- "No matching GModelElement found for the semanticElement of type: " + semanticElement.getClass()));
- }
-
- protected GGraph getOrCreateRoot() {
- GModelRoot existingRoot = modelState.getRoot();
- if (existingRoot != null && existingRoot instanceof GGraph) {
- GGraph graph = (GGraph) existingRoot;
- graph.getChildren().clear();
- return graph;
- }
- return createRoot(modelState);
- }
-
- public GGraph createRoot(final WorkflowModelState modelState) {
- GGraph graph = new GGraphBuilder().build();
- modelState.setRoot(graph);
- return graph;
- }
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/NodeFactory.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/NodeFactory.java
deleted file mode 100644
index 8f3eb267..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/NodeFactory.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ********************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.gmodel;
-
-import org.eclipse.emfcloud.coffee.Node;
-import org.eclipse.emfcloud.coffee.Task;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.CoffeeTypeUtil;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.WorkflowBuilder;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.WorkflowBuilder.ActivityNodeBuilder;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.WorkflowBuilder.TaskNodeBuilder;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.wfgraph.ActivityNode;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.wfgraph.TaskNode;
-import org.eclipse.emfcloud.modelserver.glsp.notation.Shape;
-import org.eclipse.glsp.graph.GNode;
-import org.eclipse.glsp.graph.builder.impl.GArguments;
-import org.eclipse.glsp.graph.util.GraphUtil;
-
-public class NodeFactory extends AbstractGModelFactory {
-
- public NodeFactory(final WorkflowModelState modelState) {
- super(modelState);
- }
-
- @Override
- public GNode create(final Node node) {
- if (node instanceof Task) {
- return createTaskNode((Task) node);
- }
- return createActivityNode(node);
- }
-
- private TaskNode createTaskNode(final Task task) {
- String type = CoffeeTypeUtil.toType(task);
- String nodeType = CoffeeTypeUtil.toNodeType(task);
- TaskNodeBuilder builder = new TaskNodeBuilder(type, task.getName(), nodeType, task.getDuration());
- builder.id(toId(task));
-
- modelState.getIndex().getNotation(task, Shape.class).ifPresent(shape -> {
- if (shape.getPosition() != null) {
- builder.position(GraphUtil.copy(shape.getPosition()));
- }
- if (shape.getSize() != null) {
- builder.size(GraphUtil.copy(shape.getSize()));
- }
- });
- builder.addArguments(GArguments.cornerRadius(5));
-
- String change = WorkflowBuilder.getChangeCssClass(modelState, task);
- if (change != null) {
- builder.addCssClass(change);
- }
-
- return builder.build();
- }
-
- private ActivityNode createActivityNode(final Node node) {
- String type = CoffeeTypeUtil.toType(node);
- String nodeType = CoffeeTypeUtil.toNodeType(node);
- ActivityNodeBuilder builder = new ActivityNodeBuilder(type, nodeType);
- builder.id(toId(node));
-
- modelState.getIndex().getNotation(node, Shape.class).ifPresent(shape -> {
- if (shape.getPosition() != null) {
- builder.position(GraphUtil.copy(shape.getPosition()));
- }
- if (shape.getSize() != null) {
- builder.size(GraphUtil.copy(shape.getSize()));
- }
- });
-
- String change = WorkflowBuilder.getChangeCssClass(modelState, node);
- if (change != null) {
- builder.addCssClass(change);
- }
-
- return builder.build();
- }
-
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/WorkflowGModelFactory.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/WorkflowGModelFactory.java
new file mode 100644
index 00000000..101bcd31
--- /dev/null
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/WorkflowGModelFactory.java
@@ -0,0 +1,171 @@
+/*******************************************************************************
+ * Copyright (c) 2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ ******************************************************************************/
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.gmodel;
+
+import java.util.Map;
+import java.util.Optional;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emfcloud.coffee.Flow;
+import org.eclipse.emfcloud.coffee.Node;
+import org.eclipse.emfcloud.coffee.Task;
+import org.eclipse.emfcloud.coffee.WeightedFlow;
+import org.eclipse.emfcloud.coffee.Workflow;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.CoffeeTypeUtil;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.WorkflowBuilder.ActivityNodeBuilder;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.WorkflowBuilder.TaskNodeBuilder;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.WorkflowBuilder.WeightedEdgeBuilder;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.wfgraph.ActivityNode;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.wfgraph.TaskNode;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.wfgraph.WeightedEdge;
+import org.eclipse.emfcloud.modelserver.glsp.notation.integration.EMSNotationGModelFactory;
+import org.eclipse.glsp.graph.GEdge;
+import org.eclipse.glsp.graph.GGraph;
+import org.eclipse.glsp.graph.GModelRoot;
+import org.eclipse.glsp.graph.GNode;
+import org.eclipse.glsp.graph.builder.AbstractGEdgeBuilder;
+import org.eclipse.glsp.graph.builder.AbstractGNodeBuilder;
+import org.eclipse.glsp.graph.builder.impl.GArguments;
+import org.eclipse.glsp.graph.builder.impl.GEdgeBuilder;
+import org.eclipse.glsp.graph.builder.impl.GLayoutOptions;
+import org.eclipse.glsp.graph.util.GConstants;
+import org.eclipse.glsp.graph.util.GraphUtil;
+import org.eclipse.glsp.server.emf.model.notation.Diagram;
+import org.eclipse.glsp.server.emf.model.notation.Edge;
+import org.eclipse.glsp.server.emf.model.notation.Shape;
+
+public class WorkflowGModelFactory extends EMSNotationGModelFactory {
+
+ @Override
+ protected void fillRootElement(final EObject semanticModel, final Diagram notationModel, final GModelRoot newRoot) {
+ Workflow workflowModel = Workflow.class.cast(semanticModel);
+ GGraph graph = GGraph.class.cast(newRoot);
+ if (notationModel.getSemanticElement() != null
+ && notationModel.getSemanticElement().getResolvedSemanticElement() != null) {
+
+ graph.setId(idGenerator.getOrCreateId(workflowModel));
+
+ // Add Nodes
+ workflowModel.getNodes().stream().map(this::createNode)
+ .forEachOrdered(graph.getChildren()::add);
+
+ // Add Flows
+ workflowModel.getFlows().stream().map(this::createEdge)
+ .forEachOrdered(graph.getChildren()::add);
+ }
+ }
+
+ protected GNode createNode(final Node node) {
+ if (node instanceof Task) {
+ return this.createTaskNode(Task.class.cast(node));
+ }
+ return this.createActivityNode(node);
+ }
+
+ protected TaskNode createTaskNode(final Task task) {
+ String type = CoffeeTypeUtil.toType(task);
+ String nodeType = CoffeeTypeUtil.toNodeType(task);
+ TaskNodeBuilder builder = new TaskNodeBuilder(type, task.getName(), nodeType, task.getDuration());
+ builder.id(idGenerator.getOrCreateId(task));
+
+ builder.addArguments(GArguments.cornerRadius(5));
+
+ // String change = WorkflowBuilder.getChangeCssClass(modelState, task);
+ // if (change != null) {
+ // builder.addCssClass(change);
+ // }
+
+ applyShapeData(task, builder);
+ return builder.build();
+ }
+
+ protected ActivityNode createActivityNode(final Node node) {
+ String type = CoffeeTypeUtil.toType(node);
+ String nodeType = CoffeeTypeUtil.toNodeType(node);
+ ActivityNodeBuilder builder = new ActivityNodeBuilder(type, nodeType);
+ builder.id(idGenerator.getOrCreateId(node));
+
+ // String change = WorkflowBuilder.getChangeCssClass(modelState, node);
+ // if (change != null) {
+ // builder.addCssClass(change);
+ // }
+
+ applyShapeData(node, builder);
+ return builder.build();
+ }
+
+ protected GEdge createEdge(final Flow element) {
+ if (element instanceof WeightedFlow) {
+ return createWeightedFlowEdge((WeightedFlow) element);
+ }
+ return createFlowEdge(element);
+ }
+
+ protected GEdge createFlowEdge(final Flow flow) {
+ GEdgeBuilder builder = new GEdgeBuilder()
+ .id(idGenerator.getOrCreateId(flow))
+ .sourceId(idGenerator.getOrCreateId(flow.getSource()))
+ .targetId(idGenerator.getOrCreateId(flow.getTarget()))
+ .routerKind(GConstants.RouterKind.POLYLINE);
+
+ // String change = WorkflowBuilder.getChangeCssClass(modelState, flow);
+ // if (change != null) {
+ // builder.addCssClass(change);
+ // }
+
+ applyEdgeData(flow, builder);
+ return builder.build();
+ }
+
+ protected WeightedEdge createWeightedFlowEdge(final WeightedFlow flow) {
+ WeightedEdgeBuilder builder = new WeightedEdgeBuilder()
+ .id(idGenerator.getOrCreateId(flow))
+ .probability(flow.getProbability().getName())
+ .sourceId(idGenerator.getOrCreateId(flow.getSource()))
+ .targetId(idGenerator.getOrCreateId(flow.getTarget()))
+ .routerKind(GConstants.RouterKind.POLYLINE);
+
+ // String change = WorkflowBuilder.getChangeCssClass(modelState, flow);
+ // if (change != null) {
+ // builder.addCssClass(change);
+ // }
+
+ applyEdgeData(flow, builder);
+ return builder.build();
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ protected AbstractGNodeBuilder applyShapeData(final EObject shapeElement, final AbstractGNodeBuilder builder) {
+ modelState.getIndex().getNotation(shapeElement, Shape.class)
+ .ifPresent(shape -> {
+ Optional.ofNullable(shape.getPosition()).map(GraphUtil::copy).ifPresent(builder::position);
+ Optional.ofNullable(shape.getSize()).map(GraphUtil::copy).ifPresent(newSize -> {
+ builder.size(newSize);
+ builder.addLayoutOptions(Map.of(
+ GLayoutOptions.KEY_PREF_WIDTH, newSize.getWidth(),
+ GLayoutOptions.KEY_PREF_HEIGHT, newSize.getHeight()));
+ });
+ });
+ return builder;
+ }
+
+ @SuppressWarnings("rawtypes")
+ protected AbstractGEdgeBuilder applyEdgeData(final EObject edgeElement, final AbstractGEdgeBuilder builder) {
+ modelState.getIndex().getNotation(edgeElement, Edge.class)
+ .ifPresent(edge -> {
+ if (edge.getBendPoints() != null) {
+ edge.getBendPoints().stream().map(GraphUtil::copy).forEachOrdered(builder::addRoutingPoint);
+ }
+ });
+ return builder;
+ }
+
+}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/WorkflowSourceModelStorage.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/WorkflowSourceModelStorage.java
new file mode 100644
index 00000000..7f0b47b6
--- /dev/null
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/WorkflowSourceModelStorage.java
@@ -0,0 +1,39 @@
+/********************************************************************************
+ * Copyright (c) 2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ ********************************************************************************/
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.gmodel;
+
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelServerAccess;
+import org.eclipse.emfcloud.modelserver.glsp.notation.integration.EMSNotationSourceModelStorage;
+
+import com.google.inject.Inject;
+
+public class WorkflowSourceModelStorage extends EMSNotationSourceModelStorage {
+
+ @Inject
+ protected WorkflowModelServerAccess modelServerAccess;
+
+ @Override
+ protected void doSubscribe() {
+ // FIXME @sgraband dealing with highlights:
+ //
+ // if (action.getOptions().get("highlights") != null) {
+ // HashMap map = new Gson().fromJson(action.getOptions().get("highlights"), HashMap.class);
+ // for (Entry entry : map.entrySet()) {
+ // modelState.addHighlight(entry);
+ // }
+ // } else { ..Subscribe .. }
+
+ super.doSubscribe();
+ modelServerAccess.createValidationFramework(modelState.getClientId(), actionDispatcher);
+ modelServerAccess.subscribeToValidation();
+ modelServerAccess.initConstraintList();
+ }
+}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowRequestMarkersActionHandler.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/actions/WorkflowRequestMarkersActionHandler.java
similarity index 69%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowRequestMarkersActionHandler.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/actions/WorkflowRequestMarkersActionHandler.java
index 81eb4986..719e46b3 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowRequestMarkersActionHandler.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/actions/WorkflowRequestMarkersActionHandler.java
@@ -8,25 +8,28 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.actions;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.ExecutionException;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelServerAccess;
-import org.eclipse.emfcloud.modelserver.glsp.actions.handlers.EMSBasicActionHandler;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelServerAccess;
+import org.eclipse.emfcloud.modelserver.glsp.actions.handlers.AbstractEMSActionHandler;
import org.eclipse.glsp.server.actions.Action;
import org.eclipse.glsp.server.features.validation.RequestMarkersAction;
-public class WorkflowRequestMarkersActionHandler
- extends EMSBasicActionHandler {
+import com.google.inject.Inject;
+
+public class WorkflowRequestMarkersActionHandler extends AbstractEMSActionHandler {
+
+ @Inject
+ protected WorkflowModelServerAccess modelServerAccess;
@Override
- public List executeAction(final RequestMarkersAction action,
- final WorkflowModelServerAccess modelServerAccess) {
+ public List executeAction(final RequestMarkersAction action) {
try {
- modelServerAccess.validate().join();
+ modelServerAccess.validateViaFramework().join();
} catch (IOException | InterruptedException | ExecutionException e) {
e.printStackTrace();
}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/AbstractCreateEdgeHandler.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/AbstractCreateEdgeHandler.java
new file mode 100644
index 00000000..0dbb10aa
--- /dev/null
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/AbstractCreateEdgeHandler.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2019-2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ ******************************************************************************/
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.create;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelServerAccess;
+import org.eclipse.emfcloud.modelserver.client.Response;
+import org.eclipse.emfcloud.modelserver.glsp.operations.handlers.AbstractEMSCreateEdgeOperationHandler;
+import org.eclipse.glsp.server.operations.CreateEdgeOperation;
+import org.eclipse.glsp.server.types.GLSPServerException;
+
+import com.google.inject.Inject;
+
+public abstract class AbstractCreateEdgeHandler extends AbstractEMSCreateEdgeOperationHandler {
+
+ @Inject
+ protected WorkflowModelServerAccess modelAccess;
+
+ public AbstractCreateEdgeHandler(final String type) {
+ super(type);
+ }
+
+ @Override
+ public void executeOperation(final CreateEdgeOperation operation) {
+ String sourceId = operation.getSourceElementId();
+ String targetId = operation.getTargetElementId();
+
+ addFlow(modelAccess, sourceId, targetId)
+ .thenAccept(response -> {
+ if (response.body() == null || response.body().isEmpty()) {
+ throw new GLSPServerException("Could not execute CreateOperation on new Flow Edge");
+ }
+ });
+ }
+
+ protected abstract CompletableFuture> addFlow(WorkflowModelServerAccess modelAccess,
+ String sourceId, String targetId);
+}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/AbstractCreateNodeHandler.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/AbstractCreateNodeHandler.java
similarity index 52%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/AbstractCreateNodeHandler.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/AbstractCreateNodeHandler.java
index 302ac9f9..5038f2b8 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/AbstractCreateNodeHandler.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/AbstractCreateNodeHandler.java
@@ -8,39 +8,40 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.create;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
-import java.util.function.BiFunction;
+import java.util.function.Function;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelServerAccess;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelServerAccess;
import org.eclipse.emfcloud.modelserver.client.Response;
-import org.eclipse.emfcloud.modelserver.glsp.operations.handlers.EMSBasicCreateOperationHandler;
+import org.eclipse.emfcloud.modelserver.glsp.operations.handlers.AbstractEMSCreateNodeOperationHandler;
import org.eclipse.glsp.graph.GPoint;
import org.eclipse.glsp.server.operations.CreateNodeOperation;
import org.eclipse.glsp.server.types.GLSPServerException;
-public abstract class AbstractCreateNodeHandler
- extends EMSBasicCreateOperationHandler {
+import com.google.inject.Inject;
+
+public abstract class AbstractCreateNodeHandler extends AbstractEMSCreateNodeOperationHandler {
+
+ @Inject
+ protected WorkflowModelServerAccess modelAccess;
public AbstractCreateNodeHandler(final String type) {
super(type);
}
- protected WorkflowModelState getWorkflowModelState() { return (WorkflowModelState) getEMSModelState(); }
-
@Override
- public void executeOperation(final CreateNodeOperation operation, final WorkflowModelServerAccess modelAccess) {
- getNodeCreator(modelAccess).apply(getWorkflowModelState(), operation.getLocation()).thenAccept(response -> {
- if (!response.body()) {
- throw new GLSPServerException(
- String.format("Could not execute create operation for a new %s.", getLabel()));
- }
- });
+ public void executeOperation(final CreateNodeOperation operation) {
+ getNodeCreator().apply(operation.getLocation())
+ .thenAccept(response -> {
+ if (response.body() == null || response.body().isEmpty()) {
+ throw new GLSPServerException("Could not execute CreateOperation on new Task Node");
+ }
+ });
}
- protected abstract BiFunction, CompletableFuture>> getNodeCreator(
- WorkflowModelServerAccess modelAccess);
+ protected abstract Function, CompletableFuture>> getNodeCreator();
+
}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateAutomatedTaskHandler.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateAutomatedTaskHandler.java
similarity index 63%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateAutomatedTaskHandler.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateAutomatedTaskHandler.java
index ea83404b..a1b0025f 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateAutomatedTaskHandler.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateAutomatedTaskHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -8,30 +8,27 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.create;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
-import java.util.function.BiFunction;
+import java.util.function.Function;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelServerAccess;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes;
import org.eclipse.emfcloud.modelserver.client.Response;
import org.eclipse.glsp.graph.GPoint;
public class CreateAutomatedTaskHandler extends AbstractCreateNodeHandler {
public CreateAutomatedTaskHandler() {
- super(ModelTypes.AUTOMATED_TASK);
+ super(WorkflowModelTypes.AUTOMATED_TASK);
}
@Override
public String getLabel() { return "Automated Task"; }
@Override
- protected BiFunction, CompletableFuture>> getNodeCreator(
- final WorkflowModelServerAccess modelAccess) {
+ protected Function, CompletableFuture>> getNodeCreator() {
return modelAccess::addAutomatedTask;
}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateDecisionNodeHandler.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateDecisionNodeHandler.java
similarity index 63%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateDecisionNodeHandler.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateDecisionNodeHandler.java
index 16424e1c..1c5de2e6 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateDecisionNodeHandler.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateDecisionNodeHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -8,30 +8,27 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.create;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
-import java.util.function.BiFunction;
+import java.util.function.Function;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelServerAccess;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes;
import org.eclipse.emfcloud.modelserver.client.Response;
import org.eclipse.glsp.graph.GPoint;
public class CreateDecisionNodeHandler extends AbstractCreateNodeHandler {
public CreateDecisionNodeHandler() {
- super(ModelTypes.DECISION_NODE);
+ super(WorkflowModelTypes.DECISION_NODE);
}
@Override
public String getLabel() { return "Decision Node"; }
@Override
- protected BiFunction, CompletableFuture>> getNodeCreator(
- final WorkflowModelServerAccess modelAccess) {
+ protected Function, CompletableFuture>> getNodeCreator() {
return modelAccess::addDecisionNode;
}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateFlowHandler.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateFlowHandler.java
similarity index 63%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateFlowHandler.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateFlowHandler.java
index e8a0722f..25d1d1d1 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateFlowHandler.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateFlowHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -8,13 +8,11 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.create;
import java.util.concurrent.CompletableFuture;
-import org.eclipse.emfcloud.coffee.Node;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelServerAccess;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelServerAccess;
import org.eclipse.emfcloud.modelserver.client.Response;
import org.eclipse.glsp.graph.DefaultTypes;
@@ -28,9 +26,9 @@ public CreateFlowHandler() {
public String getLabel() { return "Flow"; }
@Override
- protected CompletableFuture> addFlow(final WorkflowModelServerAccess modelAccess,
- final WorkflowModelState modelState, final Node source, final Node target) {
- return modelAccess.addFlow(modelState, source, target);
+ protected CompletableFuture> addFlow(final WorkflowModelServerAccess modelAccess,
+ final String sourceId, final String targetId) {
+ return modelAccess.addFlow(sourceId, targetId);
}
}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateManualTaskHandler.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateManualTaskHandler.java
similarity index 63%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateManualTaskHandler.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateManualTaskHandler.java
index 25bd38f7..43431710 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateManualTaskHandler.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateManualTaskHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -8,30 +8,27 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.create;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
-import java.util.function.BiFunction;
+import java.util.function.Function;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelServerAccess;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes;
import org.eclipse.emfcloud.modelserver.client.Response;
import org.eclipse.glsp.graph.GPoint;
public class CreateManualTaskHandler extends AbstractCreateNodeHandler {
public CreateManualTaskHandler() {
- super(ModelTypes.MANUAL_TASK);
+ super(WorkflowModelTypes.MANUAL_TASK);
}
@Override
public String getLabel() { return "Manual Task"; }
@Override
- protected BiFunction, CompletableFuture>> getNodeCreator(
- final WorkflowModelServerAccess modelAccess) {
+ protected Function, CompletableFuture>> getNodeCreator() {
return modelAccess::addManualTask;
}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateMergeNodeHandler.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateMergeNodeHandler.java
similarity index 63%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateMergeNodeHandler.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateMergeNodeHandler.java
index 1ed2438a..80ea516d 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateMergeNodeHandler.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateMergeNodeHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -8,30 +8,27 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.create;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
-import java.util.function.BiFunction;
+import java.util.function.Function;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelServerAccess;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes;
import org.eclipse.emfcloud.modelserver.client.Response;
import org.eclipse.glsp.graph.GPoint;
public class CreateMergeNodeHandler extends AbstractCreateNodeHandler {
public CreateMergeNodeHandler() {
- super(ModelTypes.MERGE_NODE);
+ super(WorkflowModelTypes.MERGE_NODE);
}
@Override
public String getLabel() { return "Merge Node"; }
@Override
- protected BiFunction, CompletableFuture>> getNodeCreator(
- final WorkflowModelServerAccess modelAccess) {
+ protected Function, CompletableFuture>> getNodeCreator() {
return modelAccess::addMergeNode;
}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateWeightedFlowHandler.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateWeightedFlowHandler.java
similarity index 57%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateWeightedFlowHandler.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateWeightedFlowHandler.java
index a103384f..376e30b3 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/CreateWeightedFlowHandler.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/CreateWeightedFlowHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -8,29 +8,27 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.create;
import java.util.concurrent.CompletableFuture;
-import org.eclipse.emfcloud.coffee.Node;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelServerAccess;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelServerAccess;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes;
import org.eclipse.emfcloud.modelserver.client.Response;
public class CreateWeightedFlowHandler extends AbstractCreateEdgeHandler {
public CreateWeightedFlowHandler() {
- super(ModelTypes.WEIGHTED_EDGE);
+ super(WorkflowModelTypes.WEIGHTED_EDGE);
}
@Override
public String getLabel() { return "Weighted Edge"; }
@Override
- protected CompletableFuture> addFlow(final WorkflowModelServerAccess modelAccess,
- final WorkflowModelState modelState, final Node source, final Node target) {
- return modelAccess.addWeightedFlow(modelState, source, target);
+ protected CompletableFuture> addFlow(final WorkflowModelServerAccess modelAccess,
+ final String sourceId, final String targetId) {
+ return modelAccess.addWeightedFlow(sourceId, targetId);
}
}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/AbstractCreateEdgeHandler.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/AbstractCreateEdgeHandler.java
deleted file mode 100644
index fe5b4f4c..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/AbstractCreateEdgeHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation;
-
-import java.util.concurrent.CompletableFuture;
-
-import org.eclipse.emfcloud.coffee.Node;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelIndex;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelServerAccess;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.modelserver.client.Response;
-import org.eclipse.emfcloud.modelserver.glsp.operations.handlers.EMSBasicCreateOperationHandler;
-import org.eclipse.glsp.server.operations.CreateEdgeOperation;
-import org.eclipse.glsp.server.types.GLSPServerException;
-
-public abstract class AbstractCreateEdgeHandler
- extends EMSBasicCreateOperationHandler {
-
- public AbstractCreateEdgeHandler(final String type) {
- super(type);
- }
-
- protected WorkflowModelState getWorkflowModelState() { return (WorkflowModelState) getEMSModelState(); }
-
- @Override
- public void executeOperation(final CreateEdgeOperation operation, final WorkflowModelServerAccess modelAccess) {
- WorkflowModelIndex modelIndex = getWorkflowModelState().getIndex();
-
- Node source = modelIndex.getSemantic(operation.getSourceElementId(), Node.class).orElseThrow(
- () -> new GLSPServerException(String.format("No semantic Node found for source element with id %s.",
- operation.getSourceElementId())));
- Node target = modelIndex.getSemantic(operation.getTargetElementId(), Node.class).orElseThrow(
- () -> new GLSPServerException(String.format("No semantic Node found for target element with id %s.",
- operation.getTargetElementId())));
-
- addFlow(modelAccess, getWorkflowModelState(), source, target).thenAccept(response -> {
- if (!response.body()) {
- throw new GLSPServerException(
- String.format("Could not execute create operation for a new %s.", getLabel()));
- }
- });
- }
-
- protected abstract CompletableFuture> addFlow(WorkflowModelServerAccess modelAccess,
- WorkflowModelState modelState, Node source, Node target);
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowChangeRoutingPointsOperationHandler.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowChangeRoutingPointsOperationHandler.java
deleted file mode 100644
index 47c9715d..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowChangeRoutingPointsOperationHandler.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelServerAccess;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.modelserver.glsp.notation.Edge;
-import org.eclipse.emfcloud.modelserver.glsp.operations.handlers.EMSBasicOperationHandler;
-import org.eclipse.glsp.server.operations.ChangeRoutingPointsOperation;
-import org.eclipse.glsp.server.types.ElementAndRoutingPoints;
-
-public class WorkflowChangeRoutingPointsOperationHandler
- extends EMSBasicOperationHandler {
-
- protected WorkflowModelState getWorkflowModelState() { return (WorkflowModelState) getEMSModelState(); }
-
- @Override
- public void executeOperation(final ChangeRoutingPointsOperation operation,
- final WorkflowModelServerAccess modelServerAccess) {
-
- Map changeRoutingPointsMap = new HashMap<>();
- for (ElementAndRoutingPoints element : operation.getNewRoutingPoints()) {
- getWorkflowModelState().getIndex().getNotation(element.getElementId(), Edge.class)
- .ifPresent(notationElement -> {
- changeRoutingPointsMap.put(notationElement, element);
- });
- }
- modelServerAccess.changeRoutingPoints(changeRoutingPointsMap);
- }
-
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowCompoundOperationHandler.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowCompoundOperationHandler.java
deleted file mode 100644
index 2bb3f628..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowCompoundOperationHandler.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ********************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation;
-
-import java.util.Optional;
-
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelServerAccess;
-import org.eclipse.emfcloud.modelserver.glsp.operations.handlers.EMSBasicOperationHandler;
-import org.eclipse.emfcloud.modelserver.glsp.operations.handlers.EMSOperationHandler;
-import org.eclipse.glsp.server.operations.CompoundOperation;
-import org.eclipse.glsp.server.operations.Operation;
-import org.eclipse.glsp.server.operations.OperationActionHandler;
-import org.eclipse.glsp.server.operations.OperationHandler;
-import org.eclipse.glsp.server.operations.OperationHandlerRegistry;
-
-import com.google.inject.Inject;
-
-public class WorkflowCompoundOperationHandler
- extends EMSBasicOperationHandler {
- @Inject
- protected OperationHandlerRegistry operationHandlerRegistry;
-
- @Override
- public void executeOperation(final CompoundOperation operation, final WorkflowModelServerAccess modelServerAccess) {
- operation.getOperationList()
- .forEach(nestedOperation -> executeNestedOperation(nestedOperation, modelServerAccess));
- }
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- protected void executeNestedOperation(final Operation operation,
- final WorkflowModelServerAccess modelServerAccess) {
- Optional extends OperationHandler> operationHandler = OperationActionHandler.getOperationHandler(operation,
- operationHandlerRegistry);
- if (operationHandler.isPresent()) {
- if (operationHandler.get() instanceof EMSOperationHandler) {
- ((EMSOperationHandler) operationHandler.get()).executeOperation(operation, modelServerAccess);
- } else {
- operationHandler.get().execute(operation);
- }
- }
- }
-
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowApplyLabelEditOperationHandler.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operations/WorkflowApplyLabelEditOperationHandler.java
similarity index 55%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowApplyLabelEditOperationHandler.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operations/WorkflowApplyLabelEditOperationHandler.java
index b99089b1..ad734744 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowApplyLabelEditOperationHandler.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operations/WorkflowApplyLabelEditOperationHandler.java
@@ -8,43 +8,47 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operations;
import static org.eclipse.glsp.server.types.GLSPServerException.getOrThrow;
import org.eclipse.emfcloud.coffee.Task;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelServerAccess;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes;
-import org.eclipse.emfcloud.modelserver.glsp.operations.handlers.EMSBasicOperationHandler;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelServerAccess;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes;
+import org.eclipse.emfcloud.modelserver.glsp.notation.integration.EMSNotationModelState;
+import org.eclipse.emfcloud.modelserver.glsp.operations.handlers.AbstractEMSOperationHandler;
import org.eclipse.glsp.graph.GLabel;
import org.eclipse.glsp.server.features.directediting.ApplyLabelEditOperation;
import org.eclipse.glsp.server.types.GLSPServerException;
-public class WorkflowApplyLabelEditOperationHandler
- extends EMSBasicOperationHandler {
+import com.google.inject.Inject;
- protected WorkflowModelState getWorkflowModelState() { return (WorkflowModelState) getEMSModelState(); }
+public class WorkflowApplyLabelEditOperationHandler extends AbstractEMSOperationHandler {
+
+ @Inject
+ protected EMSNotationModelState modelState;
+ @Inject
+ protected WorkflowModelServerAccess modelServerAccess;
@Override
- public void executeOperation(final ApplyLabelEditOperation operation,
- final WorkflowModelServerAccess modelServerAccess) {
+ public void executeOperation(final ApplyLabelEditOperation operation) {
String inputText = operation.getText().trim();
String graphicalElementId = operation.getLabelId();
GLabel label = getOrThrow(
- getWorkflowModelState().getIndex().findElementByClass(graphicalElementId, GLabel.class), GLabel.class,
+ modelState.getIndex().findElementByClass(graphicalElementId, GLabel.class), GLabel.class,
"Element with provided ID cannot be found or is not a GLabel");
- if (label.getType() == ModelTypes.LABEL_HEADING) {
+ if (label.getType() == WorkflowModelTypes.LABEL_HEADING) {
String elementId = graphicalElementId.replace("_classname", "");
- Task semanticElement = getOrThrow(getWorkflowModelState().getIndex().getSemantic(elementId), Task.class,
+ Task semanticElement = getOrThrow(modelState.getIndex().getEObject(elementId), Task.class,
"Could not find Task for id '" + elementId + "', no delete operation executed.");
- modelServerAccess.setTaskName(getWorkflowModelState(), semanticElement, inputText).thenAccept(response -> {
- if (!response.body()) {
- throw new GLSPServerException("Could not rename Task to: " + inputText);
- }
- });
+ modelServerAccess.setTaskName(semanticElement, inputText)
+ .thenAccept(response -> {
+ if (response.body() == null || response.body().isEmpty()) {
+ throw new GLSPServerException("Could not rename Task to: " + inputText);
+ }
+ });
}
}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowDeleteOperationHandler.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operations/WorkflowDeleteOperationHandler.java
similarity index 50%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowDeleteOperationHandler.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operations/WorkflowDeleteOperationHandler.java
index 661b0519..60631bb1 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowDeleteOperationHandler.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operations/WorkflowDeleteOperationHandler.java
@@ -8,47 +8,51 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operations;
import static org.eclipse.glsp.server.types.GLSPServerException.getOrThrow;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emfcloud.coffee.Flow;
import org.eclipse.emfcloud.coffee.Node;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelServerAccess;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.modelserver.glsp.operations.handlers.EMSBasicOperationHandler;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelServerAccess;
+import org.eclipse.emfcloud.modelserver.glsp.notation.integration.EMSNotationModelState;
+import org.eclipse.emfcloud.modelserver.glsp.operations.handlers.AbstractEMSOperationHandler;
import org.eclipse.glsp.server.operations.DeleteOperation;
import org.eclipse.glsp.server.types.GLSPServerException;
-public class WorkflowDeleteOperationHandler
- extends EMSBasicOperationHandler {
+import com.google.inject.Inject;
- protected WorkflowModelState getWorkflowModelState() { return (WorkflowModelState) getEMSModelState(); }
+public class WorkflowDeleteOperationHandler extends AbstractEMSOperationHandler {
- @Override
- public void executeOperation(final DeleteOperation operation, final WorkflowModelServerAccess modelServerAccess) {
+ @Inject
+ protected EMSNotationModelState modelState;
+ @Inject
+ protected WorkflowModelServerAccess modelServerAccess;
- WorkflowModelState modelState = getWorkflowModelState();
+ @Override
+ public void executeOperation(final DeleteOperation operation) {
operation.getElementIds().forEach(elementId -> {
- EObject semanticElement = getOrThrow(modelState.getIndex().getSemantic(elementId), EObject.class,
+ EObject semanticElement = getOrThrow(modelState.getIndex().getEObject(elementId), EObject.class,
"Could not find element for id '" + elementId + "', no delete operation executed.");
if (semanticElement instanceof Node) {
- modelServerAccess.removeNode(modelState, (Node) semanticElement).thenAccept(response -> {
- if (!response.body()) {
- throw new GLSPServerException(
- "Could not execute delete operation on Node: " + semanticElement.toString());
- }
- });
+ modelServerAccess.removeNode((Node) semanticElement)
+ .thenAccept(response -> {
+ if (response.body() == null || response.body().isEmpty()) {
+ throw new GLSPServerException(
+ "Could not execute delete operation on Node: " + semanticElement.toString());
+ }
+ });
} else if (semanticElement instanceof Flow) {
- modelServerAccess.removeFlow(modelState, (Flow) semanticElement).thenAccept(response -> {
- if (!response.body()) {
- throw new GLSPServerException(
- "Could not execute delete operation on Flow: " + semanticElement.toString());
- }
- });
+ modelServerAccess.removeFlow((Flow) semanticElement)
+ .thenAccept(response -> {
+ if (response.body() == null || response.body().isEmpty()) {
+ throw new GLSPServerException(
+ "Could not execute delete operation on Flow: " + semanticElement.toString());
+ }
+ });
}
});
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowReconnectFlowHandler.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operations/WorkflowReconnectFlowHandler.java
similarity index 67%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowReconnectFlowHandler.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operations/WorkflowReconnectFlowHandler.java
index e7a70545..3e51d5a7 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowReconnectFlowHandler.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operations/WorkflowReconnectFlowHandler.java
@@ -8,54 +8,54 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operation;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.handler.operations;
import static org.eclipse.glsp.server.types.GLSPServerException.getOrThrow;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emfcloud.coffee.Flow;
import org.eclipse.emfcloud.coffee.Node;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelIndex;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelServerAccess;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.modelserver.glsp.operations.handlers.EMSBasicOperationHandler;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelServerAccess;
+import org.eclipse.emfcloud.modelserver.glsp.notation.integration.EMSNotationModelState;
+import org.eclipse.emfcloud.modelserver.glsp.operations.handlers.AbstractEMSOperationHandler;
import org.eclipse.glsp.server.operations.ReconnectEdgeOperation;
-public class WorkflowReconnectFlowHandler
- extends EMSBasicOperationHandler {
+import com.google.inject.Inject;
- private WorkflowModelIndex getWorkflowModelIndex() {
- return ((WorkflowModelState) super.getEMSModelState()).getIndex();
- }
+public class WorkflowReconnectFlowHandler extends AbstractEMSOperationHandler {
+
+ @Inject
+ protected EMSNotationModelState modelState;
+ @Inject
+ protected WorkflowModelServerAccess modelServerAccess;
@Override
@SuppressWarnings("checkstyle:CyclomaticComplexity")
- public void executeOperation(final ReconnectEdgeOperation operation,
- final WorkflowModelServerAccess modelServerAccess) {
+ public void executeOperation(final ReconnectEdgeOperation operation) {
if (operation.getEdgeElementId() == null || operation.getSourceElementId() == null
|| operation.getTargetElementId() == null) {
throw new IllegalArgumentException("Incomplete reconnect flow action");
}
- String modelId = EcoreUtil.getURI(getEMSModelState().getSemanticModel()).fragment();
+ String modelId = EcoreUtil.getURI(modelState.getSemanticModel()).fragment();
if (operation.getSourceElementId().equals(modelId) || operation.getTargetElementId().equals(modelId)) {
// client tool failure, do nothing
return;
}
- Flow flow = getOrThrow(getWorkflowModelIndex().getSemantic(operation.getEdgeElementId()), Flow.class,
+ Flow flow = getOrThrow(modelState.getIndex().getEObject(operation.getEdgeElementId()), Flow.class,
"Could not find Flow for id '" + operation.getEdgeElementId()
+ "', no reconnecting operation executed.");
if (!operation.getSourceElementId().equals(EcoreUtil.getURI(flow.getSource()).fragment())) {
- Node newSource = getOrThrow(getWorkflowModelIndex().getSemantic(operation.getSourceElementId()), Node.class,
+ Node newSource = getOrThrow(modelState.getIndex().getEObject(operation.getSourceElementId()), Node.class,
"Could not find Node for id '" + operation.getSourceElementId()
+ "', no reconnecting operation executed.");
modelServerAccess.reconnectFlowSource(flow, newSource);
} else if (!operation.getTargetElementId().equals(EcoreUtil.getURI(flow.getTarget()).fragment())) {
- Node newTarget = getOrThrow(getWorkflowModelIndex().getSemantic(operation.getTargetElementId()), Node.class,
+ Node newTarget = getOrThrow(modelState.getIndex().getEObject(operation.getTargetElementId()), Node.class,
"Could not find Node for id '" + operation.getTargetElementId()
+ "', no reconnecting operation executed.");
modelServerAccess.reconnectFlowTarget(flow, newTarget);
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/launch/WorkflowGLSPServerLauncher.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/launch/WorkflowGLSPServerLauncher.java
new file mode 100644
index 00000000..cf907337
--- /dev/null
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/launch/WorkflowGLSPServerLauncher.java
@@ -0,0 +1,49 @@
+/********************************************************************************
+ * Copyright (c) 2021-2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ ********************************************************************************/
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.launch;
+
+import java.io.IOException;
+
+import org.apache.commons.cli.ParseException;
+import org.eclipse.elk.alg.layered.options.LayeredMetaDataProvider;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowDiagramModule;
+import org.eclipse.emfcloud.modelserver.glsp.EMSGLSPServerModule;
+import org.eclipse.glsp.layout.ElkLayoutEngine;
+import org.eclipse.glsp.server.di.ServerModule;
+import org.eclipse.glsp.server.launch.DefaultCLIParser;
+import org.eclipse.glsp.server.launch.GLSPServerLauncher;
+import org.eclipse.glsp.server.launch.SocketGLSPServerLauncher;
+import org.eclipse.glsp.server.utils.LaunchUtil;
+
+@SuppressWarnings("UncommentedMain")
+public final class WorkflowGLSPServerLauncher {
+ private WorkflowGLSPServerLauncher() {}
+
+ public static void main(final String[] args) {
+ String processName = "WorkflowGLSPServer";
+ try {
+ ElkLayoutEngine.initialize(new LayeredMetaDataProvider());
+ DefaultCLIParser parser = new DefaultCLIParser(args, processName);
+ LaunchUtil.configure(parser);
+
+ int port = parser.parsePort();
+ ServerModule tasklistServerModule = new EMSGLSPServerModule()
+ .configureDiagramModule(new WorkflowDiagramModule());
+
+ GLSPServerLauncher launcher = new SocketGLSPServerLauncher(tasklistServerModule);
+ launcher.start("localhost", port);
+ } catch (ParseException | IOException ex) {
+ ex.printStackTrace();
+ LaunchUtil.printHelp(processName, DefaultCLIParser.getDefaultOptions());
+ }
+ }
+
+}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/layout/WorkflowLayoutEngine.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/layout/WorkflowLayoutEngine.java
new file mode 100644
index 00000000..1373c17d
--- /dev/null
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/layout/WorkflowLayoutEngine.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2019-2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ ******************************************************************************/
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.layout;
+
+import org.eclipse.elk.alg.layered.options.LayeredOptions;
+import org.eclipse.elk.core.options.Direction;
+import org.eclipse.elk.core.options.EdgeRouting;
+import org.eclipse.emfcloud.modelserver.glsp.layout.EMSLayoutEngine;
+import org.eclipse.glsp.graph.DefaultTypes;
+import org.eclipse.glsp.layout.GLSPLayoutConfigurator;
+
+public class WorkflowLayoutEngine extends EMSLayoutEngine {
+
+ @Override
+ protected void configureLayoutOptions(final GLSPLayoutConfigurator configurator) {
+ // ELK Layered Algorithm Reference:
+ // https://www.eclipse.org/elk/reference/algorithms/org-eclipse-elk-layered.html
+ configurator.configureByType(DefaultTypes.GRAPH)//
+ .setProperty(LayeredOptions.DIRECTION, Direction.DOWN)
+ .setProperty(LayeredOptions.SPACING_BASE_VALUE, 35d)
+ .setProperty(LayeredOptions.EDGE_ROUTING, EdgeRouting.UNDEFINED);
+ }
+
+}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/MappedGModelRoot.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/MappedGModelRoot.java
deleted file mode 100644
index f9552ce2..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/MappedGModelRoot.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019-2020 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.model;
-
-import java.util.Map;
-
-import org.eclipse.emfcloud.coffee.Node;
-import org.eclipse.glsp.graph.GModelRoot;
-import org.eclipse.glsp.graph.GNode;
-
-public class MappedGModelRoot {
-
- private final GModelRoot root;
- private final Map mapping;
-
- public MappedGModelRoot(final GModelRoot root, final Map mapping) {
- super();
- this.root = root;
- this.mapping = mapping;
- }
-
- public Map getMapping() { return mapping; }
-
- public GModelRoot getRoot() { return root; }
-
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelFactory.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelFactory.java
deleted file mode 100644
index 93a7520b..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelFactory.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emfcloud.coffee.Workflow;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.gmodel.DiagramModelFactory;
-import org.eclipse.emfcloud.modelserver.glsp.notation.Diagram;
-import org.eclipse.emfcloud.modelserver.glsp.notation.Edge;
-import org.eclipse.emfcloud.modelserver.glsp.notation.NotationElement;
-import org.eclipse.emfcloud.modelserver.glsp.notation.NotationFactory;
-import org.eclipse.emfcloud.modelserver.glsp.notation.SemanticProxy;
-import org.eclipse.emfcloud.modelserver.glsp.notation.Shape;
-import org.eclipse.glsp.graph.GEdge;
-import org.eclipse.glsp.graph.GModelElement;
-import org.eclipse.glsp.graph.GModelRoot;
-import org.eclipse.glsp.graph.GNode;
-import org.eclipse.glsp.graph.GPoint;
-import org.eclipse.glsp.graph.GShapeElement;
-import org.eclipse.glsp.graph.util.GraphUtil;
-import org.eclipse.glsp.server.features.core.model.GModelFactory;
-import org.eclipse.glsp.server.model.GModelState;
-
-import com.google.common.base.Preconditions;
-import com.google.inject.Inject;
-
-public class WorkflowModelFactory implements GModelFactory {
-
- @Inject
- protected GModelState gModelState;
-
- @Override
- public void createGModel() {
- WorkflowModelState modelState = WorkflowModelState.getModelState(gModelState);
- DiagramModelFactory gModelFactory = new DiagramModelFactory(modelState);
-
- GModelRoot gmodelRoot = gModelFactory.createRoot(modelState);
-
- WorkflowModelIndex modelIndex = modelState.getIndex();
- modelIndex.clear();
-
- Workflow semanticModel = modelState.getSemanticModel();
- EcoreUtil.resolveAll(semanticModel);
- Diagram diagram = modelState.getNotationModel();
- getOrCreateDiagram(diagram, semanticModel, modelIndex);
-
- gmodelRoot = gModelFactory.create();
- initialize(gmodelRoot, modelIndex, semanticModel, diagram);
-
- modelState.setRoot(gmodelRoot);
-
- }
-
- private Diagram getOrCreateDiagram(Diagram diagram, final Workflow workflow, final WorkflowModelIndex modelIndex) {
- if (diagram == null) {
- diagram = createDiagram(workflow);
- }
- findUnresolvedElements(diagram, workflow)
- .forEach(e -> e.setSemanticElement(resolved(e.getSemanticElement(), workflow)));
- modelIndex.indexNotation(diagram);
- return diagram;
- }
-
- private Diagram createDiagram(final Workflow workflow) {
- Diagram diagram = NotationFactory.eINSTANCE.createDiagram();
- diagram.setSemanticElement(createProxy(workflow));
- return diagram;
- }
-
- public Diagram initialize(final GModelRoot gRoot, final WorkflowModelIndex modelIndex, final Workflow workflowModel,
- final Diagram diagram) {
- Preconditions.checkArgument(diagram.getSemanticElement().getResolvedElement() == workflowModel);
- gRoot.getChildren().forEach(child -> {
- modelIndex.getNotation(child).ifPresentOrElse(n -> updateNotationElement(n, child),
- () -> initializeNotationElement(child, modelIndex).ifPresent(diagram.getElements()::add));
- });
- return diagram;
- }
-
- private Optional extends NotationElement> initializeNotationElement(final GModelElement gModelElement,
- final WorkflowModelIndex modelIndex) {
- Optional extends NotationElement> result = Optional.empty();
- if (gModelElement instanceof GNode) {
- result = initializeShape((GNode) gModelElement, modelIndex);
- } else if (gModelElement instanceof GEdge) {
- result = initializeEdge((GEdge) gModelElement, modelIndex);
- }
- return result;
- }
-
- private List findUnresolvedElements(final Diagram diagram, final Workflow workflowModel) {
- List unresolved = new ArrayList<>();
-
- if (diagram.getSemanticElement() == null
- || resolved(diagram.getSemanticElement(), workflowModel).getResolvedElement() == null) {
- unresolved.add(diagram);
- }
-
- unresolved.addAll(diagram.getElements().stream()
- .filter(element -> element.getSemanticElement() == null ? false
- : resolved(element.getSemanticElement(), workflowModel).getResolvedElement() == null)
- .collect(Collectors.toList()));
-
- return unresolved;
- }
-
- private Optional initializeShape(final GShapeElement shapeElement, final WorkflowModelIndex modelIndex) {
- return modelIndex.getSemantic(shapeElement)
- .map(semanticElement -> initializeShape(semanticElement, shapeElement, modelIndex));
- }
-
- private Shape initializeShape(final EObject semanticElement, final GShapeElement shapeElement,
- final WorkflowModelIndex modelIndex) {
- Shape shape = NotationFactory.eINSTANCE.createShape();
- shape.setSemanticElement(createProxy(semanticElement));
- if (shapeElement != null) {
- updateShape(shape, shapeElement);
- }
- modelIndex.indexNotation(shape);
- return shape;
- }
-
- private Optional initializeEdge(final GEdge gEdge, final WorkflowModelIndex modelIndex) {
- return modelIndex.getSemantic(gEdge).map(semanticElement -> initializeEdge(semanticElement, gEdge, modelIndex));
- }
-
- private Edge initializeEdge(final EObject semanticElement, final GEdge gEdge, final WorkflowModelIndex modelIndex) {
- Edge edge = NotationFactory.eINSTANCE.createEdge();
- edge.setSemanticElement(createProxy(semanticElement));
- if (gEdge != null) {
- updateEdge(edge, gEdge);
- }
- modelIndex.indexNotation(edge);
- return edge;
- }
-
- private SemanticProxy createProxy(final EObject eObject) {
- SemanticProxy proxy = NotationFactory.eINSTANCE.createSemanticProxy();
- proxy.setResolvedElement(eObject);
- proxy.setUri(EcoreUtil.getURI(eObject).fragment().toString());
- return proxy;
- }
-
- private SemanticProxy resolved(final SemanticProxy proxy, final Workflow workflow) {
- if (proxy.getResolvedElement() != null) {
- return proxy;
- }
- return reResolved(proxy, workflow);
- }
-
- private SemanticProxy reResolved(final SemanticProxy proxy, final Workflow workflow) {
- // The xmi:id is used as URI to identify elements, we use the underlying
- // resource to fetch elements by id
- Resource semanticResource = workflow.eResource();
- proxy.setResolvedElement(semanticResource.getEObject(proxy.getUri()));
- return proxy;
- }
-
- private void updateNotationElement(final NotationElement notation, final GModelElement modelElement) {
- if (notation instanceof Shape && modelElement instanceof GShapeElement) {
- updateShape((Shape) notation, (GShapeElement) modelElement);
- } else if (notation instanceof Edge && modelElement instanceof GEdge) {
- updateEdge((Edge) notation, (GEdge) modelElement);
- }
- }
-
- private void updateShape(final Shape shape, final GShapeElement shapeElement) {
- if (shapeElement.getSize() != null) {
- shape.setSize(GraphUtil.copy(shapeElement.getSize()));
- }
- if (shapeElement.getPosition() != null) {
- shape.setPosition(GraphUtil.copy(shapeElement.getPosition()));
- } else if (shape.getPosition() != null) {
- shapeElement.setPosition(GraphUtil.copy(shape.getPosition()));
- }
- }
-
- private void updateEdge(final Edge edge, final GEdge gEdge) {
- edge.getBendPoints().clear();
- if (gEdge.getRoutingPoints() != null) {
- ArrayList gPoints = new ArrayList<>();
- gEdge.getRoutingPoints().forEach(p -> gPoints.add(GraphUtil.copy(p)));
- edge.getBendPoints().addAll(gPoints);
- }
- }
-
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelIndex.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelIndex.java
deleted file mode 100644
index d9a6fd60..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelIndex.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.model;
-
-import java.util.Optional;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emfcloud.modelserver.glsp.notation.Diagram;
-import org.eclipse.emfcloud.modelserver.glsp.notation.NotationElement;
-import org.eclipse.emfcloud.modelserver.glsp.notation.integration.EMSNotationModelIndex;
-import org.eclipse.glsp.graph.GModelElement;
-import org.eclipse.glsp.graph.impl.GModelIndexImpl;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
-public class WorkflowModelIndex extends EMSNotationModelIndex {
- private final BiMap semanticIndex;
- private final BiMap notationIndex;
-
- protected WorkflowModelIndex(final EObject target) {
- super(target);
- semanticIndex = HashBiMap.create();
- notationIndex = HashBiMap.create();
- }
-
- public static WorkflowModelIndex get(final GModelElement element) {
- EObject root = EcoreUtil.getRootContainer(element);
- WorkflowModelIndex existingIndex = (WorkflowModelIndex) EcoreUtil.getExistingAdapter(root,
- WorkflowModelIndex.class);
- return Optional.ofNullable(existingIndex).orElseGet(() -> (create(element)));
- }
-
- public static WorkflowModelIndex create(final GModelElement element) {
- return new WorkflowModelIndex(EcoreUtil.getRootContainer(element));
- }
-
- @Override
- public boolean isAdapterForType(final Object type) {
- return WorkflowModelIndex.class.equals(type) || GModelIndexImpl.class.equals(type);
- }
-
- @Override
- public void clear() {
- this.semanticIndex.clear();
- this.notationIndex.clear();
- }
-
- @Override
- public void indexSemantic(final String id, final EObject semanticElement) {
- semanticIndex.putIfAbsent(id, semanticElement);
- }
-
- @Override
- public void indexNotation(final NotationElement notationElement) {
- if (notationElement.getSemanticElement() != null) {
- EObject semanticElement = notationElement.getSemanticElement().getResolvedElement();
- notationIndex.put(semanticElement, notationElement);
- semanticIndex.inverse().putIfAbsent(semanticElement, EcoreUtil.getURI(semanticElement).fragment());
- }
-
- if (notationElement instanceof Diagram) {
- ((Diagram) notationElement).getElements().forEach(this::indexNotation);
- }
- }
-
- public Optional getSemantic(final String id) {
- return Optional.ofNullable(semanticIndex.get(id));
- }
-
- public Optional getSemanticId(final EObject semanticElement) {
- return Optional.ofNullable(semanticIndex.inverse().get(semanticElement));
- }
-
- @Override
- public Optional getSemantic(final String id, final Class clazz) {
- return safeCast(Optional.ofNullable(semanticIndex.get(id)), clazz);
- }
-
- public Optional getSemantic(final GModelElement gModelElement) {
- return getSemantic(gModelElement.getId());
- }
-
- public Optional getSemantic(final GModelElement gModelElement, final Class clazz) {
- return getSemantic(gModelElement.getId(), clazz);
- }
-
- public Optional getNotation(final EObject semanticElement) {
- return Optional.ofNullable(notationIndex.get(semanticElement));
- }
-
- public Optional getNotation(final EObject semanticElement, final Class clazz) {
- return safeCast(getNotation(semanticElement), clazz);
- }
-
- public Optional getNotation(final String id) {
- return getSemantic(id).flatMap(this::getNotation);
- }
-
- @Override
- public Optional getNotation(final String id, final Class clazz) {
- return safeCast(getNotation(id), clazz);
- }
-
- public Optional getNotation(final GModelElement gModelElement) {
- return getNotation(gModelElement.getId());
- }
-
- public Optional getNotation(final GModelElement element, final Class clazz) {
- return safeCast(getNotation(element), clazz);
- }
-
- private Optional safeCast(final Optional> toCast, final Class clazz) {
- return toCast.filter(clazz::isInstance).map(clazz::cast);
- }
-
- public String add(final EObject eObject) {
- if (eObject instanceof GModelElement) {
- return ((GModelElement) eObject).getId();
- }
- String id = null;
- if (eObject instanceof NotationElement) {
- EObject semanticElement = ((NotationElement) eObject).getSemanticElement().getResolvedElement();
- id = add(semanticElement);
- notationIndex.putIfAbsent(semanticElement, (NotationElement) eObject);
- } else {
- id = getSemanticId(eObject).orElse(null);
- if (id == null) {
- id = EcoreUtil.getURI(eObject).fragment();
- indexSemantic(id, eObject);
- }
- }
- return id;
-
- }
-
- public void remove(final EObject eObject) {
- if (eObject instanceof NotationElement) {
- EObject semanticElement = ((NotationElement) eObject).getSemanticElement().getResolvedElement();
- notationIndex.remove(semanticElement);
- remove(semanticElement);
- return;
- } else if (eObject instanceof GModelElement) {
- // do nothing;
- return;
- }
- semanticIndex.inverse().remove(eObject);
- }
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelSourceLoader.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelSourceLoader.java
deleted file mode 100644
index 900214d7..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelSourceLoader.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.model;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-
-import org.apache.log4j.Logger;
-import org.eclipse.emfcloud.modelserver.client.v1.ModelServerClientV1;
-import org.eclipse.emfcloud.modelserver.glsp.model.EMSModelSourceLoader;
-import org.eclipse.glsp.server.features.core.model.RequestModelAction;
-import org.eclipse.glsp.server.model.GModelState;
-import org.eclipse.glsp.server.types.GLSPServerException;
-import org.eclipse.glsp.server.utils.ClientOptionsUtil;
-
-import com.google.gson.Gson;
-
-public class WorkflowModelSourceLoader extends EMSModelSourceLoader {
-
- private static Logger LOGGER = Logger.getLogger(EMSModelSourceLoader.class.getSimpleName());
-
- @Override
- public void loadSourceModel(final RequestModelAction action) {
- String sourceURI = getSourceURI(action.getOptions());
- if (sourceURI.isEmpty()) {
- LOGGER.error("No source URI given to load source models");
- return;
- }
- Optional modelServerClient = modelServerClientProvider.get();
- if (modelServerClient.isEmpty()) {
- LOGGER.error("Connection to modelserver could not be initialized");
- return;
- }
-
- WorkflowModelServerAccess modelServerAccess = createModelServerAccess(sourceURI, modelServerClient.get());
-
- WorkflowModelState modelState = createModelState(gModelState);
- modelState.initialize(action.getOptions(), modelServerAccess);
-
- try {
- modelState.loadSourceModels();
- } catch (GLSPServerException e) {
- LOGGER.error("Error during source model loading");
- e.printStackTrace();
- return;
- }
-
- if (action.getOptions().get("highlights") != null) {
- HashMap map = new Gson().fromJson(action.getOptions().get("highlights"), HashMap.class);
- for (Entry entry : map.entrySet()) {
- modelState.addHighlight(entry);
- }
- } else {
- modelServerAccess.subscribe(createSubscriptionListener(modelState, actionDispatcher, submissionHandler));
- modelServerAccess.createValidationFramework(modelState);
- modelServerAccess.subscribeToValidation();
- modelServerAccess.initConstraintList();
- }
- }
-
- @Override
- public WorkflowModelServerAccess createModelServerAccess(final String sourceURI,
- final ModelServerClientV1 modelServerClient) {
- return new WorkflowModelServerAccess(sourceURI, modelServerClient, actionDispatcher);
- }
-
- @Override
- public WorkflowModelState createModelState(final GModelState modelState) {
- return WorkflowModelState.getModelState(modelState);
- }
-
- @Override
- protected String getSourceURI(final Map clientOptions) {
- // We want to use the absolute sourceUri instead of the relative one from the
- // super class
- String sourceURI = ClientOptionsUtil.getSourceUri(clientOptions)
- .orElseThrow(() -> new GLSPServerException("No source URI given to load model!"));
- return sourceURI;
- }
-
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelState.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelState.java
deleted file mode 100644
index 1517e100..00000000
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelState.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- ******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.model;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.apache.log4j.Logger;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emfcloud.coffee.Machine;
-import org.eclipse.emfcloud.coffee.Workflow;
-import org.eclipse.emfcloud.modelserver.glsp.EMSModelServerAccess;
-import org.eclipse.emfcloud.modelserver.glsp.notation.Diagram;
-import org.eclipse.emfcloud.modelserver.glsp.notation.integration.EMSNotationModelState;
-import org.eclipse.glsp.server.model.GModelState;
-import org.eclipse.glsp.server.types.GLSPServerException;
-
-public class WorkflowModelState extends EMSNotationModelState {
- public static final String OPTION_WORKFLOW_INDEX = "workflowIndex";
- public static final int WORKFLOW_INDEX_DEFAULT = 0;
- private static Logger LOGGER = Logger.getLogger(WorkflowModelState.class);
-
- protected WorkflowModelServerAccess modelAccess;
-
- private final Map highlights = new HashMap<>();
-
- // Our semantic model is not the whole machine but only the selected workflow
- protected Workflow semanticModel;
- protected Diagram notationModel;
-
- private int workflowIndex;
-
- public static WorkflowModelServerAccess getModelAccess(final GModelState state) {
- return getModelState(state).getModelServerAccess();
- }
-
- public static WorkflowModelState getModelState(final GModelState state) {
- if (!(state instanceof WorkflowModelState)) {
- throw new IllegalArgumentException("Argument must be a WorkflowModelState");
- }
- return ((WorkflowModelState) state);
- }
-
- @Override
- public WorkflowModelServerAccess getModelServerAccess() { return modelAccess; }
-
- @Override
- protected void setModelServerAccess(final EMSModelServerAccess modelServerAccess) {
- this.modelAccess = (WorkflowModelServerAccess) modelServerAccess;
- }
-
- @Override
- public Diagram getNotationModel() { return notationModel; }
-
- @Override
- public Workflow getSemanticModel() { return semanticModel; }
-
- @Override
- public WorkflowModelIndex getIndex() { return WorkflowModelIndex.get(getRoot()); }
-
- @Override
- public void loadSourceModels() throws GLSPServerException {
- EObject semanticRoot = modelAccess.getSemanticModel();
- if (!(semanticRoot instanceof Machine)) {
- throw new GLSPServerException("Error during semantic model loading");
- }
- Machine machine = (Machine) semanticRoot;
- if (workflowIndex < 0 || workflowIndex >= machine.getWorkflows().size()) {
- LOGGER.error("No workflow with index " + workflowIndex + " in " + machine + ".");
- throw new GLSPServerException("Error during semantic model loading");
- }
- this.semanticModel = machine.getWorkflows().get(workflowIndex);
-
- // initialize semantic model
- EcoreUtil.resolveAll(semanticModel);
-
- EObject notationRoot = modelAccess.getNotationModel();
- if (notationRoot != null && !(notationRoot instanceof Diagram)) {
- throw new GLSPServerException("Error during notation diagram loading");
- }
- this.notationModel = (Diagram) notationRoot;
- }
-
- public Map getHighlights() { return highlights; }
-
- public void addHighlight(final Entry entry) {
- String current = this.highlights.get(entry.getKey());
- if (current == null || isHigher(entry.getKey(), current)) {
- this.highlights.put(entry.getKey(), entry.getValue());
- }
- }
-
- private boolean isHigher(final String key, final String current) {
- if (current == "deleted") {
- return false;
- }
- if (current == "changed") {
- if (key == "deleted") {
- return true;
- }
- }
- if (current == "added") {
- if (key == "deleted" || key == "changed") {
- return true;
- }
- }
- return false;
- }
-}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowCommandPaletteActionProvider.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/provider/WorkflowCommandPaletteActionProvider.java
similarity index 88%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowCommandPaletteActionProvider.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/provider/WorkflowCommandPaletteActionProvider.java
index feeef73d..4be5e10f 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowCommandPaletteActionProvider.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/provider/WorkflowCommandPaletteActionProvider.java
@@ -8,7 +8,7 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.provider;
import static org.eclipse.glsp.graph.DefaultTypes.EDGE;
import static org.eclipse.glsp.graph.util.GraphUtil.point;
@@ -17,7 +17,7 @@
import java.util.List;
import java.util.Set;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes;
import org.eclipse.emfcloud.coffee.workflow.glsp.server.wfgraph.TaskNode;
import org.eclipse.glsp.graph.GModelElement;
import org.eclipse.glsp.graph.GModelIndex;
@@ -53,17 +53,17 @@ public List extends LabeledAction> getActions(final EditorContext editorContex
Sets.newHashSet(
new LabeledAction("Create Automated Task",
Lists.newArrayList(
- new CreateNodeOperation(ModelTypes.AUTOMATED_TASK, lastMousePosition)),
+ new CreateNodeOperation(WorkflowModelTypes.AUTOMATED_TASK, lastMousePosition)),
"diff-added"),
new LabeledAction("Create Manual Task",
- Lists.newArrayList(new CreateNodeOperation(ModelTypes.MANUAL_TASK, lastMousePosition)),
+ Lists.newArrayList(new CreateNodeOperation(WorkflowModelTypes.MANUAL_TASK, lastMousePosition)),
"diff-added"),
new LabeledAction("Create Merge Node",
- Lists.newArrayList(new CreateNodeOperation(ModelTypes.MERGE_NODE, lastMousePosition)),
+ Lists.newArrayList(new CreateNodeOperation(WorkflowModelTypes.MERGE_NODE, lastMousePosition)),
"diff-added"),
new LabeledAction("Create Decision Node",
Lists.newArrayList(
- new CreateNodeOperation(ModelTypes.DECISION_NODE, lastMousePosition)),
+ new CreateNodeOperation(WorkflowModelTypes.DECISION_NODE, lastMousePosition)),
"diff-added")));
// Create edge actions between two nodes
@@ -107,7 +107,7 @@ private Set createEdgeActions(final GNode source, final Set ext
private LabeledAction createWeightedEdgeAction(final String label, final GNode source, final GNode node) {
return new LabeledAction(label,
- Lists.newArrayList(new CreateEdgeOperation(ModelTypes.WEIGHTED_EDGE, source.getId(), node.getId())),
+ Lists.newArrayList(new CreateEdgeOperation(WorkflowModelTypes.WEIGHTED_EDGE, source.getId(), node.getId())),
"diff-added");
}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowContextMenuItemProvider.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/provider/WorkflowContextMenuItemProvider.java
similarity index 86%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowContextMenuItemProvider.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/provider/WorkflowContextMenuItemProvider.java
index 66a0d1fb..1a5b075b 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowContextMenuItemProvider.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/provider/WorkflowContextMenuItemProvider.java
@@ -8,10 +8,10 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.provider;
-import static org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes.AUTOMATED_TASK;
-import static org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes.MANUAL_TASK;
+import static org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes.AUTOMATED_TASK;
+import static org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes.MANUAL_TASK;
import java.util.Arrays;
import java.util.List;
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/CoffeeTypeUtil.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/util/CoffeeTypeUtil.java
similarity index 83%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/CoffeeTypeUtil.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/util/CoffeeTypeUtil.java
index 9d953755..ea9645e4 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/CoffeeTypeUtil.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/util/CoffeeTypeUtil.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019-2020 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -8,7 +8,7 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.model;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.util;
import org.eclipse.emfcloud.coffee.AutomaticTask;
import org.eclipse.emfcloud.coffee.Decision;
@@ -17,7 +17,7 @@
import org.eclipse.emfcloud.coffee.ManualTask;
import org.eclipse.emfcloud.coffee.Merge;
import org.eclipse.emfcloud.coffee.Node;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes;
public final class CoffeeTypeUtil {
public static final String FORK_NODE = "activityNode:fork";
@@ -25,16 +25,16 @@ public final class CoffeeTypeUtil {
public static String toType(final Node node) {
if (node instanceof AutomaticTask) {
- return ModelTypes.AUTOMATED_TASK;
+ return WorkflowModelTypes.AUTOMATED_TASK;
}
if (node instanceof ManualTask) {
- return ModelTypes.MANUAL_TASK;
+ return WorkflowModelTypes.MANUAL_TASK;
}
if (node instanceof Decision) {
- return ModelTypes.DECISION_NODE;
+ return WorkflowModelTypes.DECISION_NODE;
}
if (node instanceof Merge) {
- return ModelTypes.MERGE_NODE;
+ return WorkflowModelTypes.MERGE_NODE;
}
if (node instanceof Fork) {
return FORK_NODE;
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/util/WorkflowBuilder.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/util/WorkflowBuilder.java
index 3f37fd74..c3e19081 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/util/WorkflowBuilder.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/util/WorkflowBuilder.java
@@ -10,9 +10,7 @@
******************************************************************************/
package org.eclipse.emfcloud.coffee.workflow.glsp.server.util;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes;
import org.eclipse.emfcloud.coffee.workflow.glsp.server.wfgraph.ActivityNode;
import org.eclipse.emfcloud.coffee.workflow.glsp.server.wfgraph.Icon;
import org.eclipse.emfcloud.coffee.workflow.glsp.server.wfgraph.TaskNode;
@@ -32,7 +30,7 @@ public static class WeightedEdgeBuilder extends AbstractGEdgeBuilder {
public IconBuilder() {
- super(ModelTypes.ICON);
+ super(WorkflowModelTypes.ICON);
}
@Override
@@ -152,10 +150,10 @@ protected IconBuilder self() {
}
}
-
- public static String getChangeCssClass(WorkflowModelState modelState, EObject object) {
- return modelState.getHighlights().get(EcoreUtil.getURI(object).toString().split("#_")[1]);
- }
+
+ // public static String getChangeCssClass(WorkflowModelState modelState, EObject object) {
+ // return modelState.getHighlights().get(EcoreUtil.getURI(object).toString().split("#_")[1]);
+ // }
private WorkflowBuilder() {}
}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowLabelEditValidator.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/validation/WorkflowLabelEditValidator.java
similarity index 87%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowLabelEditValidator.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/validation/WorkflowLabelEditValidator.java
index e1d01c11..47ff3757 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowLabelEditValidator.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/validation/WorkflowLabelEditValidator.java
@@ -8,16 +8,15 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
********************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.validation;
import java.util.List;
import java.util.regex.Pattern;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emfcloud.coffee.CoffeePackage;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelServerAccess;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.model.WorkflowModelState;
-import org.eclipse.emfcloud.coffee.workflow.glsp.server.util.ModelTypes;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelTypes;
+import org.eclipse.emfcloud.coffee.workflow.glsp.server.WorkflowModelServerAccess;
import org.eclipse.emfcloud.coffee.workflow.glsp.server.wfgraph.impl.TaskNodeImpl;
import org.eclipse.emfcloud.modelserver.emf.common.EMFFacetConstraints;
import org.eclipse.glsp.graph.GCompartment;
@@ -33,10 +32,11 @@ public class WorkflowLabelEditValidator implements LabelEditValidator {
@Inject
protected GModelState modelState;
+ @Inject
+ protected WorkflowModelServerAccess modelAccess;
@Override
public ValidationStatus validate(final String label, final GModelElement element) {
- WorkflowModelServerAccess modelAccess = WorkflowModelState.getModelAccess(modelState);
GModelElement parent = getRoot(element);
String featureId = getFeatureId(element.getType());
@@ -51,17 +51,17 @@ public ValidationStatus validate(final String label, final GModelElement element
}
private String getElementId(final String type) {
- if (type.equals(ModelTypes.AUTOMATED_TASK)) {
+ if (type.equals(WorkflowModelTypes.AUTOMATED_TASK)) {
return EcoreUtil.getURI(CoffeePackage.Literals.AUTOMATIC_TASK).toString();
}
- if (type.equals(ModelTypes.MANUAL_TASK)) {
+ if (type.equals(WorkflowModelTypes.MANUAL_TASK)) {
return EcoreUtil.getURI(CoffeePackage.Literals.MANUAL_TASK).toString();
}
return null;
}
private String getFeatureId(final String type) {
- if (type.equals(ModelTypes.LABEL_HEADING)) {
+ if (type.equals(WorkflowModelTypes.LABEL_HEADING)) {
return CoffeePackage.Literals.TASK__NAME.getName();
}
return null;
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowValidationResultChangeListener.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/validation/WorkflowValidationResultChangeListener.java
similarity index 97%
rename from backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowValidationResultChangeListener.java
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/validation/WorkflowValidationResultChangeListener.java
index 94ede101..cf7ddb1a 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowValidationResultChangeListener.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/validation/WorkflowValidationResultChangeListener.java
@@ -8,7 +8,7 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
******************************************************************************/
-package org.eclipse.emfcloud.coffee.workflow.glsp.server.model;
+package org.eclipse.emfcloud.coffee.workflow.glsp.server.validation;
import java.util.ArrayList;
import java.util.List;
diff --git a/backend/releng/org.eclipse.emfcloud.coffee.parent/pom.xml b/backend/releng/org.eclipse.emfcloud.coffee.parent/pom.xml
index b5763e08..0a8c6ffe 100644
--- a/backend/releng/org.eclipse.emfcloud.coffee.parent/pom.xml
+++ b/backend/releng/org.eclipse.emfcloud.coffee.parent/pom.xml
@@ -318,8 +318,6 @@
../../plugins/org.eclipse.emfcloud.coffee.workflow.dsl.ide
../../plugins/org.eclipse.emfcloud.coffee.modelserver
../../plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server
- ../../plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app
- ../../plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature
../../plugins/org.eclipse.emfcloud.coffee.model
diff --git a/backend/releng/org.eclipse.emfcloud.coffee.product/launch/WorkflowGLSPServer.launch b/backend/releng/org.eclipse.emfcloud.coffee.product/launch/WorkflowGLSPServer.launch
index 106c1a6d..99851f29 100644
--- a/backend/releng/org.eclipse.emfcloud.coffee.product/launch/WorkflowGLSPServer.launch
+++ b/backend/releng/org.eclipse.emfcloud.coffee.product/launch/WorkflowGLSPServer.launch
@@ -1,195 +1,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/backend/releng/org.eclipse.emfcloud.coffee.product/workflowserver.product b/backend/releng/org.eclipse.emfcloud.coffee.product/workflowserver.product
deleted file mode 100644
index 10622242..00000000
--- a/backend/releng/org.eclipse.emfcloud.coffee.product/workflowserver.product
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
- -consoleLog
-
- -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-
-
-
-
- org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
From 67e64061dbbcc2571eb06429ccc003929de6afd0 Mon Sep 17 00:00:00 2001
From: Nina Doschek
Date: Wed, 31 Aug 2022 22:03:32 +0200
Subject: [PATCH 03/34] #455 #456 Update to latest versions and run servers as
JAR products
#456 Consider running backend services as JAR products
- Run Model Server product as Java application instead of Eclipse product
- Package as standalone JAR
- Run GLSP Server product as Java application instead of Eclipse product
- Package as standalone JAR
---
.../CoffeeModelServer.launch | 1 +
.../log4j2-embedded.xml | 31 +++
.../log4j2.xml | 35 ++++
.../pom.xml | 188 +++++++++++++++++-
.../pom.xml | 4 +-
.../pom.xml | 8 +-
.../META-INF/MANIFEST.MF | 23 +--
.../WorkflowGLSPServer.launch | 0
.../pom.xml | 128 ++++++++++--
.../launch/WorkflowGLSPServerLauncher.java | 10 +-
.../pom.xml | 20 +-
.../pom.xml | 4 -
.../org.eclipse.emfcloud.coffee.target.tpd | 2 +-
13 files changed, 394 insertions(+), 60 deletions(-)
rename backend/{releng/org.eclipse.emfcloud.coffee.product/launch => plugins/org.eclipse.emfcloud.coffee.modelserver}/CoffeeModelServer.launch (93%)
create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver/log4j2-embedded.xml
create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver/log4j2.xml
rename backend/{releng/org.eclipse.emfcloud.coffee.product/launch => plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server}/WorkflowGLSPServer.launch (100%)
diff --git a/backend/releng/org.eclipse.emfcloud.coffee.product/launch/CoffeeModelServer.launch b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/CoffeeModelServer.launch
similarity index 93%
rename from backend/releng/org.eclipse.emfcloud.coffee.product/launch/CoffeeModelServer.launch
rename to backend/plugins/org.eclipse.emfcloud.coffee.modelserver/CoffeeModelServer.launch
index 2c8457be..20fbe7f3 100644
--- a/backend/releng/org.eclipse.emfcloud.coffee.product/launch/CoffeeModelServer.launch
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/CoffeeModelServer.launch
@@ -12,6 +12,7 @@
+
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/log4j2-embedded.xml b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/log4j2-embedded.xml
new file mode 100644
index 00000000..f9ac2997
--- /dev/null
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/log4j2-embedded.xml
@@ -0,0 +1,31 @@
+
+
+
+ %d{DEFAULT_NANOS} [%t] %-5level %logger{1} - %msg%n
+ logs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/log4j2.xml b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/log4j2.xml
new file mode 100644
index 00000000..7f7b92f2
--- /dev/null
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/log4j2.xml
@@ -0,0 +1,35 @@
+
+
+
+ %d{DEFAULT_NANOS} [%t] %-5level %logger{1} - %msg%n
+ logs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/pom.xml b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/pom.xml
index 813ee676..465b0ae9 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/pom.xml
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver/pom.xml
@@ -1,5 +1,5 @@
- 4.0.0
- org.eclipse.emfcloud.coffee.modelserver
- eclipse-plugin
+ 4.0.0
+ org.eclipse.emfcloud.coffee.modelserver
+ eclipse-plugin
+
+
+ org.eclipse.emfcloud.coffee
+ org.eclipse.emfcloud.coffee.parent
+ 0.1.0-SNAPSHOT
+ ../../releng/org.eclipse.emfcloud.coffee.parent/
+
+
+
+
+
+ maven-compiler-plugin
+ ${maven.compiler.plugin.version}
+
+ ${maven.compiler.source}
+ ${maven.compiler.target}
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ ${maven.surefire.plugin.version}
+
+
+ org.codehaus.mojo
+ versions-maven-plugin
+ ${versions.maven.plugin.version}
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ ${checkstyle.plugin.version}
+
+ emfcloud-checkstyle-8.44.xml
+ true
+
+
+
+
+ validate
+
+ check
+
+
+
+
+
+ org.eclipse.emfcloud
+ org.eclipse.emfcloud.checkstyle
+ ${emfcloud.checkstyle.version}
+
+
+ com.puppycrawl.tools
+ checkstyle
+ ${puppycrawl.checkstyle.version}
+
+
+
+
+
+
+
+
+
+ fatjar
+
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+ copy-dependencies
+ package
+
+ copy-dependencies
+
+
+ ${project.build.directory}/libs
+ false
+ false
+ true
+ false
+
+
+
+
+
+ com.googlecode.addjars-maven-plugin
+ addjars-maven-plugin
+ ${googlecode.addjars.version}
+
+
+ package
+
+ add-jars
+
+
+
+
+ ${project.build.directory}/libs
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ ${maven.shade.version}
+
+
+
+ org.eclipse.emfcloud.coffee.modelserver.launch.CoffeeModelServerLauncher
+
+
+ true
+
+
+
+ plugin.properties
+
+
+
+
+ *:*
+
+ META-INF/INDEX.LIST
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+ .options
+ .api_description
+ *.profile
+ *.html
+ about.*
+ about_files/*
+ plugin.xml
+ modeling32.png
+ systembundle.properties
+ profile.list
+ **/*._trace
+ **/*.g
+ **/*.tokens
+ **/*.mwe2
+ **/*.xtext
+ **/*.xtextbin
+
+
+
+ true
+ standalone
+ false
+
+
+
+ package
+
+ shade
+
+
+
+
+
+
+
+
-
- org.eclipse.emfcloud.coffee
- org.eclipse.emfcloud.coffee.parent
- 0.1.0-SNAPSHOT
- ../../releng/org.eclipse.emfcloud.coffee.parent/
-
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.dsl.ide/pom.xml b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.dsl.ide/pom.xml
index 4c3a0239..42163cc9 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.dsl.ide/pom.xml
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.dsl.ide/pom.xml
@@ -81,7 +81,7 @@
com.googlecode.addjars-maven-plugin
addjars-maven-plugin
- 1.0.5
+ ${googlecode.addjars.version}
package
@@ -101,7 +101,7 @@
org.apache.maven.plugins
maven-shade-plugin
- 3.0.0
+ ${maven.shade.version}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.dsl/pom.xml b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.dsl/pom.xml
index f8b650c2..a7bb4a16 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.dsl/pom.xml
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.dsl/pom.xml
@@ -42,7 +42,7 @@
org.codehaus.mojo
exec-maven-plugin
- 1.4.0
+ ${codehaus.mojo.exec.version}
mwe2Launcher
@@ -67,7 +67,7 @@
org.eclipse.emf
org.eclipse.emf.mwe2.launch
- 2.11.3
+ ${emf.mwe2.version}
org.eclipse.xtext
@@ -87,7 +87,7 @@
org.eclipse.xtext
xtext-antlr-generator
- [2.1.1, 3)
+ ${xtext.antlr.version}
@@ -131,7 +131,7 @@
org.eclipse.m2e
lifecycle-mapping
- 1.0.0
+ ${eclipse.m2e.lifecycle.version}
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/META-INF/MANIFEST.MF b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/META-INF/MANIFEST.MF
index a3dcfb86..2478c88d 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/META-INF/MANIFEST.MF
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.24.100,4.0.0)",
- org.apache.logging.log4j;bundle-version="[2.17.1,3.0.0)",
+Require-Bundle: org.apache.logging.log4j;bundle-version="[2.17.1,3.0.0)",
org.eclipse.emf.edit;bundle-version="[2.17.0,3.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)",
org.eclipse.glsp.layout;bundle-version="[1.1.0,2.0.0)",
@@ -17,25 +16,19 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.24.100,4.0.0)",
org.eclipse.elk.alg.layered;bundle-version="[0.8.1,1.0.0)",
org.eclipse.elk.core;bundle-version="[0.8.1,1.0.0)",
org.eclipse.elk.graph;bundle-version="[0.8.1,1.0.0)",
- org.eclipse.emfcloud.modelserver.edit;bundle-version="[0.7.0,1.0.0)",
org.eclipse.emfcloud.modelserver.client;bundle-version="[0.7.0,1.0.0)",
org.eclipse.emfcloud.modelserver.common;bundle-version="[0.7.0,1.0.0)",
- org.eclipse.emfcloud.modelserver.emf;bundle-version="[0.7.0,1.0.0)",
- org.eclipse.emfcloud.modelserver.lib;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.emfcloud.modelserver.edit;bundle-version="[0.7.0,1.0.0)",
org.eclipse.emfcloud.modelserver.glsp.integration;bundle-version="[0.7.0,1.0.0)",
org.eclipse.emfcloud.modelserver.glsp.notation.commands;bundle-version="[0.7.0,1.0.0)",
org.eclipse.emfcloud.coffee.model;bundle-version="[0.1.0,0.2.0)",
org.eclipse.emfcloud.coffee.modelserver;bundle-version="[0.1.0,0.2.0)",
org.eclipse.emfcloud.validation.framework;bundle-version="[0.2.0,0.3.0)",
- org.eclipse.jetty.http;bundle-version="[9.4.44,10.0.0)",
- org.eclipse.jetty.io;bundle-version="[9.4.44,10.0.0)",
- org.eclipse.jetty.security;bundle-version="[9.4.44,10.0.0)",
- org.eclipse.jetty.server;bundle-version="[9.4.44,10.0.0)",
- org.eclipse.jetty.servlet;bundle-version="[9.4.44,10.0.0)",
- org.eclipse.jetty.util;bundle-version="[9.4.44,10.0.0)",
- org.eclipse.jetty.util.ajax;bundle-version="[9.4.44,10.0.0)",
- javax.servlet;bundle-version="[3.1.0,4.0.0)",
- com.google.gson;bundle-version="[2.8.9,3.0.0)"
+ org.eclipse.emfcloud.modelserver.emf;bundle-version="0.8.0",
+ org.eclipse.lsp4j.jsonrpc;bundle-version="0.12.0"
Export-Package: org.eclipse.emfcloud.coffee.workflow.glsp.server
-Import-Package: javax.inject;version="[1.0.0,2.0.0)"
+Import-Package: com.google.gson;version="2.8.9",
+ javax.inject;version="[1.0.0,2.0.0)",
+ javax.servlet;version="3.1.0",
+ okhttp3.internal.http
diff --git a/backend/releng/org.eclipse.emfcloud.coffee.product/launch/WorkflowGLSPServer.launch b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/WorkflowGLSPServer.launch
similarity index 100%
rename from backend/releng/org.eclipse.emfcloud.coffee.product/launch/WorkflowGLSPServer.launch
rename to backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/WorkflowGLSPServer.launch
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/pom.xml b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/pom.xml
index 736b84fe..87bbcfac 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/pom.xml
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/pom.xml
@@ -15,22 +15,114 @@
../../releng/org.eclipse.emfcloud.coffee.parent/
-
- src, src-gen
-
-
- src
-
- **/*.java
-
-
-
- src-gen
-
- **/*.java
-
-
-
-
-
+
+
+ fatjar
+
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+ copy-dependencies
+ package
+
+ copy-dependencies
+
+
+ ${project.build.directory}/libs
+ false
+ false
+ true
+ false
+
+
+
+
+
+ com.googlecode.addjars-maven-plugin
+ addjars-maven-plugin
+ ${googlecode.addjars.version}
+
+
+ package
+
+ add-jars
+
+
+
+
+ ${project.build.directory}/libs
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ ${maven.shade.version}
+
+
+
+ org.eclipse.emfcloud.coffee.workflow.glsp.server.launch.WorkflowGLSPServerLauncher
+
+
+ true
+
+
+
+
+
+ *:*
+
+ META-INF/INDEX.LIST
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+ META-INF/LICENSE
+ META-INF/NOTICE
+ META-INF/DEPENDENCIES
+ META-INF/MANIFEST.MF
+ .options
+ .api_description
+ *.profile
+ *.html
+ about.*
+ about_files/*
+ plugin.xml
+ modeling32.png
+ systembundle.properties
+ profile.list
+ **/*._trace
+ **/*.g
+ **/*.tokens
+ **/*.mwe2
+ **/*.xtext
+ **/*.xtextbin
+
+
+
+ true
+ glsp
+ false
+
+
+
+ package
+
+ shade
+
+
+
+
+
+
+
+
diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/launch/WorkflowGLSPServerLauncher.java b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/launch/WorkflowGLSPServerLauncher.java
index cf907337..26169b55 100644
--- a/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/launch/WorkflowGLSPServerLauncher.java
+++ b/backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/launch/WorkflowGLSPServerLauncher.java
@@ -11,6 +11,7 @@
package org.eclipse.emfcloud.coffee.workflow.glsp.server.launch;
import java.io.IOException;
+import java.util.function.Predicate;
import org.apache.commons.cli.ParseException;
import org.eclipse.elk.alg.layered.options.LayeredMetaDataProvider;
@@ -25,8 +26,11 @@
@SuppressWarnings("UncommentedMain")
public final class WorkflowGLSPServerLauncher {
+
private WorkflowGLSPServerLauncher() {}
+ private static final int WORKFLOW_DEFAULT_PORT = 5008;
+
public static void main(final String[] args) {
String processName = "WorkflowGLSPServer";
try {
@@ -34,12 +38,14 @@ public static void main(final String[] args) {
DefaultCLIParser parser = new DefaultCLIParser(args, processName);
LaunchUtil.configure(parser);
- int port = parser.parsePort();
+ Predicate validator = (port) -> LaunchUtil.isValidPort(port);
+ int serverPort = parser.parseIntOption(DefaultCLIParser.OPTION_PORT, WORKFLOW_DEFAULT_PORT, validator);
+
ServerModule tasklistServerModule = new EMSGLSPServerModule()
.configureDiagramModule(new WorkflowDiagramModule());
GLSPServerLauncher launcher = new SocketGLSPServerLauncher(tasklistServerModule);
- launcher.start("localhost", port);
+ launcher.start("localhost", serverPort);
} catch (ParseException | IOException ex) {
ex.printStackTrace();
LaunchUtil.printHelp(processName, DefaultCLIParser.getDefaultOptions());
diff --git a/backend/releng/org.eclipse.emfcloud.coffee.parent/pom.xml b/backend/releng/org.eclipse.emfcloud.coffee.parent/pom.xml
index 0a8c6ffe..0b9a7d8c 100644
--- a/backend/releng/org.eclipse.emfcloud.coffee.parent/pom.xml
+++ b/backend/releng/org.eclipse.emfcloud.coffee.parent/pom.xml
@@ -56,14 +56,26 @@
UTF-8
- 2.2.0
+ 2.7.4
2.23.0
+ [2.1.1, 3)
${xtext.version}
+ 3.2.0
11
11
+ 3.8.0
3.1.1
+ 3.0.0
+ 2.22.1
+ 2.7
+ 3.3.0
+ 1.4.0
+ 1.0.5
8.44
0.1.0-SNAPSHOT
+ 3.1.2
+ 2.11.3
+ 1.0.0
@@ -162,7 +174,7 @@
org.apache.maven.plugins
maven-clean-plugin
- 2.5
+ ${maven.clean.version}
@@ -181,12 +193,12 @@
org.codehaus.mojo
build-helper-maven-plugin
- 3.0.0
+ ${codehaus.mojo.maven.version}
org.eclipse.m2e
lifecycle-mapping
- 1.0.0
+ ${eclipse.m2e.lifecycle.version}
diff --git a/backend/releng/org.eclipse.emfcloud.coffee.product/pom.xml b/backend/releng/org.eclipse.emfcloud.coffee.product/pom.xml
index bc2bd7c0..8e04133b 100755
--- a/backend/releng/org.eclipse.emfcloud.coffee.product/pom.xml
+++ b/backend/releng/org.eclipse.emfcloud.coffee.product/pom.xml
@@ -58,10 +58,6 @@
org.eclipse.emfcloud.coffee.product.workflow.dsl
WorkflowDSL
-
- org.eclipse.emfcloud.coffee.product.workflow.glsp.server
- WorkflowGLSPServer
-
diff --git a/backend/releng/org.eclipse.emfcloud.coffee.target/org.eclipse.emfcloud.coffee.target.tpd b/backend/releng/org.eclipse.emfcloud.coffee.target/org.eclipse.emfcloud.coffee.target.tpd
index 9883c4c3..b90d160a 100644
--- a/backend/releng/org.eclipse.emfcloud.coffee.target/org.eclipse.emfcloud.coffee.target.tpd
+++ b/backend/releng/org.eclipse.emfcloud.coffee.target/org.eclipse.emfcloud.coffee.target.tpd
@@ -21,7 +21,7 @@ location "https://download.eclipse.org/tools/orbit/R-builds/R20220302172233/repo
net.bytebuddy.byte-buddy-agent [1.9.0,2.0.0)
org.aopalliance [1.0.0,2.0.0)
org.apache.commons.lang [2.6.0,3.0.0)
- org.apache.commons.io [2.6.0,3.0.0)
+ org.apache.commons.io [2.8.0,3.0.0)
org.apache.log4j [1.2.15,2.0.0)
org.hamcrest [1.1.0,2.0.0)
org.objenesis [2.6.0,3.0.0)
From c4d8f2bc7a4a36c3132317d55ab91140e42657c1 Mon Sep 17 00:00:00 2001
From: Nina Doschek
Date: Wed, 31 Aug 2022 22:23:09 +0200
Subject: [PATCH 04/34] #455 #456 Update to latest versions
- Move example project 'SuperBrewer3000' to client/workspace and adapt all paths accordingly
- Rename frontend folder to client and adapt all paths
- Update client code to Theia 1.27.0 an current versions of glsp, sprotty and emfcloud components
- Update to newer typescript version and adapt code accordingly
- Update theia plugins to newest compatible versions to ensure cpp and java debugging
- Reuse tsconfig, eslint and prettier configs by eclipse-glsp
- Align build scripts, devDependencies and package.json descriptions
- Fix custom file icons alignment
- #348 Replace run.sh script with ts-node scripts and yarn scripts
- Create parent package.json that offers the main build scripts build:server and build:client as well as a convenience script that combines those two
- Move copying of backend products in the build of the repsonsible client package coffee-servers and replace with ts-node script
- Move all server backend registrations to coffee-servers package
---
Dockerfile | 11 +-
Jenkinsfile | 19 +-
README.md | 17 +-
.../SuperBrewer3000/.theia/tasks.json | 20 -
client/.eslintrc.js | 35 +
{web => client}/.gitignore | 2 +
client/.prettierrc | 1 +
{web => client}/.vscode/extensions.json | 3 +-
{web => client}/.vscode/launch.json | 18 +-
{web => client}/.vscode/settings.json | 0
{web => client}/.vscode/tasks.json | 21 +-
{web => client}/README.md | 0
client/browser-app/package.json | 86 +
client/coffee-comparison/package.json | 49 +
...offee-comparison-frontend-configuration.ts | 6 +-
.../coffee-comparison-frontend-module.ts | 0
.../coffee-graphical-comparison-opener.ts | 11 +-
...coffee-comparison-backend-configuration.ts | 2 +-
.../node/coffee-comparison-backend-module.ts | 0
.../coffee-comparison/tsconfig.json | 2 +-
.../coffee-cpp-extension/package.json | 21 +-
.../src/browser/command-contribution.ts | 6 +-
.../src/browser/frontend-extension.ts | 8 +-
.../src/browser/generate-code-service.ts | 8 +-
.../src/common/generate-protocol.ts | 8 +-
.../coffee-cpp-extension/tsconfig.json | 2 +-
{web => client}/coffee-editor-data.json | 0
.../css/coffee-tree-editor.css | 0
.../coffee-editor-extension/package.json | 18 +-
.../browser/coffee-editor-frontend-module.ts | 0
.../coffee-editor-tree-contribution.ts | 7 +-
.../src/browser/coffee-label-provider.ts | 2 +-
.../coffee-tree/coffee-model-service.ts | 0
.../src/browser/coffee-tree/coffee-model.ts | 0
.../coffee-tree/coffee-node-factory.ts | 0
.../src/browser/coffee-tree/coffee-schemas.ts | 3 +-
.../coffee-tree/coffee-tree-container.ts | 0
...coffee-tree-label-provider-contribution.ts | 0
.../src/browser/coffee-tree/model-server.ts | 46 +-
.../coffee-editor-extension}/tsconfig.json | 3 +-
.../coffee-java-extension/package.json | 21 +-
.../src/browser/command-contribution.ts | 6 +-
.../src/browser/frontend-extension.ts | 8 +-
.../src/browser/generate-code-service.ts | 6 +-
.../src/browser/junit-run-service.ts | 0
.../src/common/generate-protocol.ts | 8 +-
.../coffee-java-extension}/tsconfig.json | 6 +-
.../coffee-servers}/package.json | 30 +-
client/coffee-servers/scripts/copy-servers.ts | 59 +
client/coffee-servers/scripts/copy-utils.ts | 92 +
.../browser/coffee-server-frontend-module.ts | 0
.../src/browser/coffee-timeout-dialog.tsx | 4 +-
.../coffee-servers/src/node/backend-module.ts | 78 +
.../src/node/cpp-codegen-server.ts | 63 +
.../coffee-servers/src/node/equinox-server.ts | 84 +-
.../src/node/glsp-server-contribution.ts | 36 +
.../src/node/java-codegen-server.ts | 63 +
.../src/node/model-server-launch-options.ts | 28 +
.../src/node/workflow-analysis-server.ts | 68 +-
.../src/node/workflow-dsl-lsp-server.ts | 45 +
.../coffee-servers}/tsconfig.json | 6 +-
.../coffee-welcome-page/package.json | 26 +-
.../coffee-welcome-page-contribution.ts | 4 +-
.../coffee-welcome-page-frontend-module.ts | 0
.../src/browser/style/index.css | 0
.../src/browser/welcome-page-widget.tsx | 3 +-
.../coffee-welcome-page}/tsconfig.json | 4 +-
.../package.json | 26 +-
.../src/extension.ts | 0
.../syntaxes/language-configuration.json | 0
.../syntaxes/wfconfig.tmLanguage.json | 0
.../tsconfig.json | 4 +-
.../coffee-workflow-analyzer/package.json | 20 +-
.../src/browser/analysis-service.ts | 18 +-
.../src/browser/command-contribution.ts | 0
.../src/browser/frontend-extension.ts | 0
.../src/browser/location-mapper.ts | 0
.../src/common/request-file-protocol.ts | 0
.../src/common/workflow-analyze-protocol.ts | 0
.../src/node/backend-extension.ts | 17 -
.../src/node/file-server.ts | 0
client/coffee-workflow-analyzer/tsconfig.json | 9 +
.../wf-analyzer-web-app/analyze.css | 0
.../wf-analyzer-web-app/d3.min.js | 0
.../fonts/open-sans-v15-latin-600.eot | Bin
.../fonts/open-sans-v15-latin-600.svg | 0
.../fonts/open-sans-v15-latin-600.ttf | Bin
.../fonts/open-sans-v15-latin-600.woff | Bin
.../fonts/open-sans-v15-latin-600.woff2 | Bin
.../fonts/open-sans-v15-latin-regular.eot | Bin
.../fonts/open-sans-v15-latin-regular.svg | 0
.../fonts/open-sans-v15-latin-regular.ttf | Bin
.../fonts/open-sans-v15-latin-regular.woff | Bin
.../fonts/open-sans-v15-latin-regular.woff2 | Bin
.../wf-analyzer-web-app/index.html | 0
.../coffee-workflow-glsp-theia}/package.json | 32 +-
.../browser/diagram/diagram-configuration.ts | 12 +-
.../diagram-label-provider-contribution.ts | 9 +-
.../src/browser/diagram/diagram-manager.ts | 82 +-
.../browser/diagram/glsp-server-options.ts | 0
.../browser/diagram/theia-glsp-connector.ts | 15 +-
.../src/browser/frontend-module.ts | 14 +-
.../workflow-glsp-client-contribution.ts | 17 +-
.../src/common/index.ts | 11 +
.../src/common/workflow-language.ts | 0
.../coffee-workflow-glsp-theia/tsconfig.json | 13 +
.../coffee-workflow-glsp/css/diagram.css | 4 +-
.../css/temporary_glsp.css | 6 +-
.../coffee-workflow-glsp/package.json | 12 +-
.../coffee-workflow-glsp/src/di.config.ts | 0
.../src/direct-task-editing/di.config.ts | 5 +-
.../direct-task-editing/direct-task-editor.ts | 73 +-
.../coffee-workflow-glsp/src/index.ts | 0
.../coffee-workflow-glsp/src/model.ts | 12 +-
.../src/workflow-views.tsx | 3 +-
.../coffee-workflow-glsp/tsconfig.json | 4 +-
{web => client}/favicon.ico | Bin
{web => client}/lerna.json | 6 +-
client/package.json | 99 +
client/tsconfig.json | 18 +
.../workspace}/SuperBrewer3000/.classpath | 2 +-
.../workspace}/SuperBrewer3000/.gitignore | 6 +-
.../workspace}/SuperBrewer3000/.project | 2 +-
.../org.eclipse.core.resources.prefs | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
.../org.eclipse.jdt.launching.core.prefs | 2 +-
.../.settings/org.eclipse.jdt.ui.prefs | 2 +-
.../SuperBrewer3000/.theia/launch.json | 2 +-
.../SuperBrewer3000/.theia/settings.json | 4 +-
.../SuperBrewer3000/.theia/tasks.json | 20 +
.../workspace}/SuperBrewer3000/pom.xml | 0
.../SuperBrewer3000/superbrewer3000.coffee | 0
.../SuperBrewer3000/superbrewer3000.notation | 44 +-
.../SuperBrewer3000/superbrewer3000.wfconfig | 0
{web => client}/yarn.lock | 7267 +++++++++++------
package.json | 30 +
run.sh | 147 -
web/.eslintrc.js | 10 -
web/.prettierrc.json | 22 -
web/browser-app/package.json | 83 -
web/coffee-comparison/package.json | 35 -
.../src/node/backend-extension.ts | 26 -
.../src/node/coffee-codegen-server.ts | 110 -
.../coffee-tree/coffee-tree-editor-widget.tsx | 390 -
.../src/node/backend-extension.ts | 26 -
.../src/node/coffee-codegen-server.ts | 110 -
web/coffee-server/src/node/backend-module.ts | 49 -
web/coffee-welcome-page/tsconfig.json | 11 -
.../.eslintrc.js | 16 -
web/coffee-workflow-analyzer/tsconfig.json | 11 -
.../src/node/backend-module.ts | 18 -
.../src/node/equinox.ts | 21 -
.../node/workflow-glsp-server-contribution.ts | 82 -
web/configs/base.eslintrc.json | 34 -
web/configs/base.tsconfig.json | 25 -
web/configs/errors.eslintrc.json | 77 -
web/configs/warnings.eslintrc.json | 91 -
web/package.json | 102 -
web/tsconfig.json | 31 -
159 files changed, 6174 insertions(+), 4462 deletions(-)
delete mode 100644 backend/examples/SuperBrewer3000/.theia/tasks.json
create mode 100644 client/.eslintrc.js
rename {web => client}/.gitignore (70%)
create mode 100644 client/.prettierrc
rename {web => client}/.vscode/extensions.json (88%)
rename {web => client}/.vscode/launch.json (77%)
rename {web => client}/.vscode/settings.json (100%)
rename {web => client}/.vscode/tasks.json (63%)
rename {web => client}/README.md (100%)
create mode 100644 client/browser-app/package.json
create mode 100644 client/coffee-comparison/package.json
rename {web => client}/coffee-comparison/src/browser/coffee-comparison-frontend-configuration.ts (90%)
rename {web => client}/coffee-comparison/src/browser/coffee-comparison-frontend-module.ts (100%)
rename {web => client}/coffee-comparison/src/browser/coffee-graphical-comparison-opener.ts (81%)
rename {web => client}/coffee-comparison/src/node/coffee-comparison-backend-configuration.ts (95%)
rename {web => client}/coffee-comparison/src/node/coffee-comparison-backend-module.ts (100%)
rename {web => client}/coffee-comparison/tsconfig.json (76%)
rename {web => client}/coffee-cpp-extension/package.json (70%)
rename {web => client}/coffee-cpp-extension/src/browser/command-contribution.ts (93%)
rename {web => client}/coffee-cpp-extension/src/browser/frontend-extension.ts (81%)
rename {web => client}/coffee-cpp-extension/src/browser/generate-code-service.ts (90%)
rename {web => client}/coffee-cpp-extension/src/common/generate-protocol.ts (67%)
rename {web => client}/coffee-cpp-extension/tsconfig.json (69%)
rename {web => client}/coffee-editor-data.json (100%)
rename {web => client}/coffee-editor-extension/css/coffee-tree-editor.css (100%)
rename {web => client}/coffee-editor-extension/package.json (77%)
rename {web => client}/coffee-editor-extension/src/browser/coffee-editor-frontend-module.ts (100%)
rename {web => client}/coffee-editor-extension/src/browser/coffee-editor-tree-contribution.ts (89%)
rename {web => client}/coffee-editor-extension/src/browser/coffee-label-provider.ts (95%)
rename {web => client}/coffee-editor-extension/src/browser/coffee-tree/coffee-model-service.ts (100%)
rename {web => client}/coffee-editor-extension/src/browser/coffee-tree/coffee-model.ts (100%)
rename {web => client}/coffee-editor-extension/src/browser/coffee-tree/coffee-node-factory.ts (100%)
rename {web => client}/coffee-editor-extension/src/browser/coffee-tree/coffee-schemas.ts (99%)
rename {web => client}/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-container.ts (100%)
rename {web => client}/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-label-provider-contribution.ts (100%)
rename {web => client}/coffee-editor-extension/src/browser/coffee-tree/model-server.ts (72%)
rename {web/coffee-workflow-glsp-editor => client/coffee-editor-extension}/tsconfig.json (69%)
rename {web => client}/coffee-java-extension/package.json (70%)
rename {web => client}/coffee-java-extension/src/browser/command-contribution.ts (95%)
rename {web => client}/coffee-java-extension/src/browser/frontend-extension.ts (82%)
rename {web => client}/coffee-java-extension/src/browser/generate-code-service.ts (93%)
rename {web => client}/coffee-java-extension/src/browser/junit-run-service.ts (100%)
rename {web => client}/coffee-java-extension/src/common/generate-protocol.ts (66%)
rename {web/coffee-editor-extension => client/coffee-java-extension}/tsconfig.json (55%)
rename {web/coffee-server => client/coffee-servers}/package.json (57%)
create mode 100644 client/coffee-servers/scripts/copy-servers.ts
create mode 100644 client/coffee-servers/scripts/copy-utils.ts
rename {web/coffee-server => client/coffee-servers}/src/browser/coffee-server-frontend-module.ts (100%)
rename {web/coffee-server => client/coffee-servers}/src/browser/coffee-timeout-dialog.tsx (91%)
create mode 100644 client/coffee-servers/src/node/backend-module.ts
create mode 100644 client/coffee-servers/src/node/cpp-codegen-server.ts
rename web/coffee-server/src/node/workflow-lsp-launcher.ts => client/coffee-servers/src/node/equinox-server.ts (51%)
create mode 100644 client/coffee-servers/src/node/glsp-server-contribution.ts
create mode 100644 client/coffee-servers/src/node/java-codegen-server.ts
create mode 100644 client/coffee-servers/src/node/model-server-launch-options.ts
rename {web/coffee-workflow-analyzer => client/coffee-servers}/src/node/workflow-analysis-server.ts (64%)
create mode 100644 client/coffee-servers/src/node/workflow-dsl-lsp-server.ts
rename {web/coffee-java-extension => client/coffee-servers}/tsconfig.json (55%)
rename {web => client}/coffee-welcome-page/package.json (67%)
rename {web => client}/coffee-welcome-page/src/browser/coffee-welcome-page-contribution.ts (94%)
rename {web => client}/coffee-welcome-page/src/browser/coffee-welcome-page-frontend-module.ts (100%)
rename {web => client}/coffee-welcome-page/src/browser/style/index.css (100%)
rename {web => client}/coffee-welcome-page/src/browser/welcome-page-widget.tsx (99%)
rename {web/coffee-server => client/coffee-welcome-page}/tsconfig.json (62%)
rename {web => client}/coffee-workflow-analyzer-editor/package.json (79%)
rename {web => client}/coffee-workflow-analyzer-editor/src/extension.ts (100%)
rename {web => client}/coffee-workflow-analyzer-editor/syntaxes/language-configuration.json (100%)
rename {web => client}/coffee-workflow-analyzer-editor/syntaxes/wfconfig.tmLanguage.json (100%)
rename {web => client}/coffee-workflow-analyzer-editor/tsconfig.json (63%)
rename {web => client}/coffee-workflow-analyzer/package.json (78%)
rename {web => client}/coffee-workflow-analyzer/src/browser/analysis-service.ts (90%)
rename {web => client}/coffee-workflow-analyzer/src/browser/command-contribution.ts (100%)
rename {web => client}/coffee-workflow-analyzer/src/browser/frontend-extension.ts (100%)
rename {web => client}/coffee-workflow-analyzer/src/browser/location-mapper.ts (100%)
rename {web => client}/coffee-workflow-analyzer/src/common/request-file-protocol.ts (100%)
rename {web => client}/coffee-workflow-analyzer/src/common/workflow-analyze-protocol.ts (100%)
rename {web => client}/coffee-workflow-analyzer/src/node/backend-extension.ts (57%)
rename {web => client}/coffee-workflow-analyzer/src/node/file-server.ts (100%)
create mode 100644 client/coffee-workflow-analyzer/tsconfig.json
rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/analyze.css (100%)
rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/d3.min.js (100%)
rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.eot (100%)
rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.svg (100%)
rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.ttf (100%)
rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.woff (100%)
rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.woff2 (100%)
rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.eot (100%)
rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.svg (100%)
rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.ttf (100%)
rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.woff (100%)
rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.woff2 (100%)
rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/index.html (100%)
rename {web/coffee-workflow-glsp-editor => client/coffee-workflow-glsp-theia}/package.json (63%)
rename web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-configuration.ts => client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-configuration.ts (76%)
rename web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-label-provider-contribution.ts => client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-label-provider-contribution.ts (82%)
rename web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-manager.ts => client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-manager.ts (53%)
rename web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-glsp-server-options.ts => client/coffee-workflow-glsp-theia/src/browser/diagram/glsp-server-options.ts (100%)
rename {web/coffee-workflow-glsp-editor => client/coffee-workflow-glsp-theia}/src/browser/diagram/theia-glsp-connector.ts (78%)
rename {web/coffee-workflow-glsp-editor => client/coffee-workflow-glsp-theia}/src/browser/frontend-module.ts (80%)
rename {web/coffee-workflow-glsp-editor => client/coffee-workflow-glsp-theia}/src/browser/workflow-glsp-client-contribution.ts (57%)
create mode 100644 client/coffee-workflow-glsp-theia/src/common/index.ts
rename {web/coffee-workflow-glsp-editor => client/coffee-workflow-glsp-theia}/src/common/workflow-language.ts (100%)
create mode 100644 client/coffee-workflow-glsp-theia/tsconfig.json
rename {web => client}/coffee-workflow-glsp/css/diagram.css (94%)
rename {web => client}/coffee-workflow-glsp/css/temporary_glsp.css (97%)
rename {web => client}/coffee-workflow-glsp/package.json (82%)
rename {web => client}/coffee-workflow-glsp/src/di.config.ts (100%)
rename {web => client}/coffee-workflow-glsp/src/direct-task-editing/di.config.ts (83%)
rename {web => client}/coffee-workflow-glsp/src/direct-task-editing/direct-task-editor.ts (66%)
rename {web => client}/coffee-workflow-glsp/src/index.ts (100%)
rename {web => client}/coffee-workflow-glsp/src/model.ts (93%)
rename {web => client}/coffee-workflow-glsp/src/workflow-views.tsx (97%)
rename {web => client}/coffee-workflow-glsp/tsconfig.json (83%)
rename {web => client}/favicon.ico (100%)
rename {web => client}/lerna.json (70%)
create mode 100644 client/package.json
create mode 100644 client/tsconfig.json
rename {backend/examples => client/workspace}/SuperBrewer3000/.classpath (99%)
rename {backend/examples => client/workspace}/SuperBrewer3000/.gitignore (51%)
rename {backend/examples => client/workspace}/SuperBrewer3000/.project (97%)
rename {backend/examples => client/workspace}/SuperBrewer3000/.settings/org.eclipse.core.resources.prefs (54%)
rename {backend/examples => client/workspace}/SuperBrewer3000/.settings/org.eclipse.jdt.core.prefs (99%)
rename backend/examples/SuperBrewer3000/.settings/org.eclipse.jdt.launching.prefs => client/workspace/SuperBrewer3000/.settings/org.eclipse.jdt.launching.core.prefs (93%)
rename {backend/examples => client/workspace}/SuperBrewer3000/.settings/org.eclipse.jdt.ui.prefs (99%)
rename {backend/examples => client/workspace}/SuperBrewer3000/.theia/launch.json (99%)
rename {backend/examples => client/workspace}/SuperBrewer3000/.theia/settings.json (83%)
create mode 100644 client/workspace/SuperBrewer3000/.theia/tasks.json
rename {backend/examples => client/workspace}/SuperBrewer3000/pom.xml (100%)
rename {backend/examples => client/workspace}/SuperBrewer3000/superbrewer3000.coffee (100%)
rename {backend/examples => client/workspace}/SuperBrewer3000/superbrewer3000.notation (62%)
rename {backend/examples => client/workspace}/SuperBrewer3000/superbrewer3000.wfconfig (100%)
rename {web => client}/yarn.lock (64%)
create mode 100644 package.json
delete mode 100755 run.sh
delete mode 100644 web/.eslintrc.js
delete mode 100644 web/.prettierrc.json
delete mode 100644 web/browser-app/package.json
delete mode 100644 web/coffee-comparison/package.json
delete mode 100644 web/coffee-cpp-extension/src/node/backend-extension.ts
delete mode 100644 web/coffee-cpp-extension/src/node/coffee-codegen-server.ts
delete mode 100644 web/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-editor-widget.tsx
delete mode 100644 web/coffee-java-extension/src/node/backend-extension.ts
delete mode 100644 web/coffee-java-extension/src/node/coffee-codegen-server.ts
delete mode 100644 web/coffee-server/src/node/backend-module.ts
delete mode 100644 web/coffee-welcome-page/tsconfig.json
delete mode 100644 web/coffee-workflow-analyzer-editor/.eslintrc.js
delete mode 100644 web/coffee-workflow-analyzer/tsconfig.json
delete mode 100644 web/coffee-workflow-glsp-editor/src/node/backend-module.ts
delete mode 100644 web/coffee-workflow-glsp-editor/src/node/equinox.ts
delete mode 100644 web/coffee-workflow-glsp-editor/src/node/workflow-glsp-server-contribution.ts
delete mode 100644 web/configs/base.eslintrc.json
delete mode 100644 web/configs/base.tsconfig.json
delete mode 100644 web/configs/errors.eslintrc.json
delete mode 100644 web/configs/warnings.eslintrc.json
delete mode 100644 web/package.json
delete mode 100644 web/tsconfig.json
diff --git a/Dockerfile b/Dockerfile
index 96c2e44e..85038915 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,11 +23,12 @@ WORKDIR /coffee-editor
COPY --chown=theia:theia . .
USER theia
-RUN ./run.sh -bcf && \
- cp ./web/favicon.ico ./web/browser-app/lib
-RUN sed -i 's/<\/head>/ <\/head>/g' web/browser-app/lib/index.html
+# Trigger build: Build backend, build client
+RUN yarn build
+RUN cp ./client/favicon.ico ./client/browser-app/lib
+RUN sed -i 's/<\/head>/ <\/head>/g' client/browser-app/lib/index.html
-WORKDIR /coffee-editor/backend/examples/SuperBrewer3000
+WORKDIR /coffee-editor/client/workspace/SuperBrewer3000
RUN git config --global user.name "Test User"
RUN git config --global user.email "test@example.com"
@@ -35,7 +36,7 @@ RUN git init
RUN git add *
RUN git commit -m "init"
-WORKDIR /coffee-editor/web/browser-app
+WORKDIR /coffee-editor/client/browser-app
EXPOSE 3000
diff --git a/Jenkinsfile b/Jenkinsfile
index 51f71500..81f9dab3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,18 +49,7 @@ pipeline {
container('ci') {
timeout(30){
dir('backend/releng/org.eclipse.emfcloud.coffee.parent') {
- sh 'mvn clean install -Pfatjar -U --batch-mode -Dmaven.repo.local=/home/jenkins/.m2/repository'
- }
- }
- }
- }
- }
- stage('Copy server') {
- steps {
- container('ci') {
- timeout(30){
- dir('.') {
- sh './run.sh -c'
+ sh 'mvn clean install -U --batch-mode -Dmaven.repo.local=/home/jenkins/.m2/repository'
}
}
}
@@ -72,7 +61,7 @@ pipeline {
withCredentials([string(credentialsId: "github-bot-token", variable: 'GITHUB_TOKEN')]) {
timeout(30){
dir('.') {
- sh './run.sh -f'
+ sh 'yarn build:client'
}
}
}
@@ -85,7 +74,9 @@ pipeline {
steps {
container('ci') {
archiveArtifacts artifacts: 'backend/releng/org.eclipse.emfcloud.coffee.product/target/products/*.zip' , fingerprint: true
- archiveArtifacts artifacts: 'web/browser-app/**', fingerprint: true
+ archiveArtifacts artifacts: 'backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/target/org.eclipse.emfcloud.coffee.workflow.glsp.server-0.1.0-SNAPSHOT-glsp.jar' , fingerprint: true
+ archiveArtifacts artifacts: 'backend/plugins/org.eclipse.emfcloud.coffee.modelserver/target/org.eclipse.emfcloud.coffee.modelserver-0.1.0-SNAPSHOT-standalone.jar' , fingerprint: true
+ archiveArtifacts artifacts: 'client/browser-app/**', fingerprint: true
}
}
}
diff --git a/README.md b/README.md
index 4aafbd67..31645274 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,8 @@ The runtime environment has installed (among others)
The coffee-editor consists of a frontend and a backend.
-The frontend is located in the `web/` folder and frontend specific documentation can be found in the [frontend README](web/README.md)
-The backend is located in the `backend/` folder and backend specific documentation can be found in the [backend README](backend/README.md)
+The frontend is located in the [`client/`](./client/) folder and frontend specific documentation can be found in the [client README](client/README.md)
+The backend is located in the [`backend/`](./backend/) folder and backend specific documentation can be found in the [backend README](backend/README.md)
## Used Projects
@@ -70,8 +70,8 @@ You need Java 11 to build the Coffee Editor.
### Install npm and node
- nvm install 12
- nvm use 12
+ nvm install 16
+ nvm use 16
### Install yarn
@@ -164,17 +164,16 @@ You can also use the predefined `RunSocketServer-Headless.launch` run config.
#### Coffee Model Server
-Use the `org.eclipse.emfcloud.coffee.modelserver.app.application` Eclipse Application or the corresponding `modelserver.product` from `org.eclipse.emfcloud.coffee.product` to start the Model Server.
+Use the `CoffeeModelServer` launch config to start the Model Server.
#### Coffee GLSP Server
-Use the `workflowserver.product` product to start the GLSP Server.
-On the client side, set the `isRunning` flag of the [CoffeeGlspLaunchOptions](web/coffee-server/src/node/backend-module.ts) to `true`.
+Use the `WorkflowGLSPServer` launch config to start the GLSP Server.
-### Debug Frontend
+### Debug Client
- Install VSCode
-- Import projects from `web`
+- Open folder `client`
#### Debug Theia Backend
diff --git a/backend/examples/SuperBrewer3000/.theia/tasks.json b/backend/examples/SuperBrewer3000/.theia/tasks.json
deleted file mode 100644
index c7563156..00000000
--- a/backend/examples/SuperBrewer3000/.theia/tasks.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- // See https://go.microsoft.com/fwlink/?LinkId=733558
- // for the documentation about the tasks.json format
- "version": "2.0.0",
- "tasks": [
- {
- "label": "Binary build",
- "type": "shell",
- "command": "cd cpp && cmake . && make",
- "group": {
- "kind": "build",
- "isDefault": true
- },
- "problemMatcher": [],
- "runOptions": {
- "runOn": "folderOpen"
- }
- }
- ]
-}
\ No newline at end of file
diff --git a/client/.eslintrc.js b/client/.eslintrc.js
new file mode 100644
index 00000000..4f20adc0
--- /dev/null
+++ b/client/.eslintrc.js
@@ -0,0 +1,35 @@
+/** @type {import('eslint').Linter.Config} */
+module.exports = {
+ extends: '@eclipse-glsp',
+ parserOptions: {
+ tsconfigRootDir: __dirname,
+ project: 'tsconfig.json'
+ },
+ overrides: [
+ {
+ files: ['*.ts', '*.tsx'],
+ rules: {
+ // eslint-plugin-header
+ 'header/header': [
+ 2,
+ 'block',
+ [
+ {
+ pattern: '[\n\r]+ \\* Copyright \\([cC]\\) \\d{4}(-\\d{4})? .*[\n\r]+',
+ template: `
+ * Copyright (c) 2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ `
+ }
+ ]
+ ]
+ }
+ }
+ ]
+};
diff --git a/web/.gitignore b/client/.gitignore
similarity index 70%
rename from web/.gitignore
rename to client/.gitignore
index b422e6e0..d984c985 100644
--- a/web/.gitignore
+++ b/client/.gitignore
@@ -5,4 +5,6 @@ out/
*-app/*
!*-app/package.json
server/
+servers/
*.vsix
+tsconfig.tsbuildinfo
diff --git a/client/.prettierrc b/client/.prettierrc
new file mode 100644
index 00000000..14ea9057
--- /dev/null
+++ b/client/.prettierrc
@@ -0,0 +1 @@
+"@eclipse-glsp/prettier-config"
\ No newline at end of file
diff --git a/web/.vscode/extensions.json b/client/.vscode/extensions.json
similarity index 88%
rename from web/.vscode/extensions.json
rename to client/.vscode/extensions.json
index fc08acfa..d3136176 100644
--- a/web/.vscode/extensions.json
+++ b/client/.vscode/extensions.json
@@ -5,7 +5,8 @@
"recommendations": [
"dbaeumer.vscode-eslint",
"aeschli.vscode-css-formatter",
- "esbenp.prettier-vscode"
+ "esbenp.prettier-vscode",
+ "DavidAnson.vscode-markdownlint"
],
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
"unwantedRecommendations": []
diff --git a/web/.vscode/launch.json b/client/.vscode/launch.json
similarity index 77%
rename from web/.vscode/launch.json
rename to client/.vscode/launch.json
index f932e5d9..c4f322fe 100644
--- a/web/.vscode/launch.json
+++ b/client/.vscode/launch.json
@@ -7,18 +7,18 @@
{
"type": "node",
"request": "launch",
- "name": "Launch Browser Backend",
+ "name": "Launch Browser Backend [DEBUG] (External GLSP Server)",
"program": "${workspaceRoot}/browser-app/src-gen/backend/main.js",
"args": [
"--loglevel=debug",
"--port=3000",
"--no-cluster",
- "--WORKFLOW_NOTATION_LSP=5008",
+ "--WF_GLSP=5008",
"--WF_LSP=5017",
"--WF_ANALYZER=5083",
"--app-project-path=${workspaceRoot}/browser-app",
"--plugins=local-dir:${workspaceRoot}/browser-app/plugins",
- "--root-dir=${workspaceRoot}/../backend/examples/SuperBrewer3000"
+ "--root-dir=${workspaceRoot}/workspace/SuperBrewer3000"
],
"env": {
"NODE_ENV": "development",
@@ -30,9 +30,9 @@
"${workspaceRoot}/browser-app/lib/**/*.js",
"${workspaceRoot}/browser-app/src-gen/backend/*.js",
"${workspaceRoot}/coffee-java-extension/lib/**/*.js",
- "${workspaceRoot}/coffee-server/lib/**/*.js",
+ "${workspaceRoot}/coffee-servers/lib/**/*.js",
"${workspaceRoot}/coffee-workflow-analyzer/lib/**/*.js",
- "${workspaceRoot}/coffee-workflow-glsp-editor/lib/**/*.js"
+ "${workspaceRoot}/coffee-workflow-glsp-theia/lib/**/*.js"
],
"smartStep": true,
"internalConsoleOptions": "openOnSessionStart",
@@ -51,12 +51,8 @@
"request": "launch",
"name": "Launch LSP Extension",
"runtimeExecutable": "${execPath}",
- "args": [
- "--extensionDevelopmentPath=${workspaceRoot}/coffee-workflow-analyzer-editor"
- ],
- "outFiles": [
- "${workspaceRoot}/coffee-workflow-analyzer-editor/out/**/*.js"
- ],
+ "args": ["--extensionDevelopmentPath=${workspaceRoot}/coffee-workflow-analyzer-editor"],
+ "outFiles": ["${workspaceRoot}/coffee-workflow-analyzer-editor/out/**/*.js"],
"sourceMaps": true
}
]
diff --git a/web/.vscode/settings.json b/client/.vscode/settings.json
similarity index 100%
rename from web/.vscode/settings.json
rename to client/.vscode/settings.json
diff --git a/web/.vscode/tasks.json b/client/.vscode/tasks.json
similarity index 63%
rename from web/.vscode/tasks.json
rename to client/.vscode/tasks.json
index b033a591..f6a7a9d6 100644
--- a/web/.vscode/tasks.json
+++ b/client/.vscode/tasks.json
@@ -4,7 +4,7 @@
"version": "2.0.0",
"tasks": [
{
- "label": "Coffee: Build all packages",
+ "label": "Coffee: Build all client packages",
"type": "shell",
"group": {
"kind": "build",
@@ -18,7 +18,7 @@
"problemMatcher": []
},
{
- "label": "Coffee: Watch all packages",
+ "label": "Coffee: Watch all client packages",
"type": "shell",
"group": "build",
"command": "yarn watch",
@@ -29,7 +29,7 @@
"problemMatcher": []
},
{
- "label": "Coffee: Start Browser Backend along with server JARs",
+ "label": "Coffee: Start Browser Backend (Embeddeded servers)",
"type": "shell",
"command": "yarn start",
"presentation": {
@@ -39,20 +39,9 @@
"problemMatcher": []
},
{
- "label": "Coffee: Start Browser Backend (expecting server products to run)",
+ "label": "Coffee: Start Browser Backend [DEBUG] (External servers)",
"type": "shell",
- "command": "yarn debug",
- "presentation": {
- "reveal": "always",
- "panel": "new"
- },
- "problemMatcher": []
- },
- {
- "label": "Coffee: Open in Browser",
- "type": "shell",
- "group": "test",
- "command": "google-chrome 127.0.0.1:3000",
+ "command": "yarn start:debug",
"presentation": {
"reveal": "always",
"panel": "new"
diff --git a/web/README.md b/client/README.md
similarity index 100%
rename from web/README.md
rename to client/README.md
diff --git a/client/browser-app/package.json b/client/browser-app/package.json
new file mode 100644
index 00000000..492e9542
--- /dev/null
+++ b/client/browser-app/package.json
@@ -0,0 +1,86 @@
+{
+ "private": true,
+ "name": "browser-app",
+ "license": "(EPL-2.0 OR MIT)",
+ "version": "0.1.0",
+ "contributors": [
+ {
+ "name": "Eclipse EMF.cloud Project",
+ "email": "emfcloud-dev@eclipse.org",
+ "url": "https://projects.eclipse.org/projects/ecd.emfcloud"
+ }
+ ],
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/eclipse-emfcloud/coffee-editor.git"
+ },
+ "homepage": "https://www.eclipse.org/emfcloud/",
+ "bugs": "https://github.com/eclipse-emfcloud/coffee-editor/issues",
+ "dependencies": {
+ "@theia/callhierarchy": "1.27.0",
+ "@theia/console": "1.27.0",
+ "@theia/core": "1.27.0",
+ "@theia/debug": "1.27.0",
+ "@theia/editor": "1.27.0",
+ "@theia/file-search": "1.27.0",
+ "@theia/filesystem": "1.27.0",
+ "@theia/keymaps": "1.27.0",
+ "@theia/markers": "1.27.0",
+ "@theia/messages": "1.27.0",
+ "@theia/mini-browser": "1.27.0",
+ "@theia/monaco": "1.27.0",
+ "@theia/navigator": "1.27.0",
+ "@theia/outline-view": "1.27.0",
+ "@theia/output": "1.27.0",
+ "@theia/plugin-dev": "1.27.0",
+ "@theia/plugin-ext": "1.27.0",
+ "@theia/plugin-ext-vscode": "1.27.0",
+ "@theia/plugin-metrics": "1.27.0",
+ "@theia/preferences": "1.27.0",
+ "@theia/process": "1.27.0",
+ "@theia/scm": "1.27.0",
+ "@theia/scm-extra": "1.27.0",
+ "@theia/search-in-workspace": "1.27.0",
+ "@theia/task": "1.27.0",
+ "@theia/terminal": "1.27.0",
+ "@theia/typehierarchy": "1.27.0",
+ "@theia/userstorage": "1.27.0",
+ "@theia/variable-resolver": "1.27.0",
+ "@theia/vsx-registry": "1.27.0",
+ "@theia/workspace": "1.27.0",
+ "coffee-cpp-extension": "0.1.0",
+ "coffee-comparison": "0.1.0",
+ "coffee-editor-extension": "0.1.0",
+ "coffee-java-extension": "0.1.0",
+ "coffee-servers": "0.1.0",
+ "coffee-welcome-page": "0.1.0",
+ "coffee-workflow-glsp-theia": "0.1.0",
+ "coffee-workflow-analyzer": "0.1.0"
+ },
+ "devDependencies": {
+ "@theia/cli": "1.27.0"
+ },
+ "scripts": {
+ "prepare": "yarn run download:plugins && theia build --mode development",
+ "start": "export WF_CONFIG_LSP=localhost:5017 && theia start --WF_GLSP=5008 --hostname=0.0.0.0 --port=3000 --root-dir=../workspace/examples/SuperBrewer3000 --plugins=local-dir:./plugins",
+ "start:debug": "export WF_CONFIG_LSP=localhost:5017 && theia start --WF_GLSP=5008 --port=3000 --root-dir=../workspace/SuperBrewer3000 --loglevel=debug --plugins=local-dir:./plugins --debug",
+ "watch": "theia build --watch --mode development",
+ "download:plugins": "theia download:plugins"
+ },
+ "theia": {
+ "target": "browser"
+ },
+ "theiaPluginsDir": "plugins",
+ "theiaPlugins": {
+ "java-debug": "https://github.com/microsoft/vscode-java-debug/releases/download/0.43.0/vscjava.vscode-java-debug-0.43.0.vsix",
+ "java-lsp": "https://download.jboss.org/jbosstools/static/jdt.ls/stable/java-1.1.0-465.vsix",
+ "vscode-builtin-cpp": "https://open-vsx.org/api/vscode/cpp/1.62.3/file/vscode.cpp-1.62.3.vsix",
+ "vscode-builtin-java": "https://open-vsx.org/api/vscode/java/1.62.3/file/vscode.java-1.62.3.vsix",
+ "vscode-builtin-json": "https://open-vsx.org/api/vscode/json/1.62.3/file/vscode.json-1.62.3.vsix",
+ "vscode-builtin-json-language-features": "https://open-vsx.org/api/vscode/json-language-features/1.62.3/file/vscode.json-language-features-1.62.3.vsix",
+ "vscode-builtin-xml": "https://open-vsx.org/api/vscode/xml/1.62.3/file/vscode.xml-1.62.3.vsix",
+ "vscode-clangd": "https://open-vsx.org/api/llvm-vs-code-extensions/vscode-clangd/0.1.15/file/llvm-vs-code-extensions.vscode-clangd-0.1.15.vsix",
+ "vscode-cmake": "https://open-vsx.org/api/ms-vscode/cmake-tools/1.11.26/file/ms-vscode.cmake-tools-1.11.26.vsix",
+ "cdt-gdb-vscode": "https://open-vsx.org/api/eclipse-cdt/cdt-gdb-vscode/0.0.91/file/eclipse-cdt.cdt-gdb-vscode-0.0.91.vsix"
+ }
+}
\ No newline at end of file
diff --git a/client/coffee-comparison/package.json b/client/coffee-comparison/package.json
new file mode 100644
index 00000000..36e15d78
--- /dev/null
+++ b/client/coffee-comparison/package.json
@@ -0,0 +1,49 @@
+{
+ "name": "coffee-comparison",
+ "keywords": [
+ "theia-extension"
+ ],
+ "license": "(EPL-2.0 OR MIT)",
+ "version": "0.1.0",
+ "contributors": [
+ {
+ "name": "Eclipse EMF.cloud Project",
+ "email": "emfcloud-dev@eclipse.org",
+ "url": "https://projects.eclipse.org/projects/ecd.emfcloud"
+ }
+ ],
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/eclipse-emfcloud/coffee-editor.git"
+ },
+ "homepage": "https://www.eclipse.org/emfcloud/",
+ "bugs": "https://github.com/eclipse-emfcloud/coffee-editor/issues",
+ "files": [
+ "lib",
+ "src"
+ ],
+ "dependencies": {
+ "@eclipsesource/comparison-extension": "0.0.1-next.20220414-105416",
+ "coffee-workflow-glsp-theia": "0.1.0",
+ "@theia/core": "^1.27.0",
+ "@theia/git": "^1.27.0",
+ "@theia/filesystem": "^1.27.0"
+ },
+ "devDependencies": {
+ "rimraf": "^2.6.1",
+ "typescript": "~4.5.5"
+ },
+ "scripts": {
+ "prepare": "yarn run clean && yarn run build && yarn lint",
+ "clean": "rimraf tsconfig.tsbuildinfo lib",
+ "lint": "eslint -c ../.eslintrc.js --ext .ts,.tsx ./src",
+ "build": "tsc",
+ "watch": "tsc -w"
+ },
+ "theiaExtensions": [
+ {
+ "frontend": "lib/browser/coffee-comparison-frontend-module",
+ "backend": "lib/node/coffee-comparison-backend-module"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/web/coffee-comparison/src/browser/coffee-comparison-frontend-configuration.ts b/client/coffee-comparison/src/browser/coffee-comparison-frontend-configuration.ts
similarity index 90%
rename from web/coffee-comparison/src/browser/coffee-comparison-frontend-configuration.ts
rename to client/coffee-comparison/src/browser/coffee-comparison-frontend-configuration.ts
index f1b90873..2b1248de 100644
--- a/web/coffee-comparison/src/browser/coffee-comparison-frontend-configuration.ts
+++ b/client/coffee-comparison/src/browser/coffee-comparison-frontend-configuration.ts
@@ -17,11 +17,11 @@ import * as path from 'path';
export class CoffeeComparisonFrontendConfiguration extends ComparisonExtensionConfiguration {
fileExtensions = ['.coffee'];
- getDiffViewIcon(): string {
+ override getDiffViewIcon(): string {
return codicon('diff');
}
- getGraphicalDiffViewIcon(): string {
+ override getGraphicalDiffViewIcon(): string {
return codicon('files');
}
@@ -44,7 +44,7 @@ export class CoffeeComparisonFrontendConfiguration extends ComparisonExtensionCo
return 'org.eclipse.emfcloud.coffee.CoffeePackage';
}
- supportGraphicalComparison(): boolean {
+ override supportGraphicalComparison(): boolean {
return true;
}
}
diff --git a/web/coffee-comparison/src/browser/coffee-comparison-frontend-module.ts b/client/coffee-comparison/src/browser/coffee-comparison-frontend-module.ts
similarity index 100%
rename from web/coffee-comparison/src/browser/coffee-comparison-frontend-module.ts
rename to client/coffee-comparison/src/browser/coffee-comparison-frontend-module.ts
diff --git a/web/coffee-comparison/src/browser/coffee-graphical-comparison-opener.ts b/client/coffee-comparison/src/browser/coffee-graphical-comparison-opener.ts
similarity index 81%
rename from web/coffee-comparison/src/browser/coffee-graphical-comparison-opener.ts
rename to client/coffee-comparison/src/browser/coffee-graphical-comparison-opener.ts
index d8c0c4d1..d9516ef2 100644
--- a/web/coffee-comparison/src/browser/coffee-graphical-comparison-opener.ts
+++ b/client/coffee-comparison/src/browser/coffee-graphical-comparison-opener.ts
@@ -9,10 +9,10 @@
* SPDX-License-Identifier: EPL-2.0 OR MIT
*/
import { GLSPDiagramWidget } from '@eclipse-glsp/theia-integration/lib/browser';
-import URI from '@theia/core/lib/common/uri';
-import { WorkflowDiagramManager } from 'coffee-workflow-glsp-editor/lib/browser/diagram/workflow-diagram-manager';
import { GraphicalComparisonOpener } from '@eclipsesource/comparison-extension/lib/browser/graphical/graphical-comparison-opener';
import { ComparisonBackendService } from '@eclipsesource/comparison-extension/lib/common/protocol';
+import URI from '@theia/core/lib/common/uri';
+import { WorkflowDiagramManager } from 'coffee-workflow-glsp-theia/lib/browser/diagram/diagram-manager';
import { inject, injectable } from 'inversify';
@injectable()
@@ -21,12 +21,12 @@ export class CoffeeGraphicalComparisonOpener extends GraphicalComparisonOpener {
@inject(WorkflowDiagramManager)
private readonly diagramManager: WorkflowDiagramManager,
@inject(ComparisonBackendService)
- readonly comparisonBackendService: ComparisonBackendService
+ override readonly comparisonBackendService: ComparisonBackendService
) {
super(comparisonBackendService);
}
- async getLeftDiagram(uri: URI, highlights: any): Promise {
+ override async getLeftDiagram(uri: URI, highlights: any): Promise {
const options: any = {
widgetOptions: {
editMode: 'readonly',
@@ -37,7 +37,7 @@ export class CoffeeGraphicalComparisonOpener extends GraphicalComparisonOpener {
return this.diagramManager.createWidgetFromURI(uri, options);
}
- async getRightDiagram(uri: URI, highlights: any): Promise {
+ override async getRightDiagram(uri: URI, highlights: any): Promise {
const options: any = {
widgetOptions: {
editMode: 'readonly',
@@ -45,7 +45,6 @@ export class CoffeeGraphicalComparisonOpener extends GraphicalComparisonOpener {
useStaticIds: true
}
};
-
return this.diagramManager.createWidgetFromURI(uri, options);
}
}
diff --git a/web/coffee-comparison/src/node/coffee-comparison-backend-configuration.ts b/client/coffee-comparison/src/node/coffee-comparison-backend-configuration.ts
similarity index 95%
rename from web/coffee-comparison/src/node/coffee-comparison-backend-configuration.ts
rename to client/coffee-comparison/src/node/coffee-comparison-backend-configuration.ts
index 602601c3..b2f225e6 100644
--- a/web/coffee-comparison/src/node/coffee-comparison-backend-configuration.ts
+++ b/client/coffee-comparison/src/node/coffee-comparison-backend-configuration.ts
@@ -35,7 +35,7 @@ export class CoffeeComparisonBackendConfiguration extends ComparisonExtensionCon
return 'org.eclipse.emfcloud.coffee.CoffeePackage';
}
- supportGraphicalComparison(): boolean {
+ override supportGraphicalComparison(): boolean {
return true;
}
}
diff --git a/web/coffee-comparison/src/node/coffee-comparison-backend-module.ts b/client/coffee-comparison/src/node/coffee-comparison-backend-module.ts
similarity index 100%
rename from web/coffee-comparison/src/node/coffee-comparison-backend-module.ts
rename to client/coffee-comparison/src/node/coffee-comparison-backend-module.ts
diff --git a/web/coffee-comparison/tsconfig.json b/client/coffee-comparison/tsconfig.json
similarity index 76%
rename from web/coffee-comparison/tsconfig.json
rename to client/coffee-comparison/tsconfig.json
index 706272f7..4396e333 100644
--- a/web/coffee-comparison/tsconfig.json
+++ b/client/coffee-comparison/tsconfig.json
@@ -1,5 +1,5 @@
{
- "extends": "../configs/base.tsconfig",
+ "extends": "@eclipse-glsp/ts-config/tsconfig.json",
"compilerOptions": {
"experimentalDecorators": true,
"rootDir": "src",
diff --git a/web/coffee-cpp-extension/package.json b/client/coffee-cpp-extension/package.json
similarity index 70%
rename from web/coffee-cpp-extension/package.json
rename to client/coffee-cpp-extension/package.json
index 352d6648..4c78cb4e 100644
--- a/web/coffee-cpp-extension/package.json
+++ b/client/coffee-cpp-extension/package.json
@@ -1,9 +1,10 @@
{
"name": "coffee-cpp-extension",
- "license": "(EPL-2.0 OR MIT)",
"keywords": [
"theia-extension"
],
+ "license": "(EPL-2.0 OR MIT)",
+ "version": "0.1.0",
"contributors": [
{
"name": "Eclipse EMF.cloud Project",
@@ -17,33 +18,31 @@
},
"homepage": "https://www.eclipse.org/emfcloud/",
"bugs": "https://github.com/eclipse-emfcloud/coffee-editor/issues",
- "version": "0.7.0",
"files": [
"lib",
"src"
],
"dependencies": {
- "@theia/core": "^1.0.0",
- "@theia/terminal": "^1.0.0",
- "@theia/process": "^1.0.0",
+ "@theia/core": "^1.27.0",
+ "@theia/terminal": "^1.27.0",
+ "@theia/process": "^1.27.0",
"express": "4.17.1",
"glob": "7.1.4"
},
"devDependencies": {
"rimraf": "^2.6.1",
- "typescript": "^4.2.3"
+ "typescript": "~4.5.5"
},
"scripts": {
- "prepare": "yarn run clean && yarn run build",
- "clean": "rimraf lib",
+ "prepare": "yarn run clean && yarn run build && yarn lint",
+ "clean": "rimraf tsconfig.tsbuildinfo lib",
"lint": "eslint -c ../.eslintrc.js --ext .ts,.tsx ./src",
- "build": "tsc && yarn run lint",
+ "build": "tsc",
"watch": "tsc -w"
},
"theiaExtensions": [
{
- "frontend": "lib/browser/frontend-extension",
- "backend": "lib/node/backend-extension"
+ "frontend": "lib/browser/frontend-extension"
}
]
}
\ No newline at end of file
diff --git a/web/coffee-cpp-extension/src/browser/command-contribution.ts b/client/coffee-cpp-extension/src/browser/command-contribution.ts
similarity index 93%
rename from web/coffee-cpp-extension/src/browser/command-contribution.ts
rename to client/coffee-cpp-extension/src/browser/command-contribution.ts
index 1139161b..f58a52c8 100644
--- a/web/coffee-cpp-extension/src/browser/command-contribution.ts
+++ b/client/coffee-cpp-extension/src/browser/command-contribution.ts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,7 +34,7 @@ export class CppGenerationCommandContribution implements CommandContribution, Me
@inject(SelectionService) protected readonly selectionService: SelectionService,
@inject(CommandService) protected readonly commandService: CommandService,
@inject(GenerateCppCodeService) protected readonly generateCodeService: GenerateCppCodeService
- ) {}
+ ) { }
registerMenus(menus: MenuModelRegistry): void {
menus.registerMenuAction([...['navigator-context-menu'], '0_addition'], {
@@ -54,6 +54,6 @@ export class CppGenerationCommandContribution implements CommandContribution, Me
}
private newUriAwareCommandHandler(handler: UriCommandHandler): UriAwareCommandHandler {
- return new UriAwareCommandHandler(this.selectionService, handler);
+ return UriAwareCommandHandler.MonoSelect(this.selectionService, handler);
}
}
diff --git a/web/coffee-cpp-extension/src/browser/frontend-extension.ts b/client/coffee-cpp-extension/src/browser/frontend-extension.ts
similarity index 81%
rename from web/coffee-cpp-extension/src/browser/frontend-extension.ts
rename to client/coffee-cpp-extension/src/browser/frontend-extension.ts
index 0ea04946..249baff8 100644
--- a/web/coffee-cpp-extension/src/browser/frontend-extension.ts
+++ b/client/coffee-cpp-extension/src/browser/frontend-extension.ts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@ import { CommandContribution, MenuContribution } from '@theia/core';
import { WebSocketConnectionProvider } from '@theia/core/lib/browser';
import { ContainerModule } from 'inversify';
-import { CODEGEN_SERVICE_PATH, CodeGenCppServer } from '../common/generate-protocol';
+import { CPP_CODEGEN_SERVICE_PATH, CppCodeGenServer } from '../common/generate-protocol';
import { CppGenerationCommandContribution } from './command-contribution';
import { GenerateCppCodeService } from './generate-code-service';
@@ -20,10 +20,10 @@ export default new ContainerModule(bind => {
bind(GenerateCppCodeService).toSelf().inSingletonScope();
bind(CppGenerationCommandContribution).toSelf().inSingletonScope();
[CommandContribution, MenuContribution].forEach(s => bind(s).toService(CppGenerationCommandContribution));
- bind(CodeGenCppServer)
+ bind(CppCodeGenServer)
.toDynamicValue(ctx => {
const connection = ctx.container.get(WebSocketConnectionProvider);
- return connection.createProxy(CODEGEN_SERVICE_PATH);
+ return connection.createProxy(CPP_CODEGEN_SERVICE_PATH);
})
.inSingletonScope();
});
diff --git a/web/coffee-cpp-extension/src/browser/generate-code-service.ts b/client/coffee-cpp-extension/src/browser/generate-code-service.ts
similarity index 90%
rename from web/coffee-cpp-extension/src/browser/generate-code-service.ts
rename to client/coffee-cpp-extension/src/browser/generate-code-service.ts
index 77859d54..d7f21cea 100644
--- a/web/coffee-cpp-extension/src/browser/generate-code-service.ts
+++ b/client/coffee-cpp-extension/src/browser/generate-code-service.ts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,16 +12,16 @@ import { DisposableCollection, MessageService, Progress } from '@theia/core';
import URI from '@theia/core/lib/common/uri';
import { inject, injectable } from 'inversify';
-import { CodeGenCppServer } from '../common/generate-protocol';
+import { CppCodeGenServer } from '../common/generate-protocol';
@injectable()
export class GenerateCppCodeService {
private readonly toDispose = new DisposableCollection();
constructor(
- @inject(CodeGenCppServer) private readonly codeGenServer: CodeGenCppServer,
+ @inject(CppCodeGenServer) private readonly codeGenServer: CppCodeGenServer,
@inject(MessageService) protected readonly messageService: MessageService
) // @inject(TaskService) private readonly taskService: TaskService
- {}
+ { }
public generateCode(uri: URI): void {
this.messageService
diff --git a/web/coffee-cpp-extension/src/common/generate-protocol.ts b/client/coffee-cpp-extension/src/common/generate-protocol.ts
similarity index 67%
rename from web/coffee-cpp-extension/src/common/generate-protocol.ts
rename to client/coffee-cpp-extension/src/common/generate-protocol.ts
index 65a569b6..1437c8d7 100644
--- a/web/coffee-cpp-extension/src/common/generate-protocol.ts
+++ b/client/coffee-cpp-extension/src/common/generate-protocol.ts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -10,9 +10,9 @@
*/
import { JsonRpcServer } from '@theia/core/lib/common/messaging';
-export const CodeGenCppServer = Symbol('CodeGenCppServer');
-export const CODEGEN_SERVICE_PATH = '/services/codegen/cpp';
+export const CppCodeGenServer = Symbol('CppCodeGenServer');
+export const CPP_CODEGEN_SERVICE_PATH = '/services/codegen/cpp';
-export interface CodeGenCppServer extends JsonRpcServer {
+export interface CppCodeGenServer extends JsonRpcServer {
generateCode(sourceFile: string, targetFolder: string, packageName: string): Promise;
}
diff --git a/web/coffee-cpp-extension/tsconfig.json b/client/coffee-cpp-extension/tsconfig.json
similarity index 69%
rename from web/coffee-cpp-extension/tsconfig.json
rename to client/coffee-cpp-extension/tsconfig.json
index 6c03535c..095d9dab 100644
--- a/web/coffee-cpp-extension/tsconfig.json
+++ b/client/coffee-cpp-extension/tsconfig.json
@@ -1,5 +1,5 @@
{
- "extends": "../configs/base.tsconfig",
+ "extends": "@eclipse-glsp/ts-config/tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
diff --git a/web/coffee-editor-data.json b/client/coffee-editor-data.json
similarity index 100%
rename from web/coffee-editor-data.json
rename to client/coffee-editor-data.json
diff --git a/web/coffee-editor-extension/css/coffee-tree-editor.css b/client/coffee-editor-extension/css/coffee-tree-editor.css
similarity index 100%
rename from web/coffee-editor-extension/css/coffee-tree-editor.css
rename to client/coffee-editor-extension/css/coffee-tree-editor.css
diff --git a/web/coffee-editor-extension/package.json b/client/coffee-editor-extension/package.json
similarity index 77%
rename from web/coffee-editor-extension/package.json
rename to client/coffee-editor-extension/package.json
index aca9f730..d071549a 100644
--- a/web/coffee-editor-extension/package.json
+++ b/client/coffee-editor-extension/package.json
@@ -1,9 +1,10 @@
{
"name": "coffee-editor-extension",
- "license": "(EPL-2.0 OR MIT)",
"keywords": [
"theia-extension"
],
+ "license": "(EPL-2.0 OR MIT)",
+ "version": "0.1.0",
"contributors": [
{
"name": "Eclipse EMF.cloud Project",
@@ -17,28 +18,27 @@
},
"homepage": "https://www.eclipse.org/emfcloud/",
"bugs": "https://github.com/eclipse-emfcloud/coffee-editor/issues",
- "version": "0.7.0",
"files": [
"lib",
"src"
],
"dependencies": {
"@eclipse-emfcloud/modelserver-theia": "next",
- "@theia/core": "next",
- "@theia/filesystem": "next",
- "@theia/workspace": "next",
+ "@theia/core": "^1.27.0",
+ "@theia/filesystem": "^1.27.0",
+ "@theia/workspace": "^1.27.0",
"uuid": "^3.3.2",
"@eclipse-emfcloud/theia-tree-editor": "next"
},
"devDependencies": {
"rimraf": "^2.6.1",
- "typescript": "^4.2.3"
+ "typescript": "~4.5.5"
},
"scripts": {
- "prepare": "yarn run clean && yarn run build",
- "clean": "rimraf lib",
+ "prepare": "yarn run clean && yarn run build && yarn lint",
+ "clean": "rimraf tsconfig.tsbuildinfo lib",
"lint": "eslint -c ../.eslintrc.js --ext .ts,.tsx ./src",
- "build": "tsc && yarn run lint",
+ "build": "tsc",
"watch": "tsc -w"
},
"theiaExtensions": [
diff --git a/web/coffee-editor-extension/src/browser/coffee-editor-frontend-module.ts b/client/coffee-editor-extension/src/browser/coffee-editor-frontend-module.ts
similarity index 100%
rename from web/coffee-editor-extension/src/browser/coffee-editor-frontend-module.ts
rename to client/coffee-editor-extension/src/browser/coffee-editor-frontend-module.ts
diff --git a/web/coffee-editor-extension/src/browser/coffee-editor-tree-contribution.ts b/client/coffee-editor-extension/src/browser/coffee-editor-tree-contribution.ts
similarity index 89%
rename from web/coffee-editor-extension/src/browser/coffee-editor-tree-contribution.ts
rename to client/coffee-editor-extension/src/browser/coffee-editor-tree-contribution.ts
index 783a6cc2..0407748a 100644
--- a/web/coffee-editor-extension/src/browser/coffee-editor-tree-contribution.ts
+++ b/client/coffee-editor-extension/src/browser/coffee-editor-tree-contribution.ts
@@ -10,7 +10,7 @@
*/
import { BaseTreeEditorContribution, BaseTreeEditorWidget, TreeContextMenu, TreeEditor } from '@eclipse-emfcloud/theia-tree-editor';
import { CommandRegistry, MenuModelRegistry } from '@theia/core';
-import { ApplicationShell, NavigatableWidgetOptions, OpenerService, WidgetOpenerOptions } from '@theia/core/lib/browser';
+import { NavigatableWidgetOptions, OpenerService, WidgetOpenerOptions } from '@theia/core/lib/browser';
import URI from '@theia/core/lib/common/uri';
import { inject, injectable } from 'inversify';
@@ -21,7 +21,6 @@ import { CoffeeTreeLabelProvider } from './coffee-tree/coffee-tree-label-provide
@injectable()
export class CoffeeTreeEditorContribution extends BaseTreeEditorContribution {
- @inject(ApplicationShell) protected shell: ApplicationShell;
@inject(OpenerService) protected opener: OpenerService;
constructor(
@@ -41,13 +40,13 @@ export class CoffeeTreeEditorContribution extends BaseTreeEditorContribution {
return 0;
}
- registerCommands(commands: CommandRegistry): void {
+ override registerCommands(commands: CommandRegistry): void {
commands.registerCommand(CoffeeTreeCommands.OPEN_WORKFLOW_DIAGRAM, new OpenWorkflowDiagramCommandHandler(this.shell, this.opener));
super.registerCommands(commands);
}
- registerMenus(menus: MenuModelRegistry): void {
+ override registerMenus(menus: MenuModelRegistry): void {
menus.registerMenuAction(TreeContextMenu.CONTEXT_MENU, {
commandId: CoffeeTreeCommands.OPEN_WORKFLOW_DIAGRAM.id,
label: CoffeeTreeCommands.OPEN_WORKFLOW_DIAGRAM.label
diff --git a/web/coffee-editor-extension/src/browser/coffee-label-provider.ts b/client/coffee-editor-extension/src/browser/coffee-label-provider.ts
similarity index 95%
rename from web/coffee-editor-extension/src/browser/coffee-label-provider.ts
rename to client/coffee-editor-extension/src/browser/coffee-label-provider.ts
index a278aae9..facecced 100644
--- a/web/coffee-editor-extension/src/browser/coffee-label-provider.ts
+++ b/client/coffee-editor-extension/src/browser/coffee-label-provider.ts
@@ -32,7 +32,7 @@ export class CoffeeLabelProviderContribution implements LabelProviderContributio
}
getIcon(): string {
- return 'coffee-icon dark-purple';
+ return 'coffee-icon dark-purple default-file-icon';
}
// Do not need to specify getName() nor getLongName() because the default uri label provider handles this
diff --git a/web/coffee-editor-extension/src/browser/coffee-tree/coffee-model-service.ts b/client/coffee-editor-extension/src/browser/coffee-tree/coffee-model-service.ts
similarity index 100%
rename from web/coffee-editor-extension/src/browser/coffee-tree/coffee-model-service.ts
rename to client/coffee-editor-extension/src/browser/coffee-tree/coffee-model-service.ts
diff --git a/web/coffee-editor-extension/src/browser/coffee-tree/coffee-model.ts b/client/coffee-editor-extension/src/browser/coffee-tree/coffee-model.ts
similarity index 100%
rename from web/coffee-editor-extension/src/browser/coffee-tree/coffee-model.ts
rename to client/coffee-editor-extension/src/browser/coffee-tree/coffee-model.ts
diff --git a/web/coffee-editor-extension/src/browser/coffee-tree/coffee-node-factory.ts b/client/coffee-editor-extension/src/browser/coffee-tree/coffee-node-factory.ts
similarity index 100%
rename from web/coffee-editor-extension/src/browser/coffee-tree/coffee-node-factory.ts
rename to client/coffee-editor-extension/src/browser/coffee-tree/coffee-node-factory.ts
diff --git a/web/coffee-editor-extension/src/browser/coffee-tree/coffee-schemas.ts b/client/coffee-editor-extension/src/browser/coffee-tree/coffee-schemas.ts
similarity index 99%
rename from web/coffee-editor-extension/src/browser/coffee-tree/coffee-schemas.ts
rename to client/coffee-editor-extension/src/browser/coffee-tree/coffee-schemas.ts
index 5f700673..d0f8303b 100644
--- a/web/coffee-editor-extension/src/browser/coffee-tree/coffee-schemas.ts
+++ b/client/coffee-editor-extension/src/browser/coffee-tree/coffee-schemas.ts
@@ -372,7 +372,8 @@ export const coffeeSchema: JsonSchema7 = {
type: 'array',
items: {
// TODO[controlunit.ram array]
- // temporarily disable ref to ram object as it causes problems with the JSON forms array functionality for some reason
+ // temporarily disable ref to ram object as it causes problems with the JSON Forms
+ // array functionality for some reason
// '$ref': '#/definitions/ram',
title: 'RAM',
type: 'object',
diff --git a/web/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-container.ts b/client/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-container.ts
similarity index 100%
rename from web/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-container.ts
rename to client/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-container.ts
diff --git a/web/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-label-provider-contribution.ts b/client/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-label-provider-contribution.ts
similarity index 100%
rename from web/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-label-provider-contribution.ts
rename to client/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-label-provider-contribution.ts
diff --git a/web/coffee-editor-extension/src/browser/coffee-tree/model-server.ts b/client/coffee-editor-extension/src/browser/coffee-tree/model-server.ts
similarity index 72%
rename from web/coffee-editor-extension/src/browser/coffee-tree/model-server.ts
rename to client/coffee-editor-extension/src/browser/coffee-tree/model-server.ts
index 4c095c88..fdfde24a 100644
--- a/web/coffee-editor-extension/src/browser/coffee-tree/model-server.ts
+++ b/client/coffee-editor-extension/src/browser/coffee-tree/model-server.ts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2020 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -8,20 +8,20 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
*/
-import { ModelServerCommand, ModelServerCommandPackage, ModelServerObject } from '@eclipse-emfcloud/modelserver-theia';
+import { ModelServerCommand, ModelServerCommandPackage, ModelServerObject } from '@eclipse-emfcloud/modelserver-client';
export const ID_PROP = '@id';
export class AddAutomatedTaskCommand extends ModelServerCommand {
static readonly TYPE = 'addAutomatedTaskContribution';
- static readonly URI = ModelServerCommandPackage.NS_URI + '#//CompoundCommand';
- eClass = AddAutomatedTaskCommand.URI;
+ static override readonly URI = ModelServerCommandPackage.NS_URI + '#//CompoundCommand';
+ override eClass = AddAutomatedTaskCommand.URI;
constructor() {
super(AddAutomatedTaskCommand.TYPE, { positionX: '0.0', positionY: '0.0' });
}
- static is(object?: any): object is ModelServerCommand {
+ static override is(object?: any): object is ModelServerCommand {
return (
ModelServerObject.is(object) &&
object.eClass === AddAutomatedTaskCommand.URI &&
@@ -35,14 +35,14 @@ export class AddAutomatedTaskCommand extends ModelServerCommand {
export class AddManualTaskCommand extends ModelServerCommand {
static readonly TYPE = 'addManualTaskContribution';
- static readonly URI = ModelServerCommandPackage.NS_URI + '#//CompoundCommand';
- eClass = AddManualTaskCommand.URI;
+ static override readonly URI = ModelServerCommandPackage.NS_URI + '#//CompoundCommand';
+ override eClass = AddManualTaskCommand.URI;
constructor() {
super(AddManualTaskCommand.TYPE, { positionX: '0.0', positionY: '0.0' });
}
- static is(object?: any): object is ModelServerCommand {
+ static override is(object?: any): object is ModelServerCommand {
return (
ModelServerObject.is(object) &&
object.eClass === AddManualTaskCommand.URI &&
@@ -56,14 +56,14 @@ export class AddManualTaskCommand extends ModelServerCommand {
export class AddDecisionNodeCommand extends ModelServerCommand {
static readonly TYPE = 'addDecisionNodeContribution';
- static readonly URI = ModelServerCommandPackage.NS_URI + '#//CompoundCommand';
- eClass = AddDecisionNodeCommand.URI;
+ static override readonly URI = ModelServerCommandPackage.NS_URI + '#//CompoundCommand';
+ override eClass = AddDecisionNodeCommand.URI;
constructor() {
super(AddDecisionNodeCommand.TYPE, { positionX: '0.0', positionY: '0.0' });
}
- static is(object?: any): object is ModelServerCommand {
+ static override is(object?: any): object is ModelServerCommand {
return (
ModelServerObject.is(object) &&
object.eClass === AddDecisionNodeCommand.URI &&
@@ -77,14 +77,14 @@ export class AddDecisionNodeCommand extends ModelServerCommand {
export class AddMergeNodeCommand extends ModelServerCommand {
static readonly TYPE = 'addMergeNodeContribution';
- static readonly URI = ModelServerCommandPackage.NS_URI + '#//CompoundCommand';
- eClass = AddMergeNodeCommand.URI;
+ static override readonly URI = ModelServerCommandPackage.NS_URI + '#//CompoundCommand';
+ override eClass = AddMergeNodeCommand.URI;
constructor() {
super(AddMergeNodeCommand.TYPE, { positionX: '0.0', positionY: '0.0' });
}
- static is(object?: any): object is ModelServerCommand {
+ static override is(object?: any): object is ModelServerCommand {
return (
ModelServerObject.is(object) &&
object.eClass === AddMergeNodeCommand.URI &&
@@ -98,14 +98,14 @@ export class AddMergeNodeCommand extends ModelServerCommand {
export class AddFlowCommand extends ModelServerCommand {
static readonly TYPE = 'addFlowContribution';
- static readonly URI = ModelServerCommandPackage.NS_URI + '#//CompoundCommand';
- eClass = AddFlowCommand.URI;
+ static override readonly URI = ModelServerCommandPackage.NS_URI + '#//CompoundCommand';
+ override eClass = AddFlowCommand.URI;
constructor() {
super(AddFlowCommand.TYPE);
}
- static is(object?: any): object is ModelServerCommand {
+ static override is(object?: any): object is ModelServerCommand {
return (
ModelServerObject.is(object) &&
object.eClass === AddFlowCommand.URI &&
@@ -119,14 +119,14 @@ export class AddFlowCommand extends ModelServerCommand {
export class AddWeightedFlowCommand extends ModelServerCommand {
static readonly TYPE = 'addWeightedFlowContribution';
- static readonly URI = ModelServerCommandPackage.NS_URI + '#//CompoundCommand';
- eClass = AddWeightedFlowCommand.URI;
+ static override readonly URI = ModelServerCommandPackage.NS_URI + '#//CompoundCommand';
+ override eClass = AddWeightedFlowCommand.URI;
constructor() {
super(AddWeightedFlowCommand.TYPE);
}
- static is(object?: any): object is ModelServerCommand {
+ static override is(object?: any): object is ModelServerCommand {
return (
ModelServerObject.is(object) &&
object.eClass === AddWeightedFlowCommand.URI &&
@@ -140,14 +140,14 @@ export class AddWeightedFlowCommand extends ModelServerCommand {
export class SetTaskNameCommand extends ModelServerCommand {
static readonly TYPE = 'setTaskName';
- static readonly URI = ModelServerCommandPackage.NS_URI + '#//CompoundCommand';
- eClass = SetTaskNameCommand.URI;
+ static override readonly URI = ModelServerCommandPackage.NS_URI + '#//CompoundCommand';
+ override eClass = SetTaskNameCommand.URI;
constructor(taskId: string, newName: string) {
super(SetTaskNameCommand.TYPE, { semanticUriFragment: taskId, newName });
}
- static is(object?: any): object is ModelServerCommand {
+ static override is(object?: any): object is ModelServerCommand {
return (
ModelServerObject.is(object) &&
object.eClass === SetTaskNameCommand.URI &&
diff --git a/web/coffee-workflow-glsp-editor/tsconfig.json b/client/coffee-editor-extension/tsconfig.json
similarity index 69%
rename from web/coffee-workflow-glsp-editor/tsconfig.json
rename to client/coffee-editor-extension/tsconfig.json
index 0047c713..db92cb94 100644
--- a/web/coffee-workflow-glsp-editor/tsconfig.json
+++ b/client/coffee-editor-extension/tsconfig.json
@@ -1,5 +1,5 @@
{
- "extends": "../configs/base.tsconfig",
+ "extends": "@eclipse-glsp/ts-config/tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
@@ -7,6 +7,5 @@
},
"include": [
"src",
- "css"
]
}
diff --git a/web/coffee-java-extension/package.json b/client/coffee-java-extension/package.json
similarity index 70%
rename from web/coffee-java-extension/package.json
rename to client/coffee-java-extension/package.json
index 8dbc19bb..b8347906 100644
--- a/web/coffee-java-extension/package.json
+++ b/client/coffee-java-extension/package.json
@@ -1,9 +1,10 @@
{
"name": "coffee-java-extension",
- "license": "(EPL-2.0 OR MIT)",
"keywords": [
"theia-extension"
],
+ "license": "(EPL-2.0 OR MIT)",
+ "version": "0.1.0",
"contributors": [
{
"name": "Eclipse EMF.cloud Project",
@@ -17,33 +18,31 @@
},
"homepage": "https://www.eclipse.org/emfcloud/",
"bugs": "https://github.com/eclipse-emfcloud/coffee-editor/issues",
- "version": "0.7.0",
"files": [
"lib",
"src"
],
"dependencies": {
- "@theia/core": "^1.0.0",
- "@theia/terminal": "^1.0.0",
- "@theia/process": "^1.0.0",
+ "@theia/core": "^1.27.0",
+ "@theia/terminal": "^1.27.0",
+ "@theia/process": "^1.27.0",
"express": "4.17.1",
"glob": "7.1.4"
},
"devDependencies": {
"rimraf": "^2.6.1",
- "typescript": "^4.2.3"
+ "typescript": "~4.5.5"
},
"scripts": {
- "prepare": "yarn run clean && yarn run build",
- "clean": "rimraf lib",
+ "prepare": "yarn run clean && yarn run build && yarn lint",
+ "clean": "rimraf tsconfig.tsbuildinfo lib",
"lint": "eslint -c ../.eslintrc.js --ext .ts,.tsx ./src",
- "build": "tsc && yarn run lint",
+ "build": "tsc",
"watch": "tsc -w"
},
"theiaExtensions": [
{
- "frontend": "lib/browser/frontend-extension",
- "backend": "lib/node/backend-extension"
+ "frontend": "lib/browser/frontend-extension"
}
]
}
\ No newline at end of file
diff --git a/web/coffee-java-extension/src/browser/command-contribution.ts b/client/coffee-java-extension/src/browser/command-contribution.ts
similarity index 95%
rename from web/coffee-java-extension/src/browser/command-contribution.ts
rename to client/coffee-java-extension/src/browser/command-contribution.ts
index 89e0fc2c..c3e5bb31 100644
--- a/web/coffee-java-extension/src/browser/command-contribution.ts
+++ b/client/coffee-java-extension/src/browser/command-contribution.ts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2020 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,7 +47,7 @@ export class JavaGenerationCommandContribution implements CommandContribution, M
@inject(CommandService) protected readonly commandService: CommandService,
@inject(GenerateCodeService) protected readonly generateCodeService: GenerateCodeService,
@inject(JUnitRunService) private readonly junitRunService: JUnitRunService
- ) {}
+ ) { }
registerMenus(menus: MenuModelRegistry): void {
menus.registerMenuAction([...['navigator-context-menu'], '0_addition'], {
@@ -86,7 +86,7 @@ export class JavaGenerationCommandContribution implements CommandContribution, M
}
private newUriAwareCommandHandler(handler: UriCommandHandler): UriAwareCommandHandler {
- return new UriAwareCommandHandler(this.selectionService, handler);
+ return UriAwareCommandHandler.MonoSelect(this.selectionService, handler);
}
private isJUnitTestFile(fileUri: URI): boolean {
diff --git a/web/coffee-java-extension/src/browser/frontend-extension.ts b/client/coffee-java-extension/src/browser/frontend-extension.ts
similarity index 82%
rename from web/coffee-java-extension/src/browser/frontend-extension.ts
rename to client/coffee-java-extension/src/browser/frontend-extension.ts
index c4fe60b0..606b24c5 100644
--- a/web/coffee-java-extension/src/browser/frontend-extension.ts
+++ b/client/coffee-java-extension/src/browser/frontend-extension.ts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2020 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,7 +12,7 @@ import { CommandContribution, MenuContribution } from '@theia/core';
import { WebSocketConnectionProvider } from '@theia/core/lib/browser';
import { ContainerModule } from 'inversify';
-import { CODEGEN_SERVICE_PATH, CodeGenServer } from '../common/generate-protocol';
+import { JAVA_CODEGEN_SERVICE_PATH, JavaCodeGenServer } from '../common/generate-protocol';
import { JavaGenerationCommandContribution } from './command-contribution';
import { GenerateCodeService } from './generate-code-service';
import { JUnitRunService } from './junit-run-service';
@@ -22,10 +22,10 @@ export default new ContainerModule(bind => {
bind(GenerateCodeService).toSelf().inSingletonScope();
bind(JavaGenerationCommandContribution).toSelf().inSingletonScope();
[CommandContribution, MenuContribution].forEach(s => bind(s).toService(JavaGenerationCommandContribution));
- bind(CodeGenServer)
+ bind(JavaCodeGenServer)
.toDynamicValue(ctx => {
const connection = ctx.container.get(WebSocketConnectionProvider);
- return connection.createProxy(CODEGEN_SERVICE_PATH);
+ return connection.createProxy(JAVA_CODEGEN_SERVICE_PATH);
})
.inSingletonScope();
});
diff --git a/web/coffee-java-extension/src/browser/generate-code-service.ts b/client/coffee-java-extension/src/browser/generate-code-service.ts
similarity index 93%
rename from web/coffee-java-extension/src/browser/generate-code-service.ts
rename to client/coffee-java-extension/src/browser/generate-code-service.ts
index 6104b1f6..6a38115f 100644
--- a/web/coffee-java-extension/src/browser/generate-code-service.ts
+++ b/client/coffee-java-extension/src/browser/generate-code-service.ts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2020 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,7 +13,7 @@ import { PreferenceService } from '@theia/core/lib/browser';
import URI from '@theia/core/lib/common/uri';
import { inject, injectable } from 'inversify';
-import { CodeGenServer } from '../common/generate-protocol';
+import { JavaCodeGenServer } from '../common/generate-protocol';
// import { Workspace } from '@theia/languages/lib/browser';
@injectable()
@@ -23,7 +23,7 @@ export class GenerateCodeService {
constructor(
// @inject(Workspace) private readonly workspace: Workspace,
@inject(PreferenceService) private readonly preferenceService: PreferenceService,
- @inject(CodeGenServer) private readonly codeGenServer: CodeGenServer,
+ @inject(JavaCodeGenServer) private readonly codeGenServer: JavaCodeGenServer,
@inject(MessageService) protected readonly messageService: MessageService
) // @inject(ILogger) private readonly logger: ILogger
{
diff --git a/web/coffee-java-extension/src/browser/junit-run-service.ts b/client/coffee-java-extension/src/browser/junit-run-service.ts
similarity index 100%
rename from web/coffee-java-extension/src/browser/junit-run-service.ts
rename to client/coffee-java-extension/src/browser/junit-run-service.ts
diff --git a/web/coffee-java-extension/src/common/generate-protocol.ts b/client/coffee-java-extension/src/common/generate-protocol.ts
similarity index 66%
rename from web/coffee-java-extension/src/common/generate-protocol.ts
rename to client/coffee-java-extension/src/common/generate-protocol.ts
index ef4b1a6e..fd3fc28a 100644
--- a/web/coffee-java-extension/src/common/generate-protocol.ts
+++ b/client/coffee-java-extension/src/common/generate-protocol.ts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2020 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -10,9 +10,9 @@
*/
import { JsonRpcServer } from '@theia/core/lib/common/messaging';
-export const CodeGenServer = Symbol('CodeGenServer');
-export const CODEGEN_SERVICE_PATH = '/services/codegen';
+export const JavaCodeGenServer = Symbol('JavaCodeGenServer');
+export const JAVA_CODEGEN_SERVICE_PATH = '/services/codegen';
-export interface CodeGenServer extends JsonRpcServer {
+export interface JavaCodeGenServer extends JsonRpcServer {
generateCode(sourceFile: string, targetFolder: string, packageName: string): Promise;
}
diff --git a/web/coffee-editor-extension/tsconfig.json b/client/coffee-java-extension/tsconfig.json
similarity index 55%
rename from web/coffee-editor-extension/tsconfig.json
rename to client/coffee-java-extension/tsconfig.json
index 11272fc1..aa1c83a1 100644
--- a/web/coffee-editor-extension/tsconfig.json
+++ b/client/coffee-java-extension/tsconfig.json
@@ -1,11 +1,9 @@
{
- "extends": "../configs/base.tsconfig",
+ "extends": "@eclipse-glsp/ts-config/tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
},
- "include": [
- "src",
- ]
+ "include": ["src"]
}
diff --git a/web/coffee-server/package.json b/client/coffee-servers/package.json
similarity index 57%
rename from web/coffee-server/package.json
rename to client/coffee-servers/package.json
index 04198924..663ed7e6 100644
--- a/web/coffee-server/package.json
+++ b/client/coffee-servers/package.json
@@ -1,9 +1,10 @@
{
- "name": "coffee-server",
- "license": "(EPL-2.0 OR MIT)",
+ "name": "coffee-servers",
"keywords": [
"theia-extension"
],
+ "license": "(EPL-2.0 OR MIT)",
+ "version": "0.1.0",
"contributors": [
{
"name": "Eclipse EMF.cloud Project",
@@ -17,29 +18,32 @@
},
"homepage": "https://www.eclipse.org/emfcloud/",
"bugs": "https://github.com/eclipse-emfcloud/coffee-editor/issues",
- "version": "0.7.0",
"files": [
"build",
"lib",
"src"
],
"dependencies": {
- "@theia/core": "^1.0.0",
- "@theia/workspace": "^1.0.0",
- "@theia/process": "^1.0.0",
- "@eclipse-emfcloud/modelserver-theia": "next"
+ "@theia/core": "^1.27.0",
+ "@theia/workspace": "^1.27.0",
+ "@theia/process": "^1.27.0",
+ "@eclipse-emfcloud/modelserver-theia": "0.8.0-next",
+ "coffee-cpp-extension": "0.1.0",
+ "coffee-java-extension": "0.1.0",
+ "coffee-workflow-analyzer": "0.1.0",
+ "coffee-workflow-glsp-theia": "0.1.0"
},
"devDependencies": {
"rimraf": "^2.6.1",
- "typescript": "^4.2.3"
+ "typescript": "~4.5.5"
},
"scripts": {
- "prepare": "yarn run clean && yarn run build",
- "clean": "rimraf lib",
+ "prepare": "yarn run clean && yarn run build && yarn lint && yarn copy:servers",
+ "copy:servers": "rimraf servers && ts-node ./scripts/copy-servers.ts",
+ "clean": "rimraf tsconfig.tsbuildinfo lib",
"lint": "eslint -c ../.eslintrc.js --ext .ts,.tsx ./src",
- "build": "tsc && yarn run lint",
- "watch": "tsc -w",
- "download-server": "cd ./scripts && ./download-server.sh"
+ "build": "tsc",
+ "watch": "tsc -w"
},
"theiaExtensions": [
{
diff --git a/client/coffee-servers/scripts/copy-servers.ts b/client/coffee-servers/scripts/copy-servers.ts
new file mode 100644
index 00000000..2f64c003
--- /dev/null
+++ b/client/coffee-servers/scripts/copy-servers.ts
@@ -0,0 +1,59 @@
+/********************************************************************************
+ * Copyright (c) 2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ ********************************************************************************/
+import { join } from 'path';
+import { copyBackendDirectory, copyBackendFile, getOSProductPath, log } from './copy-utils';
+
+const start = new Date(Date.now());
+
+// Model Server
+const modelServerPath = join(__dirname, '..', '..', '..', 'backend', 'plugins', 'org.eclipse.emfcloud.coffee.modelserver');
+const modelServerLogConfigPath = join(modelServerPath, 'log4j2-embedded.xml');
+const modelServerJarPath = join(modelServerPath, 'target', 'org.eclipse.emfcloud.coffee.modelserver-0.1.0-SNAPSHOT-standalone.jar');
+
+// GLSP Server
+const glspServerPath = join(__dirname, '..', '..', '..', 'backend', 'plugins', 'org.eclipse.emfcloud.coffee.workflow.glsp.server');
+const glspServerJarPath = join(glspServerPath, 'target', 'org.eclipse.emfcloud.coffee.workflow.glsp.server-0.1.0-SNAPSHOT-glsp.jar');
+
+// Coffee products (Equinox servers)
+const coffeeProductsPath = join(__dirname, '..', '..', '..', 'backend', 'releng', 'org.eclipse.emfcloud.coffee.product', 'target', 'products');
+const osProductPath = getOSProductPath();
+const workflowDSLServerPath = join(coffeeProductsPath, 'org.eclipse.emfcloud.coffee.product.workflow.dsl', osProductPath, 'x86_64');
+const workflowAnalyerPath = join(coffeeProductsPath, 'org.eclipse.emfcloud.coffee.product.workflow.analyzer', osProductPath, 'x86_64');
+const javaCodeGenServerPath = join(coffeeProductsPath, 'org.eclipse.emfcloud.coffee.product.codegen', osProductPath, 'x86_64');
+const cppCodeGenServerPath = join(coffeeProductsPath, 'org.eclipse.emfcloud.coffee.product.codegen.cpp', osProductPath, 'x86_64');
+
+
+const targetDir = join(__dirname, '..', 'servers');
+
+log('Start copying Model Server JAR..');
+copyBackendFile(modelServerJarPath, targetDir, 'org.eclipse.emfcloud.coffee.modelserver-0.1.0-SNAPSHOT-standalone.jar');
+
+log('Start copying Model Server log4j2 config..');
+copyBackendFile(modelServerLogConfigPath, targetDir, 'model-server-log4j2-embedded.xml');
+
+log('Start copying GLSP Server JAR..');
+copyBackendFile(glspServerJarPath, targetDir, 'org.eclipse.emfcloud.coffee.workflow.glsp.server-0.1.0-SNAPSHOT-glsp.jar');
+
+log('Start copying Workflow DSL LSP backend product...');
+copyBackendDirectory(workflowDSLServerPath, join(targetDir, 'wf-lsp'));
+
+log('Start copying WorkflowAnalyzer backend product..');
+copyBackendDirectory(workflowAnalyerPath, join(targetDir, 'wf-analyzer'));
+
+log('Start copying Java CodeGen backend product..');
+copyBackendDirectory(javaCodeGenServerPath, join(targetDir, 'java-codegen'));
+
+log('Start copying C++ CodeGen backend product..');
+copyBackendDirectory(cppCodeGenServerPath, join(targetDir, 'cpp-codegen'));
+
+const end = new Date(Date.now());
+const elapsedTime = ((end.getTime() - start.getTime()) / 1000);
+log('Done in ' + elapsedTime + 's.');
diff --git a/client/coffee-servers/scripts/copy-utils.ts b/client/coffee-servers/scripts/copy-utils.ts
new file mode 100644
index 00000000..2f955a11
--- /dev/null
+++ b/client/coffee-servers/scripts/copy-utils.ts
@@ -0,0 +1,92 @@
+/********************************************************************************
+ * Copyright (c) 2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ ********************************************************************************/
+import { existsSync, mkdirSync, copyFileSync } from 'fs';
+import { copySync } from 'fs-extra';
+import { platform } from 'os';
+import { join } from 'path';
+import { exit } from 'process';
+
+export function log(logMsg: string): void {
+ const now = new Date(Date.now());
+ console.log(now.toISOString() + ' | ' + logMsg);
+}
+
+export function logError(logMsg: string): void {
+ const now = new Date(Date.now());
+ console.error(now.toISOString() + ' | ' + logMsg);
+}
+
+export function getOSProductPath(): string {
+ const osType = platform();
+ let productPath = '';
+
+ log('Determining OS...');
+ if (osType === 'linux') {
+ productPath = 'linux/gtk';
+ log('Running on Linux');
+ } else if (osType === 'darwin') {
+ productPath = 'macosx/cocoa';
+ log('Running on MacOS');
+ } else if (osType === 'cygwin') {
+ // POSIX compatibility layer and Linux environment emulation for Windows
+ productPath = 'win32\win32';
+ log('Running on Windows with Cygwin');
+ } else if (osType === 'win32') {
+ productPath = 'win32\win32';
+ log('Running on Windows');
+ }
+ return productPath;
+}
+
+function prepareTargetDir(targetPath: string): void {
+ // Check if target directory exists, create otherwise
+ if (existsSync(targetPath)) {
+ log('Target directory exists!');
+ } else {
+ try {
+ log('Creating target directory...');
+ mkdirSync(targetPath, { recursive: true });
+ log(`Target directory '${targetPath}' was created successfully!`);
+ } catch (err) {
+ if (err instanceof Error) {
+ logError(err.message);
+ }
+ }
+ }
+}
+
+function checkSourcePath(sourcePath: string): void {
+ if (!existsSync(sourcePath)) {
+ logError(`Error: Source path '${sourcePath}' does not exist!`);
+ exit(1);
+ }
+ log('Source directory exists!')
+}
+
+export function copyBackendDirectory(sourcePath: string, targetPath: string): void {
+ // Check source directory
+ checkSourcePath(sourcePath);
+ // Check and prepare target directory
+ prepareTargetDir(targetPath);
+ // Start copying
+ copySync(sourcePath, targetPath, { recursive: true, overwrite: false });
+ log(`Copy to '${targetPath} was successful!`)
+}
+
+export function copyBackendFile(sourcePath: string, targetPath: string, jarName: string): void {
+ // Check source file
+ checkSourcePath(sourcePath);
+ // Check and prepare target directory
+ prepareTargetDir(targetPath);
+ // Start copying
+ copyFileSync(sourcePath, join(targetPath, jarName));
+ log(`Copy to '${targetPath} was successful!`)
+}
diff --git a/web/coffee-server/src/browser/coffee-server-frontend-module.ts b/client/coffee-servers/src/browser/coffee-server-frontend-module.ts
similarity index 100%
rename from web/coffee-server/src/browser/coffee-server-frontend-module.ts
rename to client/coffee-servers/src/browser/coffee-server-frontend-module.ts
diff --git a/web/coffee-server/src/browser/coffee-timeout-dialog.tsx b/client/coffee-servers/src/browser/coffee-timeout-dialog.tsx
similarity index 91%
rename from web/coffee-server/src/browser/coffee-timeout-dialog.tsx
rename to client/coffee-servers/src/browser/coffee-timeout-dialog.tsx
index 08d28911..52cdd9d0 100644
--- a/web/coffee-server/src/browser/coffee-timeout-dialog.tsx
+++ b/client/coffee-servers/src/browser/coffee-timeout-dialog.tsx
@@ -21,7 +21,7 @@ export class TimeoutDialogProps extends DialogProps {}
export class TimeoutDialog extends ReactDialog {
protected readonly okButton: HTMLButtonElement;
- constructor(@inject(TimeoutDialogProps) protected readonly props: TimeoutDialogProps) {
+ constructor(@inject(TimeoutDialogProps) protected override readonly props: TimeoutDialogProps) {
super(props);
this.appendAcceptButton('Ok');
}
@@ -49,7 +49,7 @@ export class TimeoutDialog extends ReactDialog {
);
}
- protected onAfterAttach(msg: Message): void {
+ protected override onAfterAttach(msg: Message): void {
super.onAfterAttach(msg);
this.update();
}
diff --git a/client/coffee-servers/src/node/backend-module.ts b/client/coffee-servers/src/node/backend-module.ts
new file mode 100644
index 00000000..fab5c7ed
--- /dev/null
+++ b/client/coffee-servers/src/node/backend-module.ts
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2019-2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ */
+import { LaunchOptions } from '@eclipse-emfcloud/modelserver-theia/lib/node';
+import { GLSPServerContribution } from '@eclipse-glsp/theia-integration/lib/node';
+import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core/lib/common/messaging';
+import { BackendApplicationContribution } from '@theia/core/lib/node';
+import { ContainerModule } from '@theia/core/shared/inversify';
+import { CppCodeGenServer, CPP_CODEGEN_SERVICE_PATH } from 'coffee-cpp-extension/lib/common/generate-protocol';
+import { JavaCodeGenServer, JAVA_CODEGEN_SERVICE_PATH } from 'coffee-java-extension/lib/common/generate-protocol';
+import { WorkflowAnalysisClient, workflowServicePath } from 'coffee-workflow-analyzer/lib/common/workflow-analyze-protocol';
+
+import { CoffeeCppCodeGenServer } from './cpp-codegen-server';
+import { WorkflowGLSPServerContribution } from './glsp-server-contribution';
+import { CoffeeJavaCodeGenServer } from './java-codegen-server';
+import { WorkflowModelServerLaunchOptions } from './model-server-launch-options';
+import { WorkflowAnalysisServer } from './workflow-analysis-server';
+import { WorkflowLSPServer } from './workflow-dsl-lsp-server';
+
+export default new ContainerModule((bind, _unbind, isBound, rebind) => {
+ // Model Server
+ if (isBound(LaunchOptions)) {
+ rebind(LaunchOptions).to(WorkflowModelServerLaunchOptions).inSingletonScope();
+ } else {
+ bind(LaunchOptions).to(WorkflowModelServerLaunchOptions).inSingletonScope();
+ }
+
+ // GLSP Server
+ bind(WorkflowGLSPServerContribution).toSelf().inSingletonScope();
+ bind(GLSPServerContribution).toService(WorkflowGLSPServerContribution);
+
+ // Workflow DSL LSP Server
+ bind(WorkflowLSPServer).toSelf().inSingletonScope();
+ bind(BackendApplicationContribution).toService(WorkflowLSPServer);
+
+ // Workflow Analysis Server
+ bind(WorkflowAnalysisServer).toSelf().inSingletonScope();
+ bind(BackendApplicationContribution).toService(WorkflowAnalysisServer);
+ bind(ConnectionHandler)
+ .toDynamicValue(
+ ctx =>
+ new JsonRpcConnectionHandler(workflowServicePath, client => {
+ const analysisServer = ctx.container.get(WorkflowAnalysisServer);
+ analysisServer.setClient(client);
+ return analysisServer;
+ })
+ )
+ .inSingletonScope();
+
+ // Java Codegen Server
+ bind(CoffeeJavaCodeGenServer).toSelf().inSingletonScope();
+ bind(BackendApplicationContribution).toService(CoffeeJavaCodeGenServer);
+ bind(ConnectionHandler)
+ .toDynamicValue(
+ ctx => new JsonRpcConnectionHandler(
+ JAVA_CODEGEN_SERVICE_PATH,
+ () => ctx.container.get(CoffeeJavaCodeGenServer))
+ )
+ .inSingletonScope();
+
+ // CPP Codegen Server
+ bind(CoffeeCppCodeGenServer).toSelf().inSingletonScope();
+ bind(BackendApplicationContribution).toService(CoffeeCppCodeGenServer);
+ bind(ConnectionHandler)
+ .toDynamicValue(
+ ctx => new JsonRpcConnectionHandler(
+ CPP_CODEGEN_SERVICE_PATH,
+ () => ctx.container.get(CoffeeCppCodeGenServer))
+ )
+ .inSingletonScope();
+});
diff --git a/client/coffee-servers/src/node/cpp-codegen-server.ts b/client/coffee-servers/src/node/cpp-codegen-server.ts
new file mode 100644
index 00000000..33a4d6bc
--- /dev/null
+++ b/client/coffee-servers/src/node/cpp-codegen-server.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2021-2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ */
+import { CppCodeGenServer } from 'coffee-cpp-extension/lib/common/generate-protocol';
+import { injectable } from 'inversify';
+import { EquinoxServer } from './equinox-server';
+
+@injectable()
+export class CoffeeCppCodeGenServer extends EquinoxServer implements CppCodeGenServer {
+
+ protected serverName = 'CoffeeCppCodeGenServer';
+
+ generateCode(sourceFile: string, targetFolder: string, packageName: string): Promise {
+ const command = 'java';
+
+ const jarPath = this.getEquinoxJarPath('cpp-codegen');
+ if (jarPath.length === 0) {
+ throw new Error('CoffeeCppCodeGenServer launcher not found.');
+ }
+ const args: string[] = ['-jar', jarPath, '-targetFolder', targetFolder, '-source', sourceFile, '-packageName', packageName];
+
+ return new Promise(resolve => {
+ const process = this.spawnProcess(command, args);
+ if (process === undefined || process.process === undefined) {
+ resolve('Process not spawned');
+ return;
+ }
+ process.process.on('exit', code => {
+ switch (code) {
+ case 0:
+ resolve('OK');
+ break;
+ case -10:
+ resolve('Target Folder Parameter missing');
+ break;
+ case -11:
+ resolve('Source File Parameter missing');
+ break;
+ case -12:
+ resolve('Package Name Parameter missing');
+ break;
+ case -20:
+ resolve('Encoding not found, check Server Log!');
+ break;
+ case -30:
+ resolve('IO Exception occurred, check Server Log!');
+ break;
+ default:
+ resolve('UNKNOWN ERROR');
+ break;
+ }
+ });
+ });
+ }
+
+}
diff --git a/web/coffee-server/src/node/workflow-lsp-launcher.ts b/client/coffee-servers/src/node/equinox-server.ts
similarity index 51%
rename from web/coffee-server/src/node/workflow-lsp-launcher.ts
rename to client/coffee-servers/src/node/equinox-server.ts
index 6ddd883d..41168387 100644
--- a/web/coffee-server/src/node/workflow-lsp-launcher.ts
+++ b/client/coffee-servers/src/node/equinox-server.ts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -8,47 +8,42 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
*/
-import { ILogger } from '@theia/core';
-import { BackendApplicationContribution } from '@theia/core/lib/node';
+import { ILogger } from '@theia/core/lib/common/logger';
+import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';
import { inject, injectable } from '@theia/core/shared/inversify';
import { ProcessErrorEvent } from '@theia/process/lib/node/process';
import { RawProcess, RawProcessFactory } from '@theia/process/lib/node/raw-process';
-import * as cp from 'child_process';
+import { SpawnOptions } from 'child_process';
+import { Application } from 'express';
+import { sync } from 'glob';
+import { join, resolve as resolvePath } from 'path';
import * as process from 'process';
-import { getJarPath, inDebugMode } from './backend-module';
-
@injectable()
-export class WorkflowLSPServerLauncher implements BackendApplicationContribution {
+export abstract class EquinoxServer implements BackendApplicationContribution {
+
+ protected abstract serverName: string;
+
@inject(RawProcessFactory) protected readonly processFactory: RawProcessFactory;
@inject(ILogger) private readonly logger: ILogger;
- initialize(): void {
- if (inDebugMode()) {
- return;
- }
- const command = 'java';
-
- const jarPath = getJarPath('lsp');
- if (jarPath.length === 0) {
- throw new Error('[WorkflowDSL] Server launcher not found.');
- }
- const args: string[] = ['-jar', jarPath, '-startSocket'];
+ protected getEquinoxJarPath(serverDir: string): string {
+ const serverPath = resolvePath(join(__dirname, '..', '..', 'servers', serverDir));
+ const jarPaths = sync('**/plugins/org.eclipse.equinox.launcher_*.jar', { cwd: serverPath });
+ const jarPath = resolvePath(serverPath, jarPaths[0]);
+ return jarPath;
+ }
- this.logger.info('[WorkflowDSL] Spawn Server Process from ' + jarPath);
- const spawnedProcess = this.spawnProcessAsync(command, args, {
- detached: true,
- shell: true,
- stdio: ['inherit', 'pipe']
- });
- process.on('beforeExit', () => {
- spawnedProcess.then(p => p.kill());
- });
+ protected inDebugMode(): boolean {
+ const args = process.argv.filter(a => a.startsWith('--debug'));
+ return args.length > 0;
}
- protected async spawnProcessAsync(command: string, args?: string[], options?: cp.SpawnOptions): Promise {
- // delay start as we need the model server to be started
- await new Promise(r => setTimeout(r, 10000));
+ protected async spawnProcessAsync(command: string, args?: string[], options?: SpawnOptions, delayStart = true): Promise {
+ if (delayStart) {
+ // delay start as we need the model server to be started
+ await new Promise(r => setTimeout(r, 10000));
+ }
const rawProcess = this.processFactory({ command, args, options });
rawProcess.errorStream.on('data', this.logError.bind(this));
rawProcess.outputStream.on('data', this.logInfo.bind(this));
@@ -68,19 +63,44 @@ export class WorkflowLSPServerLauncher implements BackendApplicationContribution
});
}
+ protected spawnProcess(command: string, args?: string[]): RawProcess | undefined {
+ const rawProcess = this.processFactory({ command, args });
+ if (rawProcess.process === undefined) {
+ return undefined;
+ }
+ rawProcess.process.on('error', this.onDidFailSpawnProcess.bind(this));
+ const stderr = rawProcess.process.stderr;
+ if (stderr) {
+ stderr.on('data', this.logError.bind(this));
+ }
+ return rawProcess;
+ }
+
protected onDidFailSpawnProcess(error: Error | ProcessErrorEvent): void {
this.logError(error.message);
}
protected logError(data: string | Buffer): void {
if (data) {
- this.logger.error(`WorkflowLSPServerLauncher: ${data}`);
+ this.logger.error(`[${this.serverName}]: ${data}`);
}
}
protected logInfo(data: string | Buffer): void {
if (data) {
- this.logger.info(`WorkflowLSPServerLauncher: ${data}`);
+ this.logger.info(`[${this.serverName}]: ${data}`);
}
}
+
+ onStop(_app?: Application): void {
+ this.dispose();
+ }
+
+ dispose(): void {
+ // do nothing
+ }
+
+ setClient(_client?: any): void {
+ // do nothing
+ }
}
diff --git a/client/coffee-servers/src/node/glsp-server-contribution.ts b/client/coffee-servers/src/node/glsp-server-contribution.ts
new file mode 100644
index 00000000..51abdc36
--- /dev/null
+++ b/client/coffee-servers/src/node/glsp-server-contribution.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2020-2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ */
+import { getPort, GLSPSocketServerContribution, GLSPSocketServerContributionOptions } from '@eclipse-glsp/theia-integration/lib/node';
+import { injectable } from '@theia/core/shared/inversify';
+import { join, resolve } from 'path';
+import { WorkflowNotationLanguage } from 'coffee-workflow-glsp-theia/lib/common';
+
+export const GLSP_PORT = 5008;
+export const PORT_ARG_KEY = 'WF_GLSP';
+export const LOG_DIR = join(__dirname, '..', '..', 'logs');
+
+const SERVER_DIR_PATH = join(__dirname, '..', '..', 'servers');
+const JAR_FILE = resolve(join(SERVER_DIR_PATH, 'org.eclipse.emfcloud.coffee.workflow.glsp.server-0.1.0-SNAPSHOT-glsp.jar'));
+
+@injectable()
+export class WorkflowGLSPServerContribution extends GLSPSocketServerContribution {
+ readonly id = WorkflowNotationLanguage.contributionId;
+
+ createContributionOptions(): Partial {
+ return {
+ executable: JAR_FILE,
+ additionalArgs: ['--consoleLog', 'false', '--fileLog', 'true', '--logDir', LOG_DIR],
+ socketConnectionOptions: {
+ port: getPort(PORT_ARG_KEY, GLSP_PORT)
+ }
+ };
+ }
+}
diff --git a/client/coffee-servers/src/node/java-codegen-server.ts b/client/coffee-servers/src/node/java-codegen-server.ts
new file mode 100644
index 00000000..697098e0
--- /dev/null
+++ b/client/coffee-servers/src/node/java-codegen-server.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2021-2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ */
+import { JavaCodeGenServer } from 'coffee-java-extension/lib/common/generate-protocol';
+import { injectable } from 'inversify';
+import { EquinoxServer } from './equinox-server';
+
+@injectable()
+export class CoffeeJavaCodeGenServer extends EquinoxServer implements JavaCodeGenServer {
+
+ protected serverName = 'CoffeeJavaCodeGenServer';
+
+ generateCode(sourceFile: string, targetFolder: string, packageName: string): Promise {
+ const command = 'java';
+
+ const jarPath = this.getEquinoxJarPath('java-codegen');
+ if (jarPath.length === 0) {
+ throw new Error('CoffeeJavaCodeGenServer launcher not found.');
+ }
+ const args: string[] = ['-jar', jarPath, '-targetFolder', targetFolder, '-source', sourceFile, '-packageName', packageName];
+
+ return new Promise(resolve => {
+ const process = this.spawnProcess(command, args);
+ if (process === undefined || process.process === undefined) {
+ resolve('Process not spawned');
+ return;
+ }
+ process.process.on('exit', code => {
+ switch (code) {
+ case 0:
+ resolve('OK');
+ break;
+ case -10:
+ resolve('Target Folder Parameter missing');
+ break;
+ case -11:
+ resolve('Source File Parameter missing');
+ break;
+ case -12:
+ resolve('Package Name Parameter missing');
+ break;
+ case -20:
+ resolve('Encoding not found, check Server Log!');
+ break;
+ case -30:
+ resolve('IO Exception occurred, check Server Log!');
+ break;
+ default:
+ resolve('UNKNOWN ERROR');
+ break;
+ }
+ });
+ });
+ }
+
+}
diff --git a/client/coffee-servers/src/node/model-server-launch-options.ts b/client/coffee-servers/src/node/model-server-launch-options.ts
new file mode 100644
index 00000000..b4b29031
--- /dev/null
+++ b/client/coffee-servers/src/node/model-server-launch-options.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ */
+import { LaunchOptions } from '@eclipse-emfcloud/modelserver-theia/lib/node';
+import { injectable } from '@theia/core/shared/inversify';
+import { join, resolve } from 'path';
+
+const SERVER_DIR_PATH = join(__dirname, '..', '..', 'servers');
+
+const JAR_FILE_PATH = resolve(join(SERVER_DIR_PATH, 'org.eclipse.emfcloud.coffee.modelserver-0.1.0-SNAPSHOT-standalone.jar'));
+const LOG_FILE_PATH = resolve(join(SERVER_DIR_PATH, 'model-server-log4j2-embedded.xml'));
+
+/** Options for the `ModelServerLauncher` to use to start the Model Server */
+@injectable()
+export class WorkflowModelServerLaunchOptions implements LaunchOptions {
+ baseURL = 'api/v2/';
+ serverPort = 8081;
+ hostname = 'localhost';
+ jarPath = JAR_FILE_PATH;
+ additionalArgs = [`-l=${LOG_FILE_PATH}`];
+}
diff --git a/web/coffee-workflow-analyzer/src/node/workflow-analysis-server.ts b/client/coffee-servers/src/node/workflow-analysis-server.ts
similarity index 64%
rename from web/coffee-workflow-analyzer/src/node/workflow-analysis-server.ts
rename to client/coffee-servers/src/node/workflow-analysis-server.ts
index 7b89246e..1cbdc000 100644
--- a/web/coffee-workflow-analyzer/src/node/workflow-analysis-server.ts
+++ b/client/coffee-servers/src/node/workflow-analysis-server.ts
@@ -8,22 +8,18 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
*/
-import { ILogger, MaybePromise } from '@theia/core';
+import { MaybePromise } from '@theia/core';
import URI from '@theia/core/lib/common/uri';
import { BackendApplicationContribution, FileUri } from '@theia/core/lib/node';
-import { ProcessErrorEvent } from '@theia/process/lib/node/process';
-import { RawProcess, RawProcessFactory } from '@theia/process/lib/node/raw-process';
-import * as cp from 'child_process';
import { Application } from 'express';
import * as fs from 'fs-extra';
-import * as glob from 'glob';
-import { inject, injectable } from 'inversify';
+import { injectable } from 'inversify';
import * as net from 'net';
-import * as path from 'path';
import * as rpc from 'vscode-jsonrpc';
import { createSocketConnection } from 'vscode-ws-jsonrpc/lib/server';
-import { WorkflowAnalysisClient, WorkflowAnalyzer } from '../common/workflow-analyze-protocol';
+import { WorkflowAnalysisClient, WorkflowAnalyzer } from 'coffee-workflow-analyzer/lib/common/workflow-analyze-protocol';
+import { EquinoxServer } from './equinox-server';
/**
* The return type of the `FileSystem#resolveContent` method.
@@ -43,7 +39,7 @@ interface FileStatWithContent {
// const DEFAULT_PORT = 8024;
@injectable()
-export class WorkflowAnalysisServer implements WorkflowAnalyzer, BackendApplicationContribution {
+export class WorkflowAnalysisServer extends EquinoxServer implements WorkflowAnalyzer, BackendApplicationContribution {
/**
* Endpoint path to handle the request for the given resource.
*/
@@ -52,10 +48,7 @@ export class WorkflowAnalysisServer implements WorkflowAnalyzer, BackendApplicat
private connection?: rpc.MessageConnection;
private client?: WorkflowAnalysisClient;
- constructor(
- @inject(RawProcessFactory) protected readonly processFactory: RawProcessFactory,
- @inject(ILogger) private readonly logger: ILogger
- ) {}
+ protected serverName = 'WorkflowAnalysisServer';
initialize(): void {
const port = this.getPort();
@@ -64,9 +57,9 @@ export class WorkflowAnalysisServer implements WorkflowAnalyzer, BackendApplicat
} else {
const command = 'java';
- const jarPath = this.getJarPath();
+ const jarPath = this.getEquinoxJarPath('wf-analyzer');
const args: string[] = ['-jar', jarPath];
- this.spawnProcessAsync(command, args).then(process => {
+ this.spawnProcessAsync(command, args, undefined, false).then(process => {
this.connection = rpc.createMessageConnection(process.outputStream, process.inputStream);
this.connection.listen();
});
@@ -107,20 +100,11 @@ export class WorkflowAnalysisServer implements WorkflowAnalyzer, BackendApplicat
return Number.parseInt(arg.substring('--WF_ANALYZER='.length), 10);
}
}
- private getJarPath(): string {
- const serverPath = path.resolve(__dirname, '..', '..', 'server');
- const jarPaths = glob.sync('**/plugins/org.eclipse.equinox.launcher_*.jar', { cwd: serverPath });
- if (jarPaths.length === 0) {
- throw new Error('[WorkflowAnalyzer] Server launcher not found.');
- }
- const jarPath = path.resolve(serverPath, jarPaths[0]);
- return jarPath;
- }
private async connect(port: number): Promise {
const socket = new net.Socket();
const connection = createSocketConnection(socket, socket, () => {
- this.logger.info('[WorkflowAnalyzer] Socket connection disposed');
+ this.logInfo('Socket connection disposed');
socket.destroy();
});
socket.connect(port!);
@@ -128,49 +112,29 @@ export class WorkflowAnalysisServer implements WorkflowAnalyzer, BackendApplicat
this.connection.listen();
}
- onStop(app?: Application): void {
- this.dispose();
- }
-
- dispose(): void {
+ override dispose(): void {
if (this.connection) {
this.connection.dispose();
}
}
- protected spawnProcessAsync(command: string, args?: string[], options?: cp.SpawnOptions): Promise {
- const rawProcess = this.processFactory({ command, args, options });
- rawProcess.errorStream.on('data', this.showError.bind(this));
- return new Promise((resolve, reject) => {
- rawProcess.onError((error: ProcessErrorEvent) => {
- this.onDidFailSpawnProcess(error);
- if (error.code === 'ENOENT') {
- const guess = command.split(/\s+/).shift();
- if (guess) {
- reject(new Error(`Failed to spawn ${guess}\nPerhaps it is not on the PATH.`));
- return;
- }
- }
- reject(error);
- });
- process.nextTick(() => resolve(rawProcess));
- });
- }
-
- protected onDidFailSpawnProcess(error: Error): void {
+ protected override onDidFailSpawnProcess(error: Error): void {
if (this.client) {
this.client.reportStatus({ status: 'error', message: error.message });
}
+ super.onDidFailSpawnProcess(error);
}
- protected showError(data: string | Buffer): void {
+ protected override logError(data: string | Buffer): void {
if (data) {
if (this.client) {
this.client.reportStatus({ status: 'error', message: data.toString() });
}
}
+ super.logError(data);
}
- setClient(client: WorkflowAnalysisClient): void {
+
+ override setClient(client: WorkflowAnalysisClient): void {
this.client = client;
}
diff --git a/client/coffee-servers/src/node/workflow-dsl-lsp-server.ts b/client/coffee-servers/src/node/workflow-dsl-lsp-server.ts
new file mode 100644
index 00000000..d9e8b9de
--- /dev/null
+++ b/client/coffee-servers/src/node/workflow-dsl-lsp-server.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2020-2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ */
+import { BackendApplicationContribution } from '@theia/core/lib/node';
+import { injectable } from '@theia/core/shared/inversify';
+import * as process from 'process';
+
+import { EquinoxServer } from './equinox-server';
+
+@injectable()
+export class WorkflowLSPServer extends EquinoxServer implements BackendApplicationContribution {
+
+ protected serverName = 'WorkflowLSPServer';
+
+ initialize(): void {
+ if (this.inDebugMode()) {
+ return;
+ }
+ const command = 'java';
+
+ const jarPath = this.getEquinoxJarPath('wf-lsp');
+ if (jarPath.length === 0) {
+ throw new Error('WorkflowLSPServer launcher not found.');
+ }
+ const args: string[] = ['-jar', jarPath, '-startSocket'];
+
+ this.logInfo('Spawn Server Process from ' + jarPath);
+ const spawnedProcess = this.spawnProcessAsync(command, args, {
+ detached: true,
+ shell: true,
+ stdio: ['inherit', 'pipe']
+ });
+ process.on('beforeExit', () => {
+ spawnedProcess.then(p => p.kill());
+ });
+ }
+
+}
diff --git a/web/coffee-java-extension/tsconfig.json b/client/coffee-servers/tsconfig.json
similarity index 55%
rename from web/coffee-java-extension/tsconfig.json
rename to client/coffee-servers/tsconfig.json
index 11272fc1..aa1c83a1 100644
--- a/web/coffee-java-extension/tsconfig.json
+++ b/client/coffee-servers/tsconfig.json
@@ -1,11 +1,9 @@
{
- "extends": "../configs/base.tsconfig",
+ "extends": "@eclipse-glsp/ts-config/tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
},
- "include": [
- "src",
- ]
+ "include": ["src"]
}
diff --git a/web/coffee-welcome-page/package.json b/client/coffee-welcome-page/package.json
similarity index 67%
rename from web/coffee-welcome-page/package.json
rename to client/coffee-welcome-page/package.json
index 4c24b472..2a249e6e 100644
--- a/web/coffee-welcome-page/package.json
+++ b/client/coffee-welcome-page/package.json
@@ -1,9 +1,10 @@
{
"name": "coffee-welcome-page",
- "license": "(EPL-2.0 OR MIT)",
"keywords": [
"theia-extension"
],
+ "license": "(EPL-2.0 OR MIT)",
+ "version": "0.1.0",
"contributors": [
{
"name": "Eclipse EMF.cloud Project",
@@ -17,29 +18,28 @@
},
"homepage": "https://www.eclipse.org/emfcloud/",
"bugs": "https://github.com/eclipse-emfcloud/coffee-editor/issues",
- "version": "0.7.0",
"files": [
"lib",
"src"
],
"dependencies": {
- "@theia/core": "^1.0.0",
- "@theia/workspace": "^1.0.0",
- "@theia/keymaps": "^1.0.0",
- "@theia/filesystem": "^1.0.0",
- "@theia/navigator": "^1.0.0",
- "@theia/debug": "^1.0.0",
- "coffee-java-extension": "0.7.0"
+ "@theia/core": "^1.27.0",
+ "@theia/workspace": "^1.27.0",
+ "@theia/keymaps": "^1.27.0",
+ "@theia/filesystem": "^1.27.0",
+ "@theia/navigator": "^1.27.0",
+ "@theia/debug": "^1.27.0",
+ "coffee-java-extension": "0.1.0"
},
"devDependencies": {
"rimraf": "^2.6.1",
- "typescript": "^4.2.3"
+ "typescript": "~4.5.5"
},
"scripts": {
- "prepare": "yarn run clean && yarn run build",
- "clean": "rimraf lib",
- "build": "tsc && yarn run lint",
+ "prepare": "yarn run clean && yarn run build && yarn lint",
+ "clean": "rimraf tsconfig.tsbuildinfo lib",
"lint": "eslint -c ../.eslintrc.js --ext .ts,.tsx ./src",
+ "build": "tsc",
"watch": "tsc -w"
},
"theiaExtensions": [
diff --git a/web/coffee-welcome-page/src/browser/coffee-welcome-page-contribution.ts b/client/coffee-welcome-page/src/browser/coffee-welcome-page-contribution.ts
similarity index 94%
rename from web/coffee-welcome-page/src/browser/coffee-welcome-page-contribution.ts
rename to client/coffee-welcome-page/src/browser/coffee-welcome-page-contribution.ts
index 962a3a52..6f856ca4 100644
--- a/web/coffee-welcome-page/src/browser/coffee-welcome-page-contribution.ts
+++ b/client/coffee-welcome-page/src/browser/coffee-welcome-page-contribution.ts
@@ -48,13 +48,13 @@ export class CoffeeWelcomePageContribution extends AbstractViewContribution this.openView({ reveal: true })
});
}
- registerMenus(menus: MenuModelRegistry): void {
+ override registerMenus(menus: MenuModelRegistry): void {
menus.registerMenuAction(CommonMenus.HELP, {
commandId: WelcomePageCommand.id,
label: WelcomePageCommand.label,
diff --git a/web/coffee-welcome-page/src/browser/coffee-welcome-page-frontend-module.ts b/client/coffee-welcome-page/src/browser/coffee-welcome-page-frontend-module.ts
similarity index 100%
rename from web/coffee-welcome-page/src/browser/coffee-welcome-page-frontend-module.ts
rename to client/coffee-welcome-page/src/browser/coffee-welcome-page-frontend-module.ts
diff --git a/web/coffee-welcome-page/src/browser/style/index.css b/client/coffee-welcome-page/src/browser/style/index.css
similarity index 100%
rename from web/coffee-welcome-page/src/browser/style/index.css
rename to client/coffee-welcome-page/src/browser/style/index.css
diff --git a/web/coffee-welcome-page/src/browser/welcome-page-widget.tsx b/client/coffee-welcome-page/src/browser/welcome-page-widget.tsx
similarity index 99%
rename from web/coffee-welcome-page/src/browser/welcome-page-widget.tsx
rename to client/coffee-welcome-page/src/browser/welcome-page-widget.tsx
index f4028558..83258d71 100644
--- a/web/coffee-welcome-page/src/browser/welcome-page-widget.tsx
+++ b/client/coffee-welcome-page/src/browser/welcome-page-widget.tsx
@@ -94,7 +94,8 @@ export class WelcomePageWidget extends ReactWidget {
'codicon codicon-preview',
This editor allows to edit elements in a form-based view along with a tree showing the hierarchy of the
- model instances. This allows to efficiently browse the model and enter data. The form editor is based on{' '}
+ model instances. This allows to efficiently browse the model and enter data.
+ The form editor is based on{' '}
JSON Forms
diff --git a/web/coffee-server/tsconfig.json b/client/coffee-welcome-page/tsconfig.json
similarity index 62%
rename from web/coffee-server/tsconfig.json
rename to client/coffee-welcome-page/tsconfig.json
index 0943fbc9..13deb166 100644
--- a/web/coffee-server/tsconfig.json
+++ b/client/coffee-welcome-page/tsconfig.json
@@ -1,11 +1,11 @@
{
- "extends": "../configs/base.tsconfig",
+ "extends": "@eclipse-glsp/ts-config/tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
},
"include": [
- "src"
+ "src"
]
}
\ No newline at end of file
diff --git a/web/coffee-workflow-analyzer-editor/package.json b/client/coffee-workflow-analyzer-editor/package.json
similarity index 79%
rename from web/coffee-workflow-analyzer-editor/package.json
rename to client/coffee-workflow-analyzer-editor/package.json
index 1ff94037..3e61a46e 100644
--- a/web/coffee-workflow-analyzer-editor/package.json
+++ b/client/coffee-workflow-analyzer-editor/package.json
@@ -2,8 +2,9 @@
"name": "coffee-workflow-analyzer-editor",
"private": true,
"displayName": "coffee-workflow-analyzer-editor",
- "license": "(EPL-2.0 OR MIT)",
"publisher": "Eclipse-EMFcloud",
+ "license": "(EPL-2.0 OR MIT)",
+ "version": "0.1.0",
"contributors": [
{
"name": "Eclipse EMF.cloud Project",
@@ -17,9 +18,8 @@
},
"homepage": "https://www.eclipse.org/emfcloud/",
"bugs": "https://github.com/eclipse-emfcloud/coffee-editor/issues",
- "version": "0.7.0",
"engines": {
- "vscode": "^1.43.0"
+ "vscode": "^1.65.0"
},
"dependencies": {
"semver": "^6.3.0",
@@ -27,21 +27,21 @@
"vscode-languageclient": "^6.1.3"
},
"devDependencies": {
- "@types/node": "^10.14.22",
- "@types/vscode": "1.43.0",
+ "@types/node": "16.x",
+ "@types/vscode": "1.65.0",
"copyfiles": "2.3.0",
"eslint": "^6.8.0",
"rimraf": "^2.6.1",
- "typescript": "^3.9.2",
- "vsce": "1.79.5"
+ "typescript": "~4.5.5",
+ "vsce": "1.97.0"
},
"scripts": {
- "prepare": "yarn clean && yarn build && yarn package",
- "clean": "rimraf lib",
- "lint": "eslint -c .eslintrc.js --ext .ts,.tsx ./src",
- "build": "tsc -b && yarn run lint",
- "watch": "tsc -b -w",
- "package": "vsce package && copyfiles coffee-workflow-analyzer-editor-0.7.0.vsix ../browser-app/plugins/"
+ "prepare": "yarn run clean && yarn run build && yarn lint && yarn package",
+ "clean": "rimraf tsconfig.tsbuildinfo out",
+ "lint": "eslint -c ../.eslintrc.js --ext .ts,.tsx ./src",
+ "build": "tsc",
+ "watch": "tsc -w",
+ "package": "vsce package && copyfiles coffee-workflow-analyzer-editor-0.1.0.vsix ../browser-app/plugins/"
},
"categories": [
"Programming Languages"
diff --git a/web/coffee-workflow-analyzer-editor/src/extension.ts b/client/coffee-workflow-analyzer-editor/src/extension.ts
similarity index 100%
rename from web/coffee-workflow-analyzer-editor/src/extension.ts
rename to client/coffee-workflow-analyzer-editor/src/extension.ts
diff --git a/web/coffee-workflow-analyzer-editor/syntaxes/language-configuration.json b/client/coffee-workflow-analyzer-editor/syntaxes/language-configuration.json
similarity index 100%
rename from web/coffee-workflow-analyzer-editor/syntaxes/language-configuration.json
rename to client/coffee-workflow-analyzer-editor/syntaxes/language-configuration.json
diff --git a/web/coffee-workflow-analyzer-editor/syntaxes/wfconfig.tmLanguage.json b/client/coffee-workflow-analyzer-editor/syntaxes/wfconfig.tmLanguage.json
similarity index 100%
rename from web/coffee-workflow-analyzer-editor/syntaxes/wfconfig.tmLanguage.json
rename to client/coffee-workflow-analyzer-editor/syntaxes/wfconfig.tmLanguage.json
diff --git a/web/coffee-workflow-analyzer-editor/tsconfig.json b/client/coffee-workflow-analyzer-editor/tsconfig.json
similarity index 63%
rename from web/coffee-workflow-analyzer-editor/tsconfig.json
rename to client/coffee-workflow-analyzer-editor/tsconfig.json
index f7961c6e..35b886be 100644
--- a/web/coffee-workflow-analyzer-editor/tsconfig.json
+++ b/client/coffee-workflow-analyzer-editor/tsconfig.json
@@ -1,11 +1,11 @@
{
- "extends": "../configs/base.tsconfig",
+ "extends": "@eclipse-glsp/ts-config/tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "out",
"baseUrl": "."
},
"include": [
- "src",
+ "src"
]
}
diff --git a/web/coffee-workflow-analyzer/package.json b/client/coffee-workflow-analyzer/package.json
similarity index 78%
rename from web/coffee-workflow-analyzer/package.json
rename to client/coffee-workflow-analyzer/package.json
index c5b93e40..e910f93c 100644
--- a/web/coffee-workflow-analyzer/package.json
+++ b/client/coffee-workflow-analyzer/package.json
@@ -1,10 +1,11 @@
{
"name": "coffee-workflow-analyzer",
"private": true,
- "license": "(EPL-2.0 OR MIT)",
"keywords": [
"theia-extension"
],
+ "license": "(EPL-2.0 OR MIT)",
+ "version": "0.1.0",
"contributors": [
{
"name": "Eclipse EMF.cloud Project",
@@ -18,16 +19,15 @@
},
"homepage": "https://www.eclipse.org/emfcloud/",
"bugs": "https://github.com/eclipse-emfcloud/coffee-editor/issues",
- "version": "0.7.0",
"files": [
"lib",
"src"
],
"dependencies": {
- "@theia/core": "^1.0.0",
- "@theia/mini-browser": "^1.0.0",
- "@theia/editor": "^1.0.0",
- "@theia/process": "^1.0.0",
+ "@theia/core": "^1.27.0",
+ "@theia/mini-browser": "^1.27.0",
+ "@theia/editor": "^1.27.0",
+ "@theia/process": "^1.27.0",
"express": "4.17.1",
"glob": "7.1.4",
"vscode-jsonrpc": "^5.0.1",
@@ -35,13 +35,13 @@
},
"devDependencies": {
"rimraf": "^2.6.1",
- "typescript": "^4.2.3"
+ "typescript": "~4.5.5"
},
"scripts": {
- "prepare": "yarn run clean && yarn run build",
- "clean": "rimraf lib",
+ "prepare": "yarn run clean && yarn run build && yarn lint",
+ "clean": "rimraf tsconfig.tsbuildinfo lib",
"lint": "eslint -c ../.eslintrc.js --ext .ts,.tsx ./src",
- "build": "tsc && yarn run lint",
+ "build": "tsc",
"watch": "tsc -w"
},
"theiaExtensions": [
diff --git a/web/coffee-workflow-analyzer/src/browser/analysis-service.ts b/client/coffee-workflow-analyzer/src/browser/analysis-service.ts
similarity index 90%
rename from web/coffee-workflow-analyzer/src/browser/analysis-service.ts
rename to client/coffee-workflow-analyzer/src/browser/analysis-service.ts
index 22e6f416..98f15dfc 100644
--- a/web/coffee-workflow-analyzer/src/browser/analysis-service.ts
+++ b/client/coffee-workflow-analyzer/src/browser/analysis-service.ts
@@ -25,7 +25,7 @@ export class AnalysisService {
@inject(WorkflowAnalyzer) private readonly workflowAnalyzer: WorkflowAnalyzer,
@inject(MessageService) protected readonly messageService: MessageService,
@inject(ILogger) private readonly logger: ILogger
- ) {}
+ ) { }
analyze(uri: URI): void {
this.logger.info('Analyze ' + uri);
@@ -53,11 +53,15 @@ export class AnalysisService {
iconClass: codicon('pie-chart')
});
} catch (error) {
- this.messageService.error('The workflow analysis failed', 'Show details').then(result => {
- if (result === 'Show details') {
- showErrorDialog(error);
- }
- });
+ if (error !== undefined && error instanceof Error) {
+ this.messageService.error('The workflow analysis failed', 'Show details').then(result => {
+ if (result === 'Show details') {
+ showErrorDialog(error as Error);
+ }
+ });
+ } else {
+ throw error;
+ }
} finally {
progress.cancel();
}
@@ -66,7 +70,7 @@ export class AnalysisService {
@injectable()
export class WorkflowAnalysisClientImpl implements WorkflowAnalysisClient {
- constructor(@inject(MessageService) protected readonly messageService: MessageService) {}
+ constructor(@inject(MessageService) protected readonly messageService: MessageService) { }
reportStatus(status: WorkflowAnalysisStatus): void {
switch (status.status) {
case 'ok':
diff --git a/web/coffee-workflow-analyzer/src/browser/command-contribution.ts b/client/coffee-workflow-analyzer/src/browser/command-contribution.ts
similarity index 100%
rename from web/coffee-workflow-analyzer/src/browser/command-contribution.ts
rename to client/coffee-workflow-analyzer/src/browser/command-contribution.ts
diff --git a/web/coffee-workflow-analyzer/src/browser/frontend-extension.ts b/client/coffee-workflow-analyzer/src/browser/frontend-extension.ts
similarity index 100%
rename from web/coffee-workflow-analyzer/src/browser/frontend-extension.ts
rename to client/coffee-workflow-analyzer/src/browser/frontend-extension.ts
diff --git a/web/coffee-workflow-analyzer/src/browser/location-mapper.ts b/client/coffee-workflow-analyzer/src/browser/location-mapper.ts
similarity index 100%
rename from web/coffee-workflow-analyzer/src/browser/location-mapper.ts
rename to client/coffee-workflow-analyzer/src/browser/location-mapper.ts
diff --git a/web/coffee-workflow-analyzer/src/common/request-file-protocol.ts b/client/coffee-workflow-analyzer/src/common/request-file-protocol.ts
similarity index 100%
rename from web/coffee-workflow-analyzer/src/common/request-file-protocol.ts
rename to client/coffee-workflow-analyzer/src/common/request-file-protocol.ts
diff --git a/web/coffee-workflow-analyzer/src/common/workflow-analyze-protocol.ts b/client/coffee-workflow-analyzer/src/common/workflow-analyze-protocol.ts
similarity index 100%
rename from web/coffee-workflow-analyzer/src/common/workflow-analyze-protocol.ts
rename to client/coffee-workflow-analyzer/src/common/workflow-analyze-protocol.ts
diff --git a/web/coffee-workflow-analyzer/src/node/backend-extension.ts b/client/coffee-workflow-analyzer/src/node/backend-extension.ts
similarity index 57%
rename from web/coffee-workflow-analyzer/src/node/backend-extension.ts
rename to client/coffee-workflow-analyzer/src/node/backend-extension.ts
index 6a66219f..680d2c92 100644
--- a/web/coffee-workflow-analyzer/src/node/backend-extension.ts
+++ b/client/coffee-workflow-analyzer/src/node/backend-extension.ts
@@ -9,13 +9,10 @@
* SPDX-License-Identifier: EPL-2.0 OR MIT
*/
import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core';
-import { BackendApplicationContribution } from '@theia/core/lib/node';
import { ContainerModule } from 'inversify';
import { FileClient, filePath, FileServer } from '../common/request-file-protocol';
-import { WorkflowAnalysisClient, workflowServicePath } from '../common/workflow-analyze-protocol';
import { WorkflowFileServer } from './file-server';
-import { WorkflowAnalysisServer } from './workflow-analysis-server';
export default new ContainerModule(bind => {
bind(FileServer).to(WorkflowFileServer).inSingletonScope();
@@ -29,18 +26,4 @@ export default new ContainerModule(bind => {
})
)
.inSingletonScope();
-
- bind(WorkflowAnalysisServer).toSelf().inSingletonScope();
- bind(BackendApplicationContribution).toService(WorkflowAnalysisServer);
-
- bind(ConnectionHandler)
- .toDynamicValue(
- ctx =>
- new JsonRpcConnectionHandler(workflowServicePath, client => {
- const analysisServer = ctx.container.get(WorkflowAnalysisServer);
- analysisServer.setClient(client);
- return analysisServer;
- })
- )
- .inSingletonScope();
});
diff --git a/web/coffee-workflow-analyzer/src/node/file-server.ts b/client/coffee-workflow-analyzer/src/node/file-server.ts
similarity index 100%
rename from web/coffee-workflow-analyzer/src/node/file-server.ts
rename to client/coffee-workflow-analyzer/src/node/file-server.ts
diff --git a/client/coffee-workflow-analyzer/tsconfig.json b/client/coffee-workflow-analyzer/tsconfig.json
new file mode 100644
index 00000000..aa1c83a1
--- /dev/null
+++ b/client/coffee-workflow-analyzer/tsconfig.json
@@ -0,0 +1,9 @@
+{
+ "extends": "@eclipse-glsp/ts-config/tsconfig.json",
+ "compilerOptions": {
+ "rootDir": "src",
+ "outDir": "lib",
+ "baseUrl": "."
+ },
+ "include": ["src"]
+}
diff --git a/web/coffee-workflow-analyzer/wf-analyzer-web-app/analyze.css b/client/coffee-workflow-analyzer/wf-analyzer-web-app/analyze.css
similarity index 100%
rename from web/coffee-workflow-analyzer/wf-analyzer-web-app/analyze.css
rename to client/coffee-workflow-analyzer/wf-analyzer-web-app/analyze.css
diff --git a/web/coffee-workflow-analyzer/wf-analyzer-web-app/d3.min.js b/client/coffee-workflow-analyzer/wf-analyzer-web-app/d3.min.js
similarity index 100%
rename from web/coffee-workflow-analyzer/wf-analyzer-web-app/d3.min.js
rename to client/coffee-workflow-analyzer/wf-analyzer-web-app/d3.min.js
diff --git a/web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.eot b/client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.eot
similarity index 100%
rename from web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.eot
rename to client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.eot
diff --git a/web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.svg b/client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.svg
similarity index 100%
rename from web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.svg
rename to client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.svg
diff --git a/web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.ttf b/client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.ttf
similarity index 100%
rename from web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.ttf
rename to client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.ttf
diff --git a/web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.woff b/client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.woff
similarity index 100%
rename from web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.woff
rename to client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.woff
diff --git a/web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.woff2 b/client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.woff2
similarity index 100%
rename from web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.woff2
rename to client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.woff2
diff --git a/web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.eot b/client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.eot
similarity index 100%
rename from web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.eot
rename to client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.eot
diff --git a/web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.svg b/client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.svg
similarity index 100%
rename from web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.svg
rename to client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.svg
diff --git a/web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.ttf b/client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.ttf
similarity index 100%
rename from web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.ttf
rename to client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.ttf
diff --git a/web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.woff b/client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.woff
similarity index 100%
rename from web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.woff
rename to client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.woff
diff --git a/web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.woff2 b/client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.woff2
similarity index 100%
rename from web/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.woff2
rename to client/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.woff2
diff --git a/web/coffee-workflow-analyzer/wf-analyzer-web-app/index.html b/client/coffee-workflow-analyzer/wf-analyzer-web-app/index.html
similarity index 100%
rename from web/coffee-workflow-analyzer/wf-analyzer-web-app/index.html
rename to client/coffee-workflow-analyzer/wf-analyzer-web-app/index.html
diff --git a/web/coffee-workflow-glsp-editor/package.json b/client/coffee-workflow-glsp-theia/package.json
similarity index 63%
rename from web/coffee-workflow-glsp-editor/package.json
rename to client/coffee-workflow-glsp-theia/package.json
index b7391e73..10bafc90 100644
--- a/web/coffee-workflow-glsp-editor/package.json
+++ b/client/coffee-workflow-glsp-theia/package.json
@@ -1,16 +1,11 @@
{
- "name": "coffee-workflow-glsp-editor",
- "version": "0.7.0",
+ "name": "coffee-workflow-glsp-theia",
"keywords": [
"theia-extension"
],
"description": "GLSP editor integration for coffee models",
"license": "(EPL-2.0 OR MIT)",
- "files": [
- "lib",
- "src",
- "build"
- ],
+ "version": "0.1.0",
"contributors": [
{
"name": "Eclipse EMF.cloud Project",
@@ -24,28 +19,31 @@
},
"homepage": "https://www.eclipse.org/emfcloud/",
"bugs": "https://github.com/eclipse-emfcloud/coffee-editor/issues",
+ "files": [
+ "lib",
+ "src",
+ "build"
+ ],
"dependencies": {
- "@eclipse-glsp/theia-integration": "next",
- "@eclipse-emfcloud/modelserver-theia": "next",
- "coffee-workflow-glsp": "0.7.0",
+ "@eclipse-glsp/theia-integration": "1.1.0-next",
+ "@eclipse-emfcloud/modelserver-theia": "0.8.0-next",
+ "coffee-workflow-glsp": "0.1.0",
"balloon-css": "^0.5.0"
},
"devDependencies": {
"rimraf": "^2.6.1",
- "typescript": "^4.2.3"
+ "typescript": "~4.5.5"
},
"scripts": {
- "prepare": "yarn run clean && yarn run build",
- "clean": "rimraf lib",
- "build": "tsc && yarn run lint",
+ "prepare": "yarn run clean && yarn run build && yarn lint",
+ "clean": "rimraf tsconfig.tsbuildinfo lib",
"lint": "eslint -c ../.eslintrc.js --ext .ts,.tsx ./src",
- "download-server": "cd ./scripts && ./download-server.sh",
+ "build": "tsc",
"watch": "tsc -w"
},
"theiaExtensions": [
{
- "frontend": "lib/browser/frontend-module",
- "backend": "lib/node/backend-module"
+ "frontend": "lib/browser/frontend-module"
}
]
}
\ No newline at end of file
diff --git a/web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-configuration.ts b/client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-configuration.ts
similarity index 76%
rename from web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-configuration.ts
rename to client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-configuration.ts
index 1aae4b34..7621a401 100644
--- a/web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-configuration.ts
+++ b/client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-configuration.ts
@@ -12,21 +12,15 @@ import 'sprotty-theia/css/theia-sprotty.css';
import { labelEditModule } from '@eclipse-glsp/client/lib';
import { configureDiagramServer, GLSPDiagramConfiguration, TheiaDiagramServer } from '@eclipse-glsp/theia-integration';
-import {
- connectTheiaMarkerManager,
- TheiaMarkerManager,
- TheiaMarkerManagerFactory
-} from '@eclipse-glsp/theia-integration/lib/browser/diagram/theia-marker-manager';
+import { connectTheiaMarkerManager } from '@eclipse-glsp/theia-integration/lib/browser/diagram/theia-marker-manager';
import { createWorkflowDiagramContainer } from 'coffee-workflow-glsp';
-import { Container, inject, injectable } from 'inversify';
+import { Container, injectable } from 'inversify';
import { WorkflowNotationLanguage } from '../../common/workflow-language';
-import { WorkflowGLSPTheiaDiagramServer } from './workflow-diagram-server';
+import { WorkflowGLSPTheiaDiagramServer } from './diagram-server';
@injectable()
export class WorkflowDiagramConfiguration extends GLSPDiagramConfiguration {
- @inject(TheiaMarkerManagerFactory) protected readonly theiaMarkerManager: () => TheiaMarkerManager;
-
diagramType: string = WorkflowNotationLanguage.diagramType;
doCreateContainer(widgetId: string): Container {
diff --git a/web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-label-provider-contribution.ts b/client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-label-provider-contribution.ts
similarity index 82%
rename from web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-label-provider-contribution.ts
rename to client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-label-provider-contribution.ts
index 031699b1..38531358 100644
--- a/web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-label-provider-contribution.ts
+++ b/client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-label-provider-contribution.ts
@@ -8,6 +8,7 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
*/
+import { codiconCSSString } from '@eclipse-glsp/client';
import { UriSelection } from '@theia/core';
import { LabelProviderContribution } from '@theia/core/lib/browser';
import URI from '@theia/core/lib/common/uri';
@@ -15,7 +16,6 @@ import { FileStat } from '@theia/filesystem/lib/common/files';
import { injectable } from 'inversify';
import { WorkflowNotationLanguage } from '../../common/workflow-language';
-import { DIAGRAM_ICON_CLASS } from './workflow-diagram-manager';
@injectable()
export class WorkflowDiagramLabelProviderContribution implements LabelProviderContribution {
@@ -35,12 +35,7 @@ export class WorkflowDiagramLabelProviderContribution implements LabelProviderCo
}
getIcon(): string {
- return DIAGRAM_ICON_CLASS;
+ return codiconCSSString('type-hierarchy-sub') + ' default-file-icon';
}
- // Do not need to specify getName() because the default uri label provider handles this
-
- getLongName(uri: URI): string {
- return uri.displayName;
- }
}
diff --git a/web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-manager.ts b/client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-manager.ts
similarity index 53%
rename from web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-manager.ts
rename to client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-manager.ts
index 6ca954cb..895a779a 100644
--- a/web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-manager.ts
+++ b/client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-manager.ts
@@ -8,15 +8,12 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
*/
-import { Args, EnableToolPaletteAction, RequestTypeHintsAction, SetEditModeAction, codiconCSSString } from '@eclipse-glsp/client';
+import { codiconCSSString } from '@eclipse-glsp/client';
-import { DiagramServer, ModelSource, RequestModelAction, TYPES } from 'sprotty';
import {
DiagramWidgetOptions,
GLSPDiagramManager,
- GLSPDiagramWidget,
- GLSPTheiaDiagramServer,
- GLSPWidgetOpenerOptions,
+ GLSPDiagramWidget, GLSPWidgetOpenerOptions,
GLSPWidgetOptions
} from '@eclipse-glsp/theia-integration/lib/browser';
import { WidgetOpenerOptions } from '@theia/core/lib/browser';
@@ -25,7 +22,7 @@ import { WorkspaceService } from '@theia/workspace/lib/browser';
import { inject, injectable, postConstruct } from 'inversify';
import { WorkflowNotationLanguage } from '../../common/workflow-language';
-import { WorkflowGLSPServerOpenerOptions } from './workflow-glsp-server-options';
+import { WorkflowGLSPServerOpenerOptions } from './glsp-server-options';
export const DIAGRAM_ICON_CLASS = codiconCSSString('type-hierarchy-sub');
@@ -43,24 +40,12 @@ export class WorkflowDiagramManager extends GLSPDiagramManager {
private workspaceRoot: string;
@postConstruct()
- protected async initialize(): Promise {
+ protected override async initialize(): Promise {
super.initialize();
this.workspaceService.roots.then(roots => (this.workspaceRoot = roots[0].resource.toString()));
}
- // protected createWidgetOptions(uri: URI, options?: GLSPWidgetOpenerOptions): WorkflowDiagramWidgetOptions {
- // const widgetOptions = super.createWidgetOptions(uri.withoutQuery(), options);
- // const queryOptions = this.createQueryOptions(uri);
- // const serverOptions = this.createServerOptions(options);
- // return {
- // ...widgetOptions,
- // ...queryOptions,
- // ...serverOptions,
- // workspaceRoot: this.workspaceRoot
- // };
- // }
-
- protected createWidgetOptions(uri: URI, options?: GLSPWidgetOpenerOptions): DiagramWidgetOptions & GLSPWidgetOptions {
+ protected override createWidgetOptions(uri: URI, options?: GLSPWidgetOpenerOptions): DiagramWidgetOptions & GLSPWidgetOptions {
const widgetOptions = super.createWidgetOptions(uri.withoutQuery(), options);
const queryOptions = this.createQueryOptions(uri);
const serverOptions = this.createServerOptions(options);
@@ -76,17 +61,19 @@ export class WorkflowDiagramManager extends GLSPDiagramManager {
} as WorkflowDiagramWidgetOptions;
}
- protected createWidgetId(options: DiagramWidgetOptions): string {
- const widgetId = `${this.diagramType}:${options.uri}`;
- for (const widget of this.shell.widgets) {
- if (widget instanceof GLSPDiagramWidget) {
- if (widget.widgetId === widgetId) {
- widget.close();
- }
- }
- }
- return widgetId;
+ protected override createWidgetId(options: DiagramWidgetOptions): string {
+ return `${this.diagramType}:${options.uri}`;
+ // FIXME @sgraband ?
+ // for (const widget of this.shell.widgets) {
+ // if (widget instanceof GLSPDiagramWidget) {
+ // if (widget.widgetId === widgetId) {
+ // widget.close();
+ // }
+ // }
+ // }
+ // return widgetId;
}
+
protected createServerOptions(options?: WidgetOpenerOptions): Record {
if (WorkflowGLSPServerOpenerOptions.is(options)) {
return options.serverOptions;
@@ -111,7 +98,7 @@ export class WorkflowDiagramManager extends GLSPDiagramManager {
return WorkflowNotationLanguage.fileExtensions;
}
- get iconClass(): string {
+ override get iconClass(): string {
return DIAGRAM_ICON_CLASS;
}
@@ -122,36 +109,3 @@ export class WorkflowDiagramManager extends GLSPDiagramManager {
return this.getOrCreateWidget(notationUri, options) as Promise;
}
}
-
-export class WorkflowDiagramWidget extends GLSPDiagramWidget {
- // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
- protected initializeSprotty() {
- const modelSource = this.diContainer.get(TYPES.ModelSource);
- if (modelSource instanceof DiagramServer) {
- modelSource.clientId = this.id;
- }
- if (modelSource instanceof GLSPTheiaDiagramServer && this.connector) {
- this.connector.connect(modelSource);
- }
-
- this.disposed.connect(() => {
- if (modelSource instanceof GLSPTheiaDiagramServer && this.connector) {
- this.connector.disconnect(modelSource);
- }
- });
-
- this.requestModelOptions = {
- sourceUri: this.uri.path.toString(),
- needsClientLayout: `${this.viewerOptions.needsClientLayout}`,
- ...this.options
- } as Args;
- this.actionDispatcher.dispatch(new RequestModelAction(this.requestModelOptions));
- this.actionDispatcher.dispatch(new RequestTypeHintsAction(this.options.diagramType));
- if ((this.options as any).editMode === 'editable') {
- this.actionDispatcher.dispatch(new EnableToolPaletteAction());
- this.actionDispatcher.dispatch(new SetEditModeAction('editable'));
- } else {
- this.actionDispatcher.dispatch(new SetEditModeAction('readonly'));
- }
- }
-}
diff --git a/web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-glsp-server-options.ts b/client/coffee-workflow-glsp-theia/src/browser/diagram/glsp-server-options.ts
similarity index 100%
rename from web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-glsp-server-options.ts
rename to client/coffee-workflow-glsp-theia/src/browser/diagram/glsp-server-options.ts
diff --git a/web/coffee-workflow-glsp-editor/src/browser/diagram/theia-glsp-connector.ts b/client/coffee-workflow-glsp-theia/src/browser/diagram/theia-glsp-connector.ts
similarity index 78%
rename from web/coffee-workflow-glsp-editor/src/browser/diagram/theia-glsp-connector.ts
rename to client/coffee-workflow-glsp-theia/src/browser/diagram/theia-glsp-connector.ts
index 8d176a08..6b08d0a6 100644
--- a/web/coffee-workflow-glsp-editor/src/browser/diagram/theia-glsp-connector.ts
+++ b/client/coffee-workflow-glsp-theia/src/browser/diagram/theia-glsp-connector.ts
@@ -40,24 +40,13 @@ export class WorkflowTheiaGLSPConnector extends BaseTheiaGLSPConnector {
return this._contributionId;
}
- protected initialize(): void {
+ protected override initialize(): void {
if (this._diagramType && this._contributionId) {
super.initialize();
}
}
- disconnect(diagramServer: TheiaDiagramServer): void {
- // this.servers.delete(diagramServer.clientId);
- this.glspClient.then(client =>
- client.disposeClientSession({
- clientSessionId: diagramServer.clientId,
- args: this.disposeClientSessionArgs(diagramServer)
- })
- );
- diagramServer.disconnect();
- }
-
- disposeClientSessionArgs(diagramServer: TheiaDiagramServer): Args | undefined {
+ override disposeClientSessionArgs(diagramServer: TheiaDiagramServer): Args | undefined {
return {
['sourceUri']: diagramServer.sourceUri
};
diff --git a/web/coffee-workflow-glsp-editor/src/browser/frontend-module.ts b/client/coffee-workflow-glsp-theia/src/browser/frontend-module.ts
similarity index 80%
rename from web/coffee-workflow-glsp-editor/src/browser/frontend-module.ts
rename to client/coffee-workflow-glsp-theia/src/browser/frontend-module.ts
index d5accb49..a8cc5732 100644
--- a/web/coffee-workflow-glsp-editor/src/browser/frontend-module.ts
+++ b/client/coffee-workflow-glsp-theia/src/browser/frontend-module.ts
@@ -20,15 +20,15 @@ import { DiagramConfiguration } from 'sprotty-theia/lib';
import { WorkflowNotationLanguage } from '../common/workflow-language';
import { WorkflowTheiaGLSPConnector } from './diagram/theia-glsp-connector';
-import { WorkflowDiagramConfiguration } from './diagram/workflow-diagram-configuration';
-import { WorkflowDiagramLabelProviderContribution } from './diagram/workflow-diagram-label-provider-contribution';
-import { WorkflowDiagramManager } from './diagram/workflow-diagram-manager';
+import { WorkflowDiagramConfiguration } from './diagram/diagram-configuration';
+import { WorkflowDiagramLabelProviderContribution } from './diagram/diagram-label-provider-contribution';
import { WorkflowGLSPClientContribution } from './workflow-glsp-client-contribution';
+import { WorkflowDiagramManager } from './diagram/diagram-manager';
export class WorkflowTheiaFrontendModule extends GLSPTheiaFrontendModule {
readonly diagramLanguage = WorkflowNotationLanguage;
- bindTheiaGLSPConnector(context: ContainerContext): void {
+ override bindTheiaGLSPConnector(context: ContainerContext): void {
context.bind(TheiaGLSPConnector).toDynamicValue(dynamicContext => {
const connector = dynamicContext.container.resolve(WorkflowTheiaGLSPConnector);
connector.doConfigure(this.diagramLanguage);
@@ -40,15 +40,15 @@ export class WorkflowTheiaFrontendModule extends GLSPTheiaFrontendModule {
context.bind(DiagramConfiguration).to(WorkflowDiagramConfiguration);
}
- bindGLSPClientContribution(context: ContainerContext): void {
+ override bindGLSPClientContribution(context: ContainerContext): void {
context.bind(GLSPClientContribution).to(WorkflowGLSPClientContribution);
}
- configure(context: ContainerContext): void {
+ override configure(context: ContainerContext): void {
context.bind(LabelProviderContribution).to(WorkflowDiagramLabelProviderContribution);
}
- configureDiagramManager(context: ContainerContext): void {
+ override configureDiagramManager(context: ContainerContext): void {
registerDiagramManager(context.bind, WorkflowDiagramManager);
}
}
diff --git a/web/coffee-workflow-glsp-editor/src/browser/workflow-glsp-client-contribution.ts b/client/coffee-workflow-glsp-theia/src/browser/workflow-glsp-client-contribution.ts
similarity index 57%
rename from web/coffee-workflow-glsp-editor/src/browser/workflow-glsp-client-contribution.ts
rename to client/coffee-workflow-glsp-theia/src/browser/workflow-glsp-client-contribution.ts
index 24e71700..9eb7bb94 100644
--- a/web/coffee-workflow-glsp-editor/src/browser/workflow-glsp-client-contribution.ts
+++ b/client/coffee-workflow-glsp-theia/src/browser/workflow-glsp-client-contribution.ts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -8,36 +8,27 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
*/
-import { ModelServerClient } from '@eclipse-emfcloud/modelserver-theia/lib/common';
import { Args } from '@eclipse-glsp/client';
import { MaybePromise } from '@eclipse-glsp/protocol';
import { BaseGLSPClientContribution } from '@eclipse-glsp/theia-integration/lib/browser';
-import { WorkspaceService } from '@theia/workspace/lib/browser';
-import { inject, injectable } from 'inversify';
+import { injectable } from 'inversify';
import { WorkflowNotationLanguage } from '../common/workflow-language';
export interface WorkflowInitializeOptions {
timestamp: Date;
modelserverURL: string;
- workspaceRoot?: string;
}
@injectable()
export class WorkflowGLSPClientContribution extends BaseGLSPClientContribution {
- @inject(ModelServerClient) protected readonly modelServerBackend: ModelServerClient;
- @inject(WorkspaceService) protected readonly workspaceService: WorkspaceService;
-
readonly id = WorkflowNotationLanguage.contributionId;
readonly fileExtensions = WorkflowNotationLanguage.fileExtensions;
- protected createInitializeOptions(): MaybePromise {
- // const workspaceRoot = this.workspaceService.roots.then(roots => roots[0].resource);
-
+ protected override createInitializeOptions(): MaybePromise {
return {
['timestamp']: new Date().toString(),
- ['modelServerURL']: 'http://localhost:8081/api/v1/'
- // ['workspaceRoot']: workspaceRoot.toString()
+ ['modelServerURL']: 'http://localhost:8081/api/v2/'
};
}
}
diff --git a/client/coffee-workflow-glsp-theia/src/common/index.ts b/client/coffee-workflow-glsp-theia/src/common/index.ts
new file mode 100644
index 00000000..e641a5f8
--- /dev/null
+++ b/client/coffee-workflow-glsp-theia/src/common/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2022 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
+ * available at https://opensource.org/licenses/MIT.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR MIT
+ */
+export * from './workflow-language';
diff --git a/web/coffee-workflow-glsp-editor/src/common/workflow-language.ts b/client/coffee-workflow-glsp-theia/src/common/workflow-language.ts
similarity index 100%
rename from web/coffee-workflow-glsp-editor/src/common/workflow-language.ts
rename to client/coffee-workflow-glsp-theia/src/common/workflow-language.ts
diff --git a/client/coffee-workflow-glsp-theia/tsconfig.json b/client/coffee-workflow-glsp-theia/tsconfig.json
new file mode 100644
index 00000000..af2d0b31
--- /dev/null
+++ b/client/coffee-workflow-glsp-theia/tsconfig.json
@@ -0,0 +1,13 @@
+{
+ "extends": "@eclipse-glsp/ts-config/tsconfig.json",
+ "compilerOptions": {
+ "rootDir": "src",
+ "outDir": "lib",
+ "baseUrl": "."
+ },
+ "include": [
+ "src",
+ "css"
+ ],
+ "exclude": ["node_modules"]
+}
diff --git a/web/coffee-workflow-glsp/css/diagram.css b/client/coffee-workflow-glsp/css/diagram.css
similarity index 94%
rename from web/coffee-workflow-glsp/css/diagram.css
rename to client/coffee-workflow-glsp/css/diagram.css
index 42fe94ee..6393f4bb 100644
--- a/web/coffee-workflow-glsp/css/diagram.css
+++ b/client/coffee-workflow-glsp/css/diagram.css
@@ -1,4 +1,4 @@
-/********************************************************************************
+ /*
* Copyright (c) 2019-2022 EclipseSource, Christian W. Damus, and others.
*
* This program and the accompanying materials are made available under the
@@ -7,7 +7,7 @@
* available at https://opensource.org/licenses/MIT.
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
- ********************************************************************************/
+ */
.sprotty-graph {
font-size: 15pt;
diff --git a/web/coffee-workflow-glsp/css/temporary_glsp.css b/client/coffee-workflow-glsp/css/temporary_glsp.css
similarity index 97%
rename from web/coffee-workflow-glsp/css/temporary_glsp.css
rename to client/coffee-workflow-glsp/css/temporary_glsp.css
index 68090cbe..c08dbf56 100644
--- a/web/coffee-workflow-glsp/css/temporary_glsp.css
+++ b/client/coffee-workflow-glsp/css/temporary_glsp.css
@@ -1,5 +1,5 @@
-/********************************************************************************
- * Copyright (c) 2022 EclipseSource others.
+ /*
+ * Copyright (c) 2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -7,7 +7,7 @@
* available at https://opensource.org/licenses/MIT.
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
- ********************************************************************************/
+ */
.sprotty {
padding: 0px;
diff --git a/web/coffee-workflow-glsp/package.json b/client/coffee-workflow-glsp/package.json
similarity index 82%
rename from web/coffee-workflow-glsp/package.json
rename to client/coffee-workflow-glsp/package.json
index c71788f1..6d46bc75 100644
--- a/web/coffee-workflow-glsp/package.json
+++ b/client/coffee-workflow-glsp/package.json
@@ -1,8 +1,8 @@
{
"name": "coffee-workflow-glsp",
- "version": "0.7.0",
"description": "GLSP sprotty diagrams for the Workflow DSL",
"license": "(EPL-2.0 OR MIT)",
+ "version": "0.1.0",
"contributors": [
{
"name": "Eclipse EMF.cloud Project",
@@ -22,18 +22,18 @@
"diagram"
],
"dependencies": {
- "@eclipse-glsp/client": "next",
+ "@eclipse-glsp/client": "1.1.0-next",
"balloon-css": "^0.5.0"
},
"devDependencies": {
"rimraf": "^2.6.1",
- "typescript": "^4.2.3"
+ "typescript": "~4.5.5"
},
"scripts": {
- "prepare": "yarn run clean && yarn run build",
- "clean": "rimraf lib",
- "build": "tsc",
+ "prepare": "yarn run clean && yarn run build && yarn lint",
+ "clean": "rimraf tsconfig.tsbuildinfo lib",
"lint": "eslint -c ../.eslintrc.js --ext .ts,.tsx ./src",
+ "build": "tsc",
"watch": "tsc -w"
},
"files": [
diff --git a/web/coffee-workflow-glsp/src/di.config.ts b/client/coffee-workflow-glsp/src/di.config.ts
similarity index 100%
rename from web/coffee-workflow-glsp/src/di.config.ts
rename to client/coffee-workflow-glsp/src/di.config.ts
diff --git a/web/coffee-workflow-glsp/src/direct-task-editing/di.config.ts b/client/coffee-workflow-glsp/src/direct-task-editing/di.config.ts
similarity index 83%
rename from web/coffee-workflow-glsp/src/direct-task-editing/di.config.ts
rename to client/coffee-workflow-glsp/src/direct-task-editing/di.config.ts
index 0d7f4610..cf5cf540 100644
--- a/web/coffee-workflow-glsp/src/direct-task-editing/di.config.ts
+++ b/client/coffee-workflow-glsp/src/direct-task-editing/di.config.ts
@@ -8,12 +8,11 @@
*
* SPDX-License-Identifier: EPL-2.0 OR MIT
*/
+import { TYPES } from '@eclipse-glsp/client';
import { ContainerModule } from 'inversify';
-import { TYPES } from 'sprotty';
-
import { TaskEditor } from './direct-task-editor';
-export const directTaskEditor = new ContainerModule((bind, _unbind, isBound) => {
+export const directTaskEditor = new ContainerModule(bind => {
bind(TaskEditor).toSelf().inSingletonScope();
bind(TYPES.IUIExtension).toService(TaskEditor);
});
diff --git a/web/coffee-workflow-glsp/src/direct-task-editing/direct-task-editor.ts b/client/coffee-workflow-glsp/src/direct-task-editing/direct-task-editor.ts
similarity index 66%
rename from web/coffee-workflow-glsp/src/direct-task-editing/direct-task-editor.ts
rename to client/coffee-workflow-glsp/src/direct-task-editing/direct-task-editor.ts
index 1cc1d755..fe823b04 100644
--- a/web/coffee-workflow-glsp/src/direct-task-editing/direct-task-editor.ts
+++ b/client/coffee-workflow-glsp/src/direct-task-editing/direct-task-editor.ts
@@ -15,29 +15,58 @@ import {
EditorContextService,
getAbsoluteClientBounds,
GLSPActionDispatcher,
+ hasStringProp,
ILogger,
- isSetContextActionsAction,
- isSetEditValidationResultAction,
LabeledAction,
+ ModelIndexImpl,
+ Operation,
RequestContextActions,
RequestEditValidationAction,
- SModelElement,
+ SetContextActions,
+ SetEditValidationResultAction,
SModelRoot,
toActionArray,
+ TYPES,
ValidationDecorator,
ValidationStatus,
ViewerOptions
} from '@eclipse-glsp/client';
import { inject, injectable } from 'inversify';
-import { TYPES } from 'sprotty/lib';
import { DOMHelper } from 'sprotty/lib/base/views/dom-helper';
-
import { isTaskNode, TaskNode } from '../model';
-export class ApplyTaskEditOperation implements Action {
- static readonly KIND = 'applyTaskEdit';
- readonly kind = ApplyTaskEditOperation.KIND;
- constructor(readonly taskId: string, readonly expression: string) {}
+/**
+ * Is send from the {@link TaskEditor} to the GLSP server
+ * to execute a task edit operation.
+ */
+export interface ApplyTaskEditOperation extends Operation {
+ kind: typeof ApplyTaskEditOperation.KIND;
+
+ /**
+ * Id of the task that should be edited
+ */
+ taskId: string;
+
+ /**
+ * The edit expression
+ */
+ expression: string;
+}
+
+export namespace ApplyTaskEditOperation {
+ export const KIND = 'applyTaskEdit';
+
+ export function is(object: any): object is ApplyTaskEditOperation {
+ return Operation.hasKind(object, KIND) && hasStringProp(object, 'taskId') && hasStringProp(object, 'expression');
+ }
+
+ export function create(options: { taskId: string; expression: string }): ApplyTaskEditOperation {
+ return {
+ kind: KIND,
+ isOperation: true,
+ ...options
+ };
+ }
}
@injectable()
@@ -63,7 +92,7 @@ export class TaskEditor extends AbstractUIExtension {
protected domHelper: DOMHelper;
@inject(TYPES.ILogger)
- protected logger: ILogger;
+ protected override logger: ILogger;
protected task: TaskNode;
protected autoSuggestion: AutoCompleteWidget;
@@ -93,13 +122,13 @@ export class TaskEditor extends AbstractUIExtension {
this.autoSuggestion.initialize(containerElement);
}
- show(root: Readonly, ...contextElementIds: string[]): void {
+ override show(root: Readonly, ...contextElementIds: string[]): void {
super.show(root, ...contextElementIds);
this.autoSuggestion.open(root);
}
- protected onBeforeShow(containerElement: HTMLElement, root: Readonly, ...contextElementIds: string[]): void {
- this.task = getTask(contextElementIds, root)[0];
+ protected override onBeforeShow(containerElement: HTMLElement, root: Readonly, ...contextElementIds: string[]): void {
+ this.task = getTask(contextElementIds, root.index)[0];
this.autoSuggestion.inputField.value = '';
this.setPosition(containerElement);
}
@@ -121,17 +150,19 @@ export class TaskEditor extends AbstractUIExtension {
protected async retrieveSuggestions(input: string): Promise {
const response = await this.actionDispatcher.request(
- new RequestContextActions(TaskEditor.ID, this.editorContextService.get({ ['text']: input }))
+ RequestContextActions.create({ contextId: TaskEditor.ID, editorContext: this.editorContextService.get({ ['text']: input }) })
);
- if (isSetContextActionsAction(response)) {
+ if (SetContextActions.is(response)) {
return response.actions;
}
return Promise.reject();
}
protected async validateInput(input: string): Promise {
- const response = await this.actionDispatcher.request(new RequestEditValidationAction(TaskEditor.ID, this.task.id, input));
- if (isSetEditValidationResultAction(response)) {
+ const response = await this.actionDispatcher.request(
+ RequestEditValidationAction.create({ contextId: TaskEditor.ID, modelElementId: this.task.id, text: input })
+ );
+ if (SetEditValidationResultAction.is(response)) {
return response.status;
}
return Promise.reject();
@@ -142,16 +173,16 @@ export class TaskEditor extends AbstractUIExtension {
}
protected executeFromTextOnlyInput(input: string): void {
- const action = new ApplyTaskEditOperation(this.task.id, input);
+ const action = ApplyTaskEditOperation.create({ taskId: this.task.id, expression: input });
this.actionDispatcher.dispatch(action);
}
- hide(): void {
+ override hide(): void {
this.autoSuggestion.dispose();
super.hide();
}
}
-function getTask(ids: string[], element: SModelElement): TaskNode[] {
- return ids.map(id => element.index.getById(id)).filter(isTaskNode);
+function getTask(ids: string[], index: ModelIndexImpl): TaskNode[] {
+ return ids.map(id => index.getById(id)).filter(element => element && isTaskNode(element)) as TaskNode[];
}
diff --git a/web/coffee-workflow-glsp/src/index.ts b/client/coffee-workflow-glsp/src/index.ts
similarity index 100%
rename from web/coffee-workflow-glsp/src/index.ts
rename to client/coffee-workflow-glsp/src/index.ts
diff --git a/web/coffee-workflow-glsp/src/model.ts b/client/coffee-workflow-glsp/src/model.ts
similarity index 93%
rename from web/coffee-workflow-glsp/src/model.ts
rename to client/coffee-workflow-glsp/src/model.ts
index f3e11bb1..1a439c92 100644
--- a/web/coffee-workflow-glsp/src/model.ts
+++ b/client/coffee-workflow-glsp/src/model.ts
@@ -35,7 +35,7 @@ import {
} from '@eclipse-glsp/client';
export class TaskNode extends RectangularNode implements Nameable, WithEditableLabel {
- static readonly DEFAULT_FEATURES = [
+ static override readonly DEFAULT_FEATURES = [
connectableFeature,
deletableFeature,
selectFeature,
@@ -76,11 +76,11 @@ export class WeightedEdge extends SEdge {
export class ActivityNode extends DiamondNode {
nodeType: string = ActivityNode.Type.UNDEFINED;
- size = {
+ override size = {
width: 32,
height: 32
};
- strokeWidth = 1;
+ override strokeWidth = 1;
}
export namespace ActivityNode {
@@ -99,15 +99,15 @@ export class Icon extends SShapeElement implements LayoutContainer {
static readonly DEFAULT_FEATURES = [boundsFeature, layoutContainerFeature, layoutableChildFeature, fadeFeature];
layout: string;
- layoutOptions?: { [key: string]: string | number | boolean };
- size = {
+ override layoutOptions?: { [key: string]: string | number | boolean };
+ override size = {
width: 32,
height: 32
};
}
export class CategoryNode extends RectangularNode implements Nameable, WithEditableLabel {
- static readonly DEFAULT_FEATURES = [
+ static override readonly DEFAULT_FEATURES = [
deletableFeature,
selectFeature,
boundsFeature,
diff --git a/web/coffee-workflow-glsp/src/workflow-views.tsx b/client/coffee-workflow-glsp/src/workflow-views.tsx
similarity index 97%
rename from web/coffee-workflow-glsp/src/workflow-views.tsx
rename to client/coffee-workflow-glsp/src/workflow-views.tsx
index 0a394ade..05764761 100644
--- a/web/coffee-workflow-glsp/src/workflow-views.tsx
+++ b/client/coffee-workflow-glsp/src/workflow-views.tsx
@@ -29,7 +29,7 @@ const JSX = { createElement: svg };
@injectable()
export class WorkflowEdgeView extends PolylineEdgeViewWithGapsOnIntersections {
- protected renderAdditionals(edge: SEdge, segments: Point[], context: RenderingContext): VNode[] {
+ protected override renderAdditionals(edge: SEdge, segments: Point[], context: RenderingContext): VNode[] {
const additionals = super.renderAdditionals(edge, segments, context);
const p1 = segments[segments.length - 2];
const p2 = segments[segments.length - 1];
@@ -86,6 +86,7 @@ export class IconView extends ShapeView {
if (subType) {
setAttr(vnode, 'class', subType);
}
+
return vnode;
}
}
diff --git a/web/coffee-workflow-glsp/tsconfig.json b/client/coffee-workflow-glsp/tsconfig.json
similarity index 83%
rename from web/coffee-workflow-glsp/tsconfig.json
rename to client/coffee-workflow-glsp/tsconfig.json
index cfbde3c9..35bbaabc 100644
--- a/web/coffee-workflow-glsp/tsconfig.json
+++ b/client/coffee-workflow-glsp/tsconfig.json
@@ -1,10 +1,10 @@
{
- "extends": "../configs/base.tsconfig",
+ "extends": "@eclipse-glsp/ts-config/tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
- "reactNamespace": "JSX",
"baseUrl": ".",
+ "reactNamespace": "JSX",
"skipLibCheck": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
diff --git a/web/favicon.ico b/client/favicon.ico
similarity index 100%
rename from web/favicon.ico
rename to client/favicon.ico
diff --git a/web/lerna.json b/client/lerna.json
similarity index 70%
rename from web/lerna.json
rename to client/lerna.json
index 665c9fd0..1c4e9f3e 100644
--- a/web/lerna.json
+++ b/client/lerna.json
@@ -1,6 +1,6 @@
{
- "lerna": "2.11.0",
- "version": "0.0.0",
+ "lerna": "4.0.0",
+ "version": "0.1.0",
"useWorkspaces": true,
"npmClient": "yarn",
"command": {
@@ -8,4 +8,4 @@
"stream": true
}
}
-}
+}
\ No newline at end of file
diff --git a/client/package.json b/client/package.json
new file mode 100644
index 00000000..3b0ee2c3
--- /dev/null
+++ b/client/package.json
@@ -0,0 +1,99 @@
+{
+ "private": true,
+ "version": "0.1.0",
+ "engines": {
+ "yarn": ">=1.7.0",
+ "node": ">=16"
+ },
+ "license": "(EPL-2.0 OR MIT)",
+ "contributors": [
+ {
+ "name": "Eclipse EMF.cloud Project",
+ "email": "emfcloud-dev@eclipse.org",
+ "url": "https://projects.eclipse.org/projects/ecd.emfcloud"
+ }
+ ],
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/eclipse-emfcloud/coffee-editor.git"
+ },
+ "homepage": "https://www.eclipse.org/emfcloud/",
+ "bugs": "https://github.com/eclipse-emfcloud/coffee-editor/issues",
+ "scripts": {
+ "prepare": "lerna run prepare",
+ "rebuild:browser": "theia rebuild:browser",
+ "watch": "lerna run --parallel watch",
+ "lint": "lerna run lint",
+ "start": "yarn --cwd browser-app start",
+ "start:debug": "yarn --cwd browser-app start:debug"
+ },
+ "devDependencies": {
+ "@eclipse-glsp/config": "^1.0.0",
+ "@types/fs-extra": "^9.0.13",
+ "@types/node": "16.x",
+ "fs-extra": "^10.1.0",
+ "lerna": "^4.0.0",
+ "ts-node": "^10.8.1",
+ "typescript": "~4.5.5"
+ },
+ "workspaces": {
+ "packages": [
+ "browser-app",
+ "coffee-comparison",
+ "coffee-cpp-extension",
+ "coffee-editor-extension",
+ "coffee-java-extension",
+ "coffee-servers",
+ "coffee-welcome-page",
+ "coffee-workflow-analyzer",
+ "coffee-workflow-analyzer-editor",
+ "coffee-workflow-glsp",
+ "coffee-workflow-glsp-theia"
+ ]
+ },
+ "resolutions": {
+ "**/@theia/application-manager": "1.27.0",
+ "**/@theia/application-package": "1.27.0",
+ "**/@theia/callhierarchy": "1.27.0",
+ "**/@theia/cli": "1.27.0",
+ "**/@theia/console": "1.27.0",
+ "**/@theia/core": "1.27.0",
+ "**/@theia/debug": "1.27.0",
+ "**/@theia/editor": "1.27.0",
+ "**/@theia/file-search": "1.27.0",
+ "**/@theia/filesystem": "1.27.0",
+ "**/@theia/git": "1.27.0",
+ "**/@theia/keymaps": "1.27.0",
+ "**/@theia/markers": "1.27.0",
+ "**/@theia/messages": "1.27.0",
+ "**/@theia/mini-browser": "1.27.0",
+ "**/@theia/monaco": "1.27.0",
+ "**/@theia/navigator": "1.27.0",
+ "**/@theia/outline-view": "1.27.0",
+ "**/@theia/output": "1.27.0",
+ "**/@theia/plugin-dev": "1.27.0",
+ "**/@theia/plugin-ext": "1.27.0",
+ "**/@theia/plugin-ext-vscode": "1.27.0",
+ "**/@theia/plugin-metrics": "1.27.0",
+ "**/@theia/preferences": "1.27.0",
+ "**/@theia/process": "1.27.0",
+ "**/@theia/scm": "1.27.0",
+ "**/@theia/scm-extra": "1.27.0",
+ "**/@theia/search-in-workspace": "1.27.0",
+ "**/@theia/task": "1.27.0",
+ "**/@theia/terminal": "1.27.0",
+ "**/@theia/typehierarchy": "1.27.0",
+ "**/@theia/userstorage": "1.27.0",
+ "**/@theia/variable-resolver": "1.27.0",
+ "**/@theia/vsx-registry": "1.27.0",
+ "**/@theia/workspace": "1.27.0",
+ "**/@eclipse-glsp/client": "1.1.0-next.7ff1b00.184",
+ "**/@eclipse-glsp/protocol": "1.1.0-next.7ff1b00.184",
+ "**/@eclipse-glsp/theia-integration": "1.1.0-next.7f1c788.133",
+ "**/@eclipse-emfcloud/modelserver-theia": "0.8.0-next.795de90c",
+ "**/@eclipse-emfcloud/theia-tree-editor": "0.7.0-next.1cc6a31",
+ "**/sprotty": "0.12.0",
+ "**/sprotty-protocol": "0.12.0",
+ "**/sprotty-theia": "0.12.0"
+ }
+}
\ No newline at end of file
diff --git a/client/tsconfig.json b/client/tsconfig.json
new file mode 100644
index 00000000..50c9a45a
--- /dev/null
+++ b/client/tsconfig.json
@@ -0,0 +1,18 @@
+{
+ "extends": "@eclipse-glsp/ts-config/tsconfig.json",
+ "compilerOptions": {
+ "baseUrl": "."
+ },
+ "include": [
+ "coffee-comparison/src",
+ "coffee-editor-extension/src",
+ "coffee-java-extension/src",
+ "coffee-cpp-extension/src",
+ "coffee-servers/src",
+ "coffee-welcome-page/src",
+ "coffee-workflow-analyzer/src",
+ "coffee-workflow-analyzer-editor/src",
+ "coffee-workflow-glsp/src",
+ "coffee-workflow-glsp-theia/src"
+ ]
+}
diff --git a/backend/examples/SuperBrewer3000/.classpath b/client/workspace/SuperBrewer3000/.classpath
similarity index 99%
rename from backend/examples/SuperBrewer3000/.classpath
rename to client/workspace/SuperBrewer3000/.classpath
index ee19efae..da3343cf 100644
--- a/backend/examples/SuperBrewer3000/.classpath
+++ b/client/workspace/SuperBrewer3000/.classpath
@@ -39,4 +39,4 @@
-
+
\ No newline at end of file
diff --git a/backend/examples/SuperBrewer3000/.gitignore b/client/workspace/SuperBrewer3000/.gitignore
similarity index 51%
rename from backend/examples/SuperBrewer3000/.gitignore
rename to client/workspace/SuperBrewer3000/.gitignore
index 9a4f7607..cd05211c 100644
--- a/backend/examples/SuperBrewer3000/.gitignore
+++ b/client/workspace/SuperBrewer3000/.gitignore
@@ -1,10 +1,6 @@
/bin/
+/cpp/
/src-gen/*
/src/*
/target/
.help
-
-.theia
-.settings
-.classpath
-.project
\ No newline at end of file
diff --git a/backend/examples/SuperBrewer3000/.project b/client/workspace/SuperBrewer3000/.project
similarity index 97%
rename from backend/examples/SuperBrewer3000/.project
rename to client/workspace/SuperBrewer3000/.project
index 46fdc476..4f393bef 100644
--- a/backend/examples/SuperBrewer3000/.project
+++ b/client/workspace/SuperBrewer3000/.project
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
diff --git a/backend/examples/SuperBrewer3000/.settings/org.eclipse.core.resources.prefs b/client/workspace/SuperBrewer3000/.settings/org.eclipse.core.resources.prefs
similarity index 54%
rename from backend/examples/SuperBrewer3000/.settings/org.eclipse.core.resources.prefs
rename to client/workspace/SuperBrewer3000/.settings/org.eclipse.core.resources.prefs
index 99f26c02..896a9a53 100644
--- a/backend/examples/SuperBrewer3000/.settings/org.eclipse.core.resources.prefs
+++ b/client/workspace/SuperBrewer3000/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,2 @@
eclipse.preferences.version=1
-encoding/=UTF-8
+encoding/=UTF-8
\ No newline at end of file
diff --git a/backend/examples/SuperBrewer3000/.settings/org.eclipse.jdt.core.prefs b/client/workspace/SuperBrewer3000/.settings/org.eclipse.jdt.core.prefs
similarity index 99%
rename from backend/examples/SuperBrewer3000/.settings/org.eclipse.jdt.core.prefs
rename to client/workspace/SuperBrewer3000/.settings/org.eclipse.jdt.core.prefs
index ded3a412..5f46bd6f 100644
--- a/backend/examples/SuperBrewer3000/.settings/org.eclipse.jdt.core.prefs
+++ b/client/workspace/SuperBrewer3000/.settings/org.eclipse.jdt.core.prefs
@@ -517,4 +517,4 @@ org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
\ No newline at end of file
diff --git a/backend/examples/SuperBrewer3000/.settings/org.eclipse.jdt.launching.prefs b/client/workspace/SuperBrewer3000/.settings/org.eclipse.jdt.launching.core.prefs
similarity index 93%
rename from backend/examples/SuperBrewer3000/.settings/org.eclipse.jdt.launching.prefs
rename to client/workspace/SuperBrewer3000/.settings/org.eclipse.jdt.launching.core.prefs
index d177941e..f24b6f2a 100644
--- a/backend/examples/SuperBrewer3000/.settings/org.eclipse.jdt.launching.prefs
+++ b/client/workspace/SuperBrewer3000/.settings/org.eclipse.jdt.launching.core.prefs
@@ -1,3 +1,3 @@
eclipse.preferences.version=1
org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=ignore
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
\ No newline at end of file
diff --git a/backend/examples/SuperBrewer3000/.settings/org.eclipse.jdt.ui.prefs b/client/workspace/SuperBrewer3000/.settings/org.eclipse.jdt.ui.prefs
similarity index 99%
rename from backend/examples/SuperBrewer3000/.settings/org.eclipse.jdt.ui.prefs
rename to client/workspace/SuperBrewer3000/.settings/org.eclipse.jdt.ui.prefs
index 54b6f7a9..5a8588b0 100644
--- a/backend/examples/SuperBrewer3000/.settings/org.eclipse.jdt.ui.prefs
+++ b/client/workspace/SuperBrewer3000/.settings/org.eclipse.jdt.ui.prefs
@@ -134,4 +134,4 @@ sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-sp_cleanup.use_unboxing=true
+sp_cleanup.use_unboxing=true
\ No newline at end of file
diff --git a/backend/examples/SuperBrewer3000/.theia/launch.json b/client/workspace/SuperBrewer3000/.theia/launch.json
similarity index 99%
rename from backend/examples/SuperBrewer3000/.theia/launch.json
rename to client/workspace/SuperBrewer3000/.theia/launch.json
index 7a73da37..153967f2 100644
--- a/backend/examples/SuperBrewer3000/.theia/launch.json
+++ b/client/workspace/SuperBrewer3000/.theia/launch.json
@@ -28,4 +28,4 @@
"preLaunchTask": "Binary build"
}
]
-}
\ No newline at end of file
+}
diff --git a/backend/examples/SuperBrewer3000/.theia/settings.json b/client/workspace/SuperBrewer3000/.theia/settings.json
similarity index 83%
rename from backend/examples/SuperBrewer3000/.theia/settings.json
rename to client/workspace/SuperBrewer3000/.theia/settings.json
index 5ec233d6..a0245082 100644
--- a/backend/examples/SuperBrewer3000/.theia/settings.json
+++ b/client/workspace/SuperBrewer3000/.theia/settings.json
@@ -1,9 +1,9 @@
{
- "files.exclude": {
+ "files.exclude": {
"**/.classpath": true,
"**/.project": true,
"**/.settings": true,
"**/.factorypath": true,
"bin": true
-}
+ }
}
diff --git a/client/workspace/SuperBrewer3000/.theia/tasks.json b/client/workspace/SuperBrewer3000/.theia/tasks.json
new file mode 100644
index 00000000..b9f2a9ef
--- /dev/null
+++ b/client/workspace/SuperBrewer3000/.theia/tasks.json
@@ -0,0 +1,20 @@
+{
+ // See https://go.microsoft.com/fwlink/?LinkId=733558
+ // for the documentation about the tasks.json format
+ "version": "2.0.0",
+ "tasks": [
+ {
+ "label": "Binary build",
+ "type": "shell",
+ "command": "cd cpp && cmake . && make",
+ "group": {
+ "kind": "build",
+ "isDefault": true
+ },
+ "problemMatcher": [],
+ "runOptions": {
+ "runOn": "folderOpen"
+ }
+ }
+ ]
+}
diff --git a/backend/examples/SuperBrewer3000/pom.xml b/client/workspace/SuperBrewer3000/pom.xml
similarity index 100%
rename from backend/examples/SuperBrewer3000/pom.xml
rename to client/workspace/SuperBrewer3000/pom.xml
diff --git a/backend/examples/SuperBrewer3000/superbrewer3000.coffee b/client/workspace/SuperBrewer3000/superbrewer3000.coffee
similarity index 100%
rename from backend/examples/SuperBrewer3000/superbrewer3000.coffee
rename to client/workspace/SuperBrewer3000/superbrewer3000.coffee
diff --git a/backend/examples/SuperBrewer3000/superbrewer3000.notation b/client/workspace/SuperBrewer3000/superbrewer3000.notation
similarity index 62%
rename from backend/examples/SuperBrewer3000/superbrewer3000.notation
rename to client/workspace/SuperBrewer3000/superbrewer3000.notation
index fe3de1e4..c65fa0cf 100644
--- a/backend/examples/SuperBrewer3000/superbrewer3000.notation
+++ b/client/workspace/SuperBrewer3000/superbrewer3000.notation
@@ -1,84 +1,84 @@
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/backend/examples/SuperBrewer3000/superbrewer3000.wfconfig b/client/workspace/SuperBrewer3000/superbrewer3000.wfconfig
similarity index 100%
rename from backend/examples/SuperBrewer3000/superbrewer3000.wfconfig
rename to client/workspace/SuperBrewer3000/superbrewer3000.wfconfig
diff --git a/web/yarn.lock b/client/yarn.lock
similarity index 64%
rename from web/yarn.lock
rename to client/yarn.lock
index d3b4d3f3..18bb6ce8 100644
--- a/web/yarn.lock
+++ b/client/yarn.lock
@@ -9,13 +9,6 @@
dependencies:
"@jridgewell/trace-mapping" "^0.3.0"
-"@babel/code-frame@7.12.11":
- version "7.12.11"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
- integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
- dependencies:
- "@babel/highlight" "^7.10.4"
-
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
version "7.16.7"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
@@ -265,7 +258,7 @@
"@babel/traverse" "^7.17.3"
"@babel/types" "^7.17.0"
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7":
+"@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==
@@ -914,22 +907,39 @@
"@babel/helper-validator-identifier" "^7.16.7"
to-fast-properties "^2.0.0"
+"@cspotcode/source-map-support@^0.8.0":
+ version "0.8.1"
+ resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+ integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
+ dependencies:
+ "@jridgewell/trace-mapping" "0.3.9"
+
"@discoveryjs/json-ext@^0.5.0":
version "0.5.7"
resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
-"@eclipse-emfcloud/modelserver-theia@0.8.0-next.bfd82e29", "@eclipse-emfcloud/modelserver-theia@next":
- version "0.8.0-next.bfd82e29"
- resolved "https://registry.yarnpkg.com/@eclipse-emfcloud/modelserver-theia/-/modelserver-theia-0.8.0-next.bfd82e29.tgz#fc57ae0813e4aa9a24f6f75075103c5dc3e6374c"
- integrity sha512-69t2aqj0ZAirmJe++ndxxxAtu5fcUnaHkL9BCBJmzAK/WE2mE5gr4OokWvGsiavzA1Gah8trkN2LBGn/mBZkZA==
+"@eclipse-emfcloud/modelserver-client@0.8.0-next.795de90c":
+ version "0.8.0-next.795de90c"
+ resolved "https://registry.yarnpkg.com/@eclipse-emfcloud/modelserver-client/-/modelserver-client-0.8.0-next.795de90c.tgz#d960d8c543164fdbf519941bef2b759158ace667"
+ integrity sha512-TTJvcZ9/QJL5Y6xzyXdH9CFw8slGsxEPYFAQy0PCg5kIcI+TTmE2HG5inp9bMkyKHxqSWuE/JCMhMcOSpGGKvw==
+ dependencies:
+ axios "^0.24.0"
+ events "^3.3.0"
+ fast-json-patch "^3.1.0"
+ isomorphic-ws "^4.0.1"
+ ws "^7.4.6"
+
+"@eclipse-emfcloud/modelserver-theia@0.8.0-next", "@eclipse-emfcloud/modelserver-theia@0.8.0-next.795de90c", "@eclipse-emfcloud/modelserver-theia@next":
+ version "0.8.0-next.795de90c"
+ resolved "https://registry.yarnpkg.com/@eclipse-emfcloud/modelserver-theia/-/modelserver-theia-0.8.0-next.795de90c.tgz#ea3da09e06e116f47deb943c33877dc3521f134e"
+ integrity sha512-mmoHzYiu9HNTNwidfbkMT8/wwzpIzUdNZ3NkIKKYICYOamnGpcd49GfBJAXYPhnpaqkwvAigbZcOPVKv6TBe0A==
dependencies:
+ "@eclipse-emfcloud/modelserver-client" "0.8.0-next.795de90c"
"@theia/core" "^1.0.0"
"@theia/process" "^1.0.0"
"@theia/workspace" "^1.0.0"
- "@types/node-fetch" "2.5.7"
- node-fetch "2.6.1"
- ws "7.4.6"
+ ws "8.5.0"
"@eclipse-emfcloud/theia-tree-editor@0.7.0-next.1cc6a31", "@eclipse-emfcloud/theia-tree-editor@next":
version "0.7.0-next.1cc6a31"
@@ -940,32 +950,84 @@
"@jsonforms/react" "3.0.0-alpha.2"
"@jsonforms/vanilla-renderers" "3.0.0-alpha.2"
-"@eclipse-glsp/client@0.9.0", "@eclipse-glsp/client@next":
- version "0.9.0"
- resolved "https://registry.yarnpkg.com/@eclipse-glsp/client/-/client-0.9.0.tgz#de56dd9d273e8f89820b77ec971c62aaeee39e9e"
- integrity sha512-SpS6FiLby9Cv4F7rDh/sJpK1bnYbqu7utOtdwM8nEVWE9VZlXTgENPwBd2JmrLlbvB9lM5YVdbC+od+oc4Y5pg==
+"@eclipse-glsp/client@1.1.0-next", "@eclipse-glsp/client@1.1.0-next.7ff1b00.184", "@eclipse-glsp/client@next":
+ version "1.1.0-next.7ff1b00.184"
+ resolved "https://registry.yarnpkg.com/@eclipse-glsp/client/-/client-1.1.0-next.7ff1b00.184.tgz#87d341999313578dc17c6f050c6de92d92297d35"
+ integrity sha512-PI9iKaGERytO3aOeNNDVs3wEhGY/BXNsd6tF3s+n5XPP7qMWPOtDcOUnvODVyjM/6pkoA7amQnlhgdzP8tphfg==
dependencies:
- "@eclipse-glsp/protocol" "0.9.0"
+ "@eclipse-glsp/protocol" "1.1.0-next.7ff1b00.184+7ff1b00"
autocompleter "5.1.0"
- sprotty "0.10.0"
+ sprotty "0.12.0"
-"@eclipse-glsp/protocol@0.9.0":
- version "0.9.0"
- resolved "https://registry.yarnpkg.com/@eclipse-glsp/protocol/-/protocol-0.9.0.tgz#14c43a8b94992dad63dd1c63db31c2a366ce2072"
- integrity sha512-8PVBoKb4TN7u3L5xOGbiOem3XzbOK8xY0sNgU7IWCDBfi3Lx1dlW9oNI8SXSGG+gZsfqlAb8PMwKN4JFgqw0og==
+"@eclipse-glsp/config@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@eclipse-glsp/config/-/config-1.0.0.tgz#27ea4d00dcd7669bd95eb45456194d159b916546"
+ integrity sha512-/4nDtWki136vLxtXuEPQAkT6zLYtn8SbZ8VuAel6+vc6f+LsTeB1bQW00v4AsmMZmX1gXOnPFuMWMf/34xhNPQ==
+ dependencies:
+ "@eclipse-glsp/eslint-config" "^1.0.0"
+ "@eclipse-glsp/mocha-config" "^1.0.0"
+ "@eclipse-glsp/prettier-config" "^1.0.0"
+ "@eclipse-glsp/ts-config" "^1.0.0"
+ prettier "^2.4.1"
+
+"@eclipse-glsp/eslint-config@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@eclipse-glsp/eslint-config/-/eslint-config-1.0.0.tgz#07d9ff22f6a49a37db71641bcaca755dc8e81e6e"
+ integrity sha512-DDsWO2VL9dSdofenIVlx0pjsS9Trp29Npy7CyvP7em/Zk5ZMd0BAdgarzVmK88AbCAhGg35SCgNIzNxpgoi54w==
+ dependencies:
+ "@typescript-eslint/eslint-plugin" "^5.13.0"
+ "@typescript-eslint/parser" "^5.13.0"
+ eslint "^8.10.0"
+ eslint-config-prettier "^8.5.0"
+ eslint-plugin-chai-friendly "^0.7.2"
+ eslint-plugin-deprecation "^1.3.2"
+ eslint-plugin-header "^3.1.1"
+ eslint-plugin-import "^2.25.4"
+ eslint-plugin-no-null "^1.0.2"
+
+"@eclipse-glsp/mocha-config@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@eclipse-glsp/mocha-config/-/mocha-config-1.0.0.tgz#01e14f1adf53a585a9e6e8a5bcaceb80ecd77932"
+ integrity sha512-KP5hjb4kKrjIijMnyhwYtDPCvq6hqqvOwlPdvhkKiAEargSYQ47SLT74c33S3dYSB/VGnIOPH8DVEthVOHnEcA==
+ dependencies:
+ "@types/chai" "^4.2.22"
+ "@types/mocha" "^9.0.0"
+ "@types/sinon" "^10.0.6"
+ chai "^4.3.4"
+ ignore-styles "^5.0.1"
+ mocha "^9.1.3"
+ mocha-jenkins-reporter "^0.4.7"
+ sinon "^12.0.1"
+ ts-node "^10.4.0"
+
+"@eclipse-glsp/prettier-config@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@eclipse-glsp/prettier-config/-/prettier-config-1.0.0.tgz#8ff72c8709a4233af98e38535feb3415b699a4b9"
+ integrity sha512-Fwzd2vRD5aspzY9VqUhRU11no1apVz6Pw4hvz4gLxFSoJIwE+tofux5jBOLQVFv3DmB7HJgksrTznCwEzta8kA==
+
+"@eclipse-glsp/protocol@1.1.0-next.7ff1b00.184", "@eclipse-glsp/protocol@1.1.0-next.7ff1b00.184+7ff1b00":
+ version "1.1.0-next.7ff1b00.184"
+ resolved "https://registry.yarnpkg.com/@eclipse-glsp/protocol/-/protocol-1.1.0-next.7ff1b00.184.tgz#9a797cce69e587666d20899d4cbf66c9c68bc161"
+ integrity sha512-MEPRrlOYNnQx244R/yZ4VGKlnQVH5bwdZ+ytflezJuDjXgBWEFP30zSMSgxkZ/+pvs/2X9YBRs6luBQ6iQFNCA==
dependencies:
- inversify "^5.0.1"
+ sprotty-protocol "0.12.0"
uuid "7.0.3"
vscode-ws-jsonrpc "0.2.0"
-"@eclipse-glsp/theia-integration@0.9.0", "@eclipse-glsp/theia-integration@next":
- version "0.9.0"
- resolved "https://registry.yarnpkg.com/@eclipse-glsp/theia-integration/-/theia-integration-0.9.0.tgz#401d97812079c132b9455fdc099b125b77c86ef0"
- integrity sha512-3UmZhIFqWaVE9wWN6l3VfVItArqXC0zLGl5tsiR25KETpm91TTAuDw8ymhVjVKPbhzWJkXVhyJ1manAB3N2T5g==
+"@eclipse-glsp/theia-integration@1.1.0-next", "@eclipse-glsp/theia-integration@1.1.0-next.7f1c788.133":
+ version "1.1.0-next.7f1c788.133"
+ resolved "https://registry.yarnpkg.com/@eclipse-glsp/theia-integration/-/theia-integration-1.1.0-next.7f1c788.133.tgz#38c1a74d30561ef6986056556fe9676a31f1449f"
+ integrity sha512-S3+WJIS6/GYzgs5jAaBUJilbmSenK54bEl6q7YkNM6z9v/DD9cKwtLHjyaA5Hd/jhwIWlkk4v4HZ17KSQPF/Uw==
dependencies:
- "@eclipse-glsp/client" "0.9.0"
- "@theia/messages" "^1.0.0"
- sprotty-theia "0.10.0"
+ "@eclipse-glsp/client" next
+ "@theia/core" "^1.27.0"
+ "@theia/messages" "^1.27.0"
+ sprotty-theia "0.12.0"
+
+"@eclipse-glsp/ts-config@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@eclipse-glsp/ts-config/-/ts-config-1.0.0.tgz#9196016057b73eccf0fcbd35d771f26c08a3d6dd"
+ integrity sha512-4NCuSv/Q9IFvkZxszZmIpt80BJM9catYygqpJw0/luyXj2/bdHT/vdiCEw/wgrt0lJjOjrY4qi6VFApwrx0NXQ==
"@eclipsesource/comparison-extension@0.0.1-next.20220414-105416":
version "0.0.1-next.20220414-105416"
@@ -986,19 +1048,35 @@
redux "^4.0.4"
uuid "^3.3.2"
-"@eslint/eslintrc@^0.4.3":
- version "0.4.3"
- resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
- integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
+"@electron/get@^1.12.4":
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
+ integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==
dependencies:
- ajv "^6.12.4"
debug "^4.1.1"
- espree "^7.3.0"
- globals "^13.9.0"
- ignore "^4.0.6"
+ env-paths "^2.2.0"
+ fs-extra "^8.1.0"
+ got "^9.6.0"
+ progress "^2.0.3"
+ semver "^6.2.0"
+ sumchecker "^3.0.1"
+ optionalDependencies:
+ global-agent "^3.0.0"
+ global-tunnel-ng "^2.7.1"
+
+"@eslint/eslintrc@^1.3.1":
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.1.tgz#de0807bfeffc37b964a7d0400e0c348ce5a2543d"
+ integrity sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==
+ dependencies:
+ ajv "^6.12.4"
+ debug "^4.3.2"
+ espree "^9.4.0"
+ globals "^13.15.0"
+ ignore "^5.2.0"
import-fresh "^3.2.1"
- js-yaml "^3.13.1"
- minimatch "^3.0.4"
+ js-yaml "^4.1.0"
+ minimatch "^3.1.2"
strip-json-comments "^3.1.1"
"@fortawesome/fontawesome-free@^5.14.0":
@@ -1006,24 +1084,39 @@
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5"
integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==
-"@humanwhocodes/config-array@^0.5.0":
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
- integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
+ integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
+
+"@humanwhocodes/config-array@^0.10.4":
+ version "0.10.4"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.4.tgz#01e7366e57d2ad104feea63e72248f22015c520c"
+ integrity sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==
dependencies:
- "@humanwhocodes/object-schema" "^1.2.0"
+ "@humanwhocodes/object-schema" "^1.2.1"
debug "^4.1.1"
minimatch "^3.0.4"
-"@humanwhocodes/object-schema@^1.2.0":
+"@humanwhocodes/gitignore-to-minimatch@^1.0.2":
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
+ integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
+
+"@humanwhocodes/module-importer@^1.0.1":
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+ integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
-"@improved/node@^1.0.0":
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/@improved/node/-/node-1.1.1.tgz#7be3d401b7cd2f848d5bb8713d2826b84fc51817"
- integrity sha512-ePDxG9UuU9Kobk90ZUjtmDW8IT9U7aRb1/Rl9683MRNM+ur0ocHL2v7TPH2ajTiVSBUFbbeW8vKIt9jrb0JIAA==
+"@hutson/parse-repository-url@^3.0.0":
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340"
+ integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==
"@jridgewell/resolve-uri@^3.0.3":
version "3.0.5"
@@ -1035,6 +1128,14 @@
resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+"@jridgewell/trace-mapping@0.3.9":
+ version "0.3.9"
+ resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+ integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
+ dependencies:
+ "@jridgewell/resolve-uri" "^3.0.3"
+ "@jridgewell/sourcemap-codec" "^1.4.10"
+
"@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"
@@ -1093,260 +1194,1185 @@
resolved "https://registry.yarnpkg.com/@jsonforms/vanilla-renderers/-/vanilla-renderers-3.0.0-alpha.2.tgz#82dd99afe38080fda621266b5671a212200658cd"
integrity sha512-okLash03PG3/YhkEsy+QsM2MZBtWFIMmnipMJ9RHqUPSTpBDqigP/NZEp8QMEqdBisqDNFhNTXw1UhMzMirC6Q==
-"@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==
- dependencies:
- "@nodelib/fs.stat" "2.0.5"
- run-parallel "^1.1.9"
+"@lerna/add@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/add/-/add-4.0.0.tgz#c36f57d132502a57b9e7058d1548b7a565ef183f"
+ integrity sha512-cpmAH1iS3k8JBxNvnMqrGTTjbY/ZAiKa1ChJzFevMYY3eeqbvhsBKnBcxjRXtdrJ6bd3dCQM+ZtK+0i682Fhng==
+ dependencies:
+ "@lerna/bootstrap" "4.0.0"
+ "@lerna/command" "4.0.0"
+ "@lerna/filter-options" "4.0.0"
+ "@lerna/npm-conf" "4.0.0"
+ "@lerna/validation-error" "4.0.0"
+ dedent "^0.7.0"
+ npm-package-arg "^8.1.0"
+ p-map "^4.0.0"
+ pacote "^11.2.6"
+ semver "^7.3.4"
-"@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==
+"@lerna/bootstrap@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-4.0.0.tgz#5f5c5e2c6cfc8fcec50cb2fbe569a8c607101891"
+ integrity sha512-RkS7UbeM2vu+kJnHzxNRCLvoOP9yGNgkzRdy4UV2hNalD7EP41bLvRVOwRYQ7fhc2QcbhnKNdOBihYRL0LcKtw==
+ dependencies:
+ "@lerna/command" "4.0.0"
+ "@lerna/filter-options" "4.0.0"
+ "@lerna/has-npm-version" "4.0.0"
+ "@lerna/npm-install" "4.0.0"
+ "@lerna/package-graph" "4.0.0"
+ "@lerna/pulse-till-done" "4.0.0"
+ "@lerna/rimraf-dir" "4.0.0"
+ "@lerna/run-lifecycle" "4.0.0"
+ "@lerna/run-topologically" "4.0.0"
+ "@lerna/symlink-binary" "4.0.0"
+ "@lerna/symlink-dependencies" "4.0.0"
+ "@lerna/validation-error" "4.0.0"
+ dedent "^0.7.0"
+ get-port "^5.1.1"
+ multimatch "^5.0.0"
+ npm-package-arg "^8.1.0"
+ npmlog "^4.1.2"
+ p-map "^4.0.0"
+ p-map-series "^2.1.0"
+ p-waterfall "^2.1.1"
+ read-package-tree "^5.3.1"
+ semver "^7.3.4"
-"@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==
+"@lerna/changed@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-4.0.0.tgz#b9fc76cea39b9292a6cd263f03eb57af85c9270b"
+ integrity sha512-cD+KuPRp6qiPOD+BO6S6SN5cARspIaWSOqGBpGnYzLb4uWT8Vk4JzKyYtc8ym1DIwyoFXHosXt8+GDAgR8QrgQ==
dependencies:
- "@nodelib/fs.scandir" "2.1.5"
- fastq "^1.6.0"
+ "@lerna/collect-updates" "4.0.0"
+ "@lerna/command" "4.0.0"
+ "@lerna/listable" "4.0.0"
+ "@lerna/output" "4.0.0"
-"@phosphor/algorithm@1", "@phosphor/algorithm@^1.2.0":
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/@phosphor/algorithm/-/algorithm-1.2.0.tgz#4a19aa59261b7270be696672dc3f0663f7bef152"
- integrity sha512-C9+dnjXyU2QAkWCW6QVDGExk4hhwxzAKf5/FIuYlHAI9X5vFv99PYm0EREDxX1PbMuvfFBZhPNu0PvuSDQ7sFA==
+"@lerna/check-working-tree@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-4.0.0.tgz#257e36a602c00142e76082a19358e3e1ae8dbd58"
+ integrity sha512-/++bxM43jYJCshBiKP5cRlCTwSJdRSxVmcDAXM+1oUewlZJVSVlnks5eO0uLxokVFvLhHlC5kHMc7gbVFPHv6Q==
+ dependencies:
+ "@lerna/collect-uncommitted" "4.0.0"
+ "@lerna/describe-ref" "4.0.0"
+ "@lerna/validation-error" "4.0.0"
-"@phosphor/collections@^1.2.0":
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/@phosphor/collections/-/collections-1.2.0.tgz#a8cdd0edc0257de7c33306a91caf47910036307f"
- integrity sha512-T9/0EjSuY6+ga2LIFRZ0xupciOR3Qnyy8Q95lhGTC0FXZUFwC8fl9e8On6IcwasCszS+1n8dtZUWSIynfgdpzw==
+"@lerna/child-process@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-4.0.0.tgz#341b96a57dffbd9705646d316e231df6fa4df6e1"
+ integrity sha512-XtCnmCT9eyVsUUHx6y/CTBYdV9g2Cr/VxyseTWBgfIur92/YKClfEtJTbOh94jRT62hlKLqSvux/UhxXVh613Q==
dependencies:
- "@phosphor/algorithm" "^1.2.0"
+ chalk "^4.1.0"
+ execa "^5.0.0"
+ strong-log-transformer "^2.1.0"
-"@phosphor/commands@1", "@phosphor/commands@^1.7.2":
- version "1.7.2"
- resolved "https://registry.yarnpkg.com/@phosphor/commands/-/commands-1.7.2.tgz#df724f2896ae43c4a3a9e2b5a6445a15e0d60487"
- integrity sha512-iSyBIWMHsus323BVEARBhuVZNnVel8USo+FIPaAxGcq+icTSSe6+NtSxVQSmZblGN6Qm4iw6I6VtiSx0e6YDgQ==
+"@lerna/clean@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-4.0.0.tgz#8f778b6f2617aa2a936a6b5e085ae62498e57dc5"
+ integrity sha512-uugG2iN9k45ITx2jtd8nEOoAtca8hNlDCUM0N3lFgU/b1mEQYAPRkqr1qs4FLRl/Y50ZJ41wUz1eazS+d/0osA==
+ dependencies:
+ "@lerna/command" "4.0.0"
+ "@lerna/filter-options" "4.0.0"
+ "@lerna/prompt" "4.0.0"
+ "@lerna/pulse-till-done" "4.0.0"
+ "@lerna/rimraf-dir" "4.0.0"
+ p-map "^4.0.0"
+ p-map-series "^2.1.0"
+ p-waterfall "^2.1.1"
+
+"@lerna/cli@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-4.0.0.tgz#8eabd334558836c1664df23f19acb95e98b5bbf3"
+ integrity sha512-Neaw3GzFrwZiRZv2g7g6NwFjs3er1vhraIniEs0jjVLPMNC4eata0na3GfE5yibkM/9d3gZdmihhZdZ3EBdvYA==
dependencies:
- "@phosphor/algorithm" "^1.2.0"
- "@phosphor/coreutils" "^1.3.1"
- "@phosphor/disposable" "^1.3.1"
- "@phosphor/domutils" "^1.1.4"
- "@phosphor/keyboard" "^1.1.3"
- "@phosphor/signaling" "^1.3.1"
+ "@lerna/global-options" "4.0.0"
+ dedent "^0.7.0"
+ npmlog "^4.1.2"
+ yargs "^16.2.0"
-"@phosphor/coreutils@1", "@phosphor/coreutils@^1.3.1":
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/@phosphor/coreutils/-/coreutils-1.3.1.tgz#441e34f42340f7faa742a88b2a181947a88d7226"
- integrity sha512-9OHCn8LYRcPU/sbHm5v7viCA16Uev3gbdkwqoQqlV+EiauDHl70jmeL7XVDXdigl66Dz0LI11C99XOxp+s3zOA==
+"@lerna/collect-uncommitted@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/collect-uncommitted/-/collect-uncommitted-4.0.0.tgz#855cd64612969371cfc2453b90593053ff1ba779"
+ integrity sha512-ufSTfHZzbx69YNj7KXQ3o66V4RC76ffOjwLX0q/ab//61bObJ41n03SiQEhSlmpP+gmFbTJ3/7pTe04AHX9m/g==
+ dependencies:
+ "@lerna/child-process" "4.0.0"
+ chalk "^4.1.0"
+ npmlog "^4.1.2"
-"@phosphor/disposable@^1.3.1":
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/@phosphor/disposable/-/disposable-1.3.1.tgz#be98fe12bd8c9a4600741cb83b0a305df28628f3"
- integrity sha512-0NGzoTXTOizWizK/brKKd5EjJhuuEH4903tLika7q6wl/u0tgneJlTh7R+MBVeih0iNxtuJAfBa3IEY6Qmj+Sw==
+"@lerna/collect-updates@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-4.0.0.tgz#8e208b1bafd98a372ff1177f7a5e288f6bea8041"
+ integrity sha512-bnNGpaj4zuxsEkyaCZLka9s7nMs58uZoxrRIPJ+nrmrZYp1V5rrd+7/NYTuunOhY2ug1sTBvTAxj3NZQ+JKnOw==
dependencies:
- "@phosphor/algorithm" "^1.2.0"
- "@phosphor/signaling" "^1.3.1"
+ "@lerna/child-process" "4.0.0"
+ "@lerna/describe-ref" "4.0.0"
+ minimatch "^3.0.4"
+ npmlog "^4.1.2"
+ slash "^3.0.0"
-"@phosphor/domutils@1", "@phosphor/domutils@^1.1.4":
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/@phosphor/domutils/-/domutils-1.1.4.tgz#4c6aecf7902d3793b45db325319340e0a0b5543b"
- integrity sha512-ivwq5TWjQpKcHKXO8PrMl+/cKqbgxPClPiCKc1gwbMd+6hnW5VLwNG0WBzJTxCzXK43HxX18oH+tOZ3E04wc3w==
+"@lerna/command@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/command/-/command-4.0.0.tgz#991c7971df8f5bf6ae6e42c808869a55361c1b98"
+ integrity sha512-LM9g3rt5FsPNFqIHUeRwWXLNHJ5NKzOwmVKZ8anSp4e1SPrv2HNc1V02/9QyDDZK/w+5POXH5lxZUI1CHaOK/A==
+ dependencies:
+ "@lerna/child-process" "4.0.0"
+ "@lerna/package-graph" "4.0.0"
+ "@lerna/project" "4.0.0"
+ "@lerna/validation-error" "4.0.0"
+ "@lerna/write-log-file" "4.0.0"
+ clone-deep "^4.0.1"
+ dedent "^0.7.0"
+ execa "^5.0.0"
+ is-ci "^2.0.0"
+ npmlog "^4.1.2"
-"@phosphor/dragdrop@1", "@phosphor/dragdrop@^1.4.1":
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/@phosphor/dragdrop/-/dragdrop-1.4.1.tgz#45887dfe8f5849db2b4d1c0329a377f0f0854464"
- integrity sha512-77paMoubIWk7pdwA2GVFkqba1WP48hTZZvS17N30+KVOeWfSqBL3flPSnW2yC4y6FnOP2PFOCtuPIbQv+pYhCA==
+"@lerna/conventional-commits@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-4.0.0.tgz#660fb2c7b718cb942ead70110df61f18c6f99750"
+ integrity sha512-CSUQRjJHFrH8eBn7+wegZLV3OrNc0Y1FehYfYGhjLE2SIfpCL4bmfu/ViYuHh9YjwHaA+4SX6d3hR+xkeseKmw==
+ dependencies:
+ "@lerna/validation-error" "4.0.0"
+ conventional-changelog-angular "^5.0.12"
+ conventional-changelog-core "^4.2.2"
+ conventional-recommended-bump "^6.1.0"
+ fs-extra "^9.1.0"
+ get-stream "^6.0.0"
+ lodash.template "^4.5.0"
+ npm-package-arg "^8.1.0"
+ npmlog "^4.1.2"
+ pify "^5.0.0"
+ semver "^7.3.4"
+
+"@lerna/create-symlink@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-4.0.0.tgz#8c5317ce5ae89f67825443bd7651bf4121786228"
+ integrity sha512-I0phtKJJdafUiDwm7BBlEUOtogmu8+taxq6PtIrxZbllV9hWg59qkpuIsiFp+no7nfRVuaasNYHwNUhDAVQBig==
dependencies:
- "@phosphor/coreutils" "^1.3.1"
- "@phosphor/disposable" "^1.3.1"
+ cmd-shim "^4.1.0"
+ fs-extra "^9.1.0"
+ npmlog "^4.1.2"
-"@phosphor/keyboard@^1.1.3":
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/@phosphor/keyboard/-/keyboard-1.1.3.tgz#e5fd13af0479034ef0b5fffcf43ef2d4a266b5b6"
- integrity sha512-dzxC/PyHiD6mXaESRy6PZTd9JeK+diwG1pyngkyUf127IXOEzubTIbu52VSdpGBklszu33ws05BAGDa4oBE4mQ==
+"@lerna/create@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/create/-/create-4.0.0.tgz#b6947e9b5dfb6530321952998948c3e63d64d730"
+ integrity sha512-mVOB1niKByEUfxlbKTM1UNECWAjwUdiioIbRQZEeEabtjCL69r9rscIsjlGyhGWCfsdAG5wfq4t47nlDXdLLag==
+ dependencies:
+ "@lerna/child-process" "4.0.0"
+ "@lerna/command" "4.0.0"
+ "@lerna/npm-conf" "4.0.0"
+ "@lerna/validation-error" "4.0.0"
+ dedent "^0.7.0"
+ fs-extra "^9.1.0"
+ globby "^11.0.2"
+ init-package-json "^2.0.2"
+ npm-package-arg "^8.1.0"
+ p-reduce "^2.1.0"
+ pacote "^11.2.6"
+ pify "^5.0.0"
+ semver "^7.3.4"
+ slash "^3.0.0"
+ validate-npm-package-license "^3.0.4"
+ validate-npm-package-name "^3.0.0"
+ whatwg-url "^8.4.0"
+ yargs-parser "20.2.4"
-"@phosphor/messaging@1", "@phosphor/messaging@^1.3.0":
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/@phosphor/messaging/-/messaging-1.3.0.tgz#a140e6dd28a496260779acf74860f738c654c65e"
- integrity sha512-k0JE+BTMKlkM335S2AmmJxoYYNRwOdW5jKBqLgjJdGRvUQkM0+2i60ahM45+J23atGJDv9esKUUBINiKHFhLew==
+"@lerna/describe-ref@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-4.0.0.tgz#53c53b4ea65fdceffa072a62bfebe6772c45d9ec"
+ integrity sha512-eTU5+xC4C5Gcgz+Ey4Qiw9nV2B4JJbMulsYJMW8QjGcGh8zudib7Sduj6urgZXUYNyhYpRs+teci9M2J8u+UvQ==
dependencies:
- "@phosphor/algorithm" "^1.2.0"
- "@phosphor/collections" "^1.2.0"
+ "@lerna/child-process" "4.0.0"
+ npmlog "^4.1.2"
-"@phosphor/properties@1", "@phosphor/properties@^1.1.3":
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/@phosphor/properties/-/properties-1.1.3.tgz#63e4355be5e22a411c566fd1860207038f171598"
- integrity sha512-GiglqzU77s6+tFVt6zPq9uuyu/PLQPFcqZt914ZhJ4cN/7yNI/SLyMzpYZ56IRMXvzK9TUgbRna6URE3XAwFUg==
+"@lerna/diff@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-4.0.0.tgz#6d3071817aaa4205a07bf77cfc6e932796d48b92"
+ integrity sha512-jYPKprQVg41+MUMxx6cwtqsNm0Yxx9GDEwdiPLwcUTFx+/qKCEwifKNJ1oGIPBxyEHX2PFCOjkK39lHoj2qiag==
+ dependencies:
+ "@lerna/child-process" "4.0.0"
+ "@lerna/command" "4.0.0"
+ "@lerna/validation-error" "4.0.0"
+ npmlog "^4.1.2"
-"@phosphor/signaling@1", "@phosphor/signaling@^1.3.1":
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/@phosphor/signaling/-/signaling-1.3.1.tgz#1cd10b069bdb2c9adb3ba74245b30141e5afc2d7"
- integrity sha512-Eq3wVCPQAhUd9+gUGaYygMr+ov7dhSGblSBXiDzpZlSIfa8OVD4P3cCvYXr/acDTNmZ/gHTcSFO8/n3rDkeXzg==
+"@lerna/exec@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-4.0.0.tgz#eb6cb95cb92d42590e9e2d628fcaf4719d4a8be6"
+ integrity sha512-VGXtL/b/JfY84NB98VWZpIExfhLOzy0ozm/0XaS4a2SmkAJc5CeUfrhvHxxkxiTBLkU+iVQUyYEoAT0ulQ8PCw==
+ dependencies:
+ "@lerna/child-process" "4.0.0"
+ "@lerna/command" "4.0.0"
+ "@lerna/filter-options" "4.0.0"
+ "@lerna/profiler" "4.0.0"
+ "@lerna/run-topologically" "4.0.0"
+ "@lerna/validation-error" "4.0.0"
+ p-map "^4.0.0"
+
+"@lerna/filter-options@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-4.0.0.tgz#ac94cc515d7fa3b47e2f7d74deddeabb1de5e9e6"
+ integrity sha512-vV2ANOeZhOqM0rzXnYcFFCJ/kBWy/3OA58irXih9AMTAlQLymWAK0akWybl++sUJ4HB9Hx12TOqaXbYS2NM5uw==
dependencies:
- "@phosphor/algorithm" "^1.2.0"
+ "@lerna/collect-updates" "4.0.0"
+ "@lerna/filter-packages" "4.0.0"
+ dedent "^0.7.0"
+ npmlog "^4.1.2"
-"@phosphor/virtualdom@1", "@phosphor/virtualdom@^1.2.0":
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/@phosphor/virtualdom/-/virtualdom-1.2.0.tgz#6a233312f817eb02555a0359c4ae3e501fa62bca"
- integrity sha512-L9mKNhK2XtVjzjuHLG2uYuepSz8uPyu6vhF4EgCP0rt0TiLYaZeHwuNu3XeFbul9DMOn49eBpye/tfQVd4Ks+w==
+"@lerna/filter-packages@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-4.0.0.tgz#b1f70d70e1de9cdd36a4e50caa0ac501f8d012f2"
+ integrity sha512-+4AJIkK7iIiOaqCiVTYJxh/I9qikk4XjNQLhE3kixaqgMuHl1NQ99qXRR0OZqAWB9mh8Z1HA9bM5K1HZLBTOqA==
dependencies:
- "@phosphor/algorithm" "^1.2.0"
+ "@lerna/validation-error" "4.0.0"
+ multimatch "^5.0.0"
+ npmlog "^4.1.2"
-"@phosphor/widgets@1":
- version "1.9.3"
- resolved "https://registry.yarnpkg.com/@phosphor/widgets/-/widgets-1.9.3.tgz#b8b7ad69fd7cc7af8e8c312ebead0e0965a4cefd"
- integrity sha512-61jsxloDrW/+WWQs8wOgsS5waQ/MSsXBuhONt0o6mtdeL93HVz7CYO5krOoot5owammfF6oX1z0sDaUYIYgcPA==
+"@lerna/get-npm-exec-opts@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-4.0.0.tgz#dc955be94a4ae75c374ef9bce91320887d34608f"
+ integrity sha512-yvmkerU31CTWS2c7DvmAWmZVeclPBqI7gPVr5VATUKNWJ/zmVcU4PqbYoLu92I9Qc4gY1TuUplMNdNuZTSL7IQ==
dependencies:
- "@phosphor/algorithm" "^1.2.0"
- "@phosphor/commands" "^1.7.2"
- "@phosphor/coreutils" "^1.3.1"
- "@phosphor/disposable" "^1.3.1"
- "@phosphor/domutils" "^1.1.4"
- "@phosphor/dragdrop" "^1.4.1"
- "@phosphor/keyboard" "^1.1.3"
- "@phosphor/messaging" "^1.3.0"
- "@phosphor/properties" "^1.1.3"
- "@phosphor/signaling" "^1.3.1"
- "@phosphor/virtualdom" "^1.2.0"
+ npmlog "^4.1.2"
-"@primer/octicons-react@^9.0.0":
- version "9.6.0"
- resolved "https://registry.yarnpkg.com/@primer/octicons-react/-/octicons-react-9.6.0.tgz#996f621cb063757a4985cd6b45e59ed00e3444bf"
- integrity sha512-FR0fiU1UY1ds5ZMCUY+iVkkm1Eh4yDHf2ui+cxB3VvYX23DAdUAohPGit+qaMFy2caDd7uWYGRZduKS7dW1FZQ==
+"@lerna/get-packed@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-4.0.0.tgz#0989d61624ac1f97e393bdad2137c49cd7a37823"
+ integrity sha512-rfWONRsEIGyPJTxFzC8ECb3ZbsDXJbfqWYyeeQQDrJRPnEJErlltRLPLgC2QWbxFgFPsoDLeQmFHJnf0iDfd8w==
dependencies:
- prop-types "^15.6.1"
+ fs-extra "^9.1.0"
+ ssri "^8.0.1"
+ tar "^6.1.0"
-"@sindresorhus/df@^1.0.1":
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/@sindresorhus/df/-/df-1.0.1.tgz#c69b66f52f6fcdd287c807df210305dbaf78500d"
- integrity sha1-xptm9S9vzdKHyAffIQMF2694UA0=
+"@lerna/github-client@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-4.0.0.tgz#2ced67721363ef70f8e12ffafce4410918f4a8a4"
+ integrity sha512-2jhsldZtTKXYUBnOm23Lb0Fx8G4qfSXF9y7UpyUgWUj+YZYd+cFxSuorwQIgk5P4XXrtVhsUesIsli+BYSThiw==
+ dependencies:
+ "@lerna/child-process" "4.0.0"
+ "@octokit/plugin-enterprise-rest" "^6.0.1"
+ "@octokit/rest" "^18.1.0"
+ git-url-parse "^11.4.4"
+ npmlog "^4.1.2"
-"@sindresorhus/df@^2.1.0":
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/@sindresorhus/df/-/df-2.1.0.tgz#d208cf27e06f0bb476d14d7deccd7d726e9aa389"
- integrity sha1-0gjPJ+BvC7R20U197M19cm6ao4k=
+"@lerna/gitlab-client@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/gitlab-client/-/gitlab-client-4.0.0.tgz#00dad73379c7b38951d4b4ded043504c14e2b67d"
+ integrity sha512-OMUpGSkeDWFf7BxGHlkbb35T7YHqVFCwBPSIR6wRsszY8PAzCYahtH3IaJzEJyUg6vmZsNl0FSr3pdA2skhxqA==
dependencies:
- execa "^0.2.2"
+ node-fetch "^2.6.1"
+ npmlog "^4.1.2"
+ whatwg-url "^8.4.0"
-"@stroncium/procfs@^1.0.0":
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/@stroncium/procfs/-/procfs-1.2.1.tgz#6b9be6fd20fb0a4c20e99a8695e083c699bb2b45"
- integrity sha512-X1Iui3FUNZP18EUvysTHxt+Avu2nlVzyf90YM8OYgP6SGzTzzX/0JgObfO1AQQDzuZtNNz29bVh8h5R97JrjxA==
+"@lerna/global-options@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-4.0.0.tgz#c7d8b0de6a01d8a845e2621ea89e7f60f18c6a5f"
+ integrity sha512-TRMR8afAHxuYBHK7F++Ogop2a82xQjoGna1dvPOY6ltj/pEx59pdgcJfYcynYqMkFIk8bhLJJN9/ndIfX29FTQ==
-"@theia/application-manager@1.20.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-1.20.0.tgz#406ae103e4d5d86c6c3fe22153fb7f65b5d45bd8"
- integrity sha512-MFJZxC/RT+nN+uU/uhN6OwVyFyCKHgCVUhN+gJ7DQzhVcUO4RBExFzMBuvtV8yQ5sixEHGtdZIWtWuu8sLV4CQ==
+"@lerna/has-npm-version@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-4.0.0.tgz#d3fc3292c545eb28bd493b36e6237cf0279f631c"
+ integrity sha512-LQ3U6XFH8ZmLCsvsgq1zNDqka0Xzjq5ibVN+igAI5ccRWNaUsE/OcmsyMr50xAtNQMYMzmpw5GVLAivT2/YzCg==
dependencies:
- "@babel/core" "^7.10.0"
- "@babel/plugin-transform-classes" "^7.10.0"
- "@babel/plugin-transform-runtime" "^7.10.0"
- "@babel/preset-env" "^7.10.0"
- "@theia/application-package" "1.20.0"
- "@types/fs-extra" "^4.0.2"
- babel-loader "^8.2.2"
- buffer "^6.0.3"
- circular-dependency-plugin "^5.2.2"
- compression-webpack-plugin "^9.0.0"
- copy-webpack-plugin "^8.1.1"
- css-loader "^6.2.0"
- electron-rebuild "^1.8.6"
- fs-extra "^4.0.2"
- ignore-loader "^0.1.2"
- less "^3.0.3"
- setimmediate "^1.0.5"
- source-map-loader "^2.0.1"
- source-map-support "^0.5.19"
- style-loader "^2.0.0"
- umd-compat-loader "^2.1.2"
- webpack "^5.48.0"
- webpack-cli "4.7.0"
- worker-loader "^3.0.8"
- yargs "^15.3.1"
+ "@lerna/child-process" "4.0.0"
+ semver "^7.3.4"
-"@theia/application-package@1.20.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.20.0.tgz#04d49e2ce361197715215ab070a376becc615387"
- integrity sha512-ZimvUUxkQfcVp5DNoR8nt1BRSCRcd7XQw5iA7hNjZNl6mfCznrhQ4lDW54TEfrh92Fa8gd9PWZSpgJzvdlRbLw==
- dependencies:
- "@types/fs-extra" "^4.0.2"
- "@types/request" "^2.0.3"
- "@types/semver" "^5.4.0"
- "@types/write-json-file" "^2.2.1"
- changes-stream "^2.2.0"
- deepmerge "^4.2.2"
- fs-extra "^4.0.2"
- is-electron "^2.1.0"
- request "^2.82.0"
- semver "^5.4.1"
- write-json-file "^2.2.0"
+"@lerna/import@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/import/-/import-4.0.0.tgz#bde656c4a451fa87ae41733ff8a8da60547c5465"
+ integrity sha512-FaIhd+4aiBousKNqC7TX1Uhe97eNKf5/SC7c5WZANVWtC7aBWdmswwDt3usrzCNpj6/Wwr9EtEbYROzxKH8ffg==
+ dependencies:
+ "@lerna/child-process" "4.0.0"
+ "@lerna/command" "4.0.0"
+ "@lerna/prompt" "4.0.0"
+ "@lerna/pulse-till-done" "4.0.0"
+ "@lerna/validation-error" "4.0.0"
+ dedent "^0.7.0"
+ fs-extra "^9.1.0"
+ p-map-series "^2.1.0"
-"@theia/bulk-edit@1.20.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/bulk-edit/-/bulk-edit-1.20.0.tgz#b10e20f6fe4e3a667ee37a2653ab908b45fb5cfc"
- integrity sha512-pgnblqL7WGK3IVaLOu6yoywDTAfoFwcglCGjne28ySsW+wRYL6AemsbrpD7DORe7yfxr2jYDt0fwicDxX2fjYA==
+"@lerna/info@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/info/-/info-4.0.0.tgz#b9fb0e479d60efe1623603958a831a88b1d7f1fc"
+ integrity sha512-8Uboa12kaCSZEn4XRfPz5KU9XXoexSPS4oeYGj76s2UQb1O1GdnEyfjyNWoUl1KlJ2i/8nxUskpXIftoFYH0/Q==
dependencies:
- "@theia/core" "1.20.0"
- "@theia/editor" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/monaco" "1.20.0"
- "@theia/workspace" "1.20.0"
+ "@lerna/command" "4.0.0"
+ "@lerna/output" "4.0.0"
+ envinfo "^7.7.4"
-"@theia/callhierarchy@1.20.0", "@theia/callhierarchy@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/callhierarchy/-/callhierarchy-1.20.0.tgz#e2f610982abd50b1a8191592e2210f3497ddd812"
- integrity sha512-os1v33+fRKFS5wxnCAFWjHPrTdBpVrpaDfIBUiFETtXdmUGko9j75nFdHnQzBSCXlw0H+vVLmpjyI+/D3HILzg==
+"@lerna/init@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/init/-/init-4.0.0.tgz#dadff67e6dfb981e8ccbe0e6a310e837962f6c7a"
+ integrity sha512-wY6kygop0BCXupzWj5eLvTUqdR7vIAm0OgyV9WHpMYQGfs1V22jhztt8mtjCloD/O0nEe4tJhdG62XU5aYmPNQ==
dependencies:
- "@theia/core" "1.20.0"
- "@theia/editor" "1.20.0"
- "@theia/monaco" "1.20.0"
- ts-md5 "^1.2.2"
+ "@lerna/child-process" "4.0.0"
+ "@lerna/command" "4.0.0"
+ fs-extra "^9.1.0"
+ p-map "^4.0.0"
+ write-json-file "^4.3.0"
+
+"@lerna/link@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/link/-/link-4.0.0.tgz#c3a38aabd44279d714e90f2451e31b63f0fb65ba"
+ integrity sha512-KlvPi7XTAcVOByfaLlOeYOfkkDcd+bejpHMCd1KcArcFTwijOwXOVi24DYomIeHvy6HsX/IUquJ4PPUJIeB4+w==
+ dependencies:
+ "@lerna/command" "4.0.0"
+ "@lerna/package-graph" "4.0.0"
+ "@lerna/symlink-dependencies" "4.0.0"
+ p-map "^4.0.0"
+ slash "^3.0.0"
+
+"@lerna/list@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/list/-/list-4.0.0.tgz#24b4e6995bd73f81c556793fe502b847efd9d1d7"
+ integrity sha512-L2B5m3P+U4Bif5PultR4TI+KtW+SArwq1i75QZ78mRYxPc0U/piau1DbLOmwrdqr99wzM49t0Dlvl6twd7GHFg==
+ dependencies:
+ "@lerna/command" "4.0.0"
+ "@lerna/filter-options" "4.0.0"
+ "@lerna/listable" "4.0.0"
+ "@lerna/output" "4.0.0"
+
+"@lerna/listable@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-4.0.0.tgz#d00d6cb4809b403f2b0374fc521a78e318b01214"
+ integrity sha512-/rPOSDKsOHs5/PBLINZOkRIX1joOXUXEtyUs5DHLM8q6/RP668x/1lFhw6Dx7/U+L0+tbkpGtZ1Yt0LewCLgeQ==
+ dependencies:
+ "@lerna/query-graph" "4.0.0"
+ chalk "^4.1.0"
+ columnify "^1.5.4"
+
+"@lerna/log-packed@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-4.0.0.tgz#95168fe2e26ac6a71e42f4be857519b77e57a09f"
+ integrity sha512-+dpCiWbdzgMAtpajLToy9PO713IHoE6GV/aizXycAyA07QlqnkpaBNZ8DW84gHdM1j79TWockGJo9PybVhrrZQ==
+ dependencies:
+ byte-size "^7.0.0"
+ columnify "^1.5.4"
+ has-unicode "^2.0.1"
+ npmlog "^4.1.2"
+
+"@lerna/npm-conf@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-4.0.0.tgz#b259fd1e1cee2bf5402b236e770140ff9ade7fd2"
+ integrity sha512-uS7H02yQNq3oejgjxAxqq/jhwGEE0W0ntr8vM3EfpCW1F/wZruwQw+7bleJQ9vUBjmdXST//tk8mXzr5+JXCfw==
+ dependencies:
+ config-chain "^1.1.12"
+ pify "^5.0.0"
+
+"@lerna/npm-dist-tag@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-4.0.0.tgz#d1e99b4eccd3414142f0548ad331bf2d53f3257a"
+ integrity sha512-F20sg28FMYTgXqEQihgoqSfwmq+Id3zT23CnOwD+XQMPSy9IzyLf1fFVH319vXIw6NF6Pgs4JZN2Qty6/CQXGw==
+ dependencies:
+ "@lerna/otplease" "4.0.0"
+ npm-package-arg "^8.1.0"
+ npm-registry-fetch "^9.0.0"
+ npmlog "^4.1.2"
+
+"@lerna/npm-install@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-4.0.0.tgz#31180be3ab3b7d1818a1a0c206aec156b7094c78"
+ integrity sha512-aKNxq2j3bCH3eXl3Fmu4D54s/YLL9WSwV8W7X2O25r98wzrO38AUN6AB9EtmAx+LV/SP15et7Yueg9vSaanRWg==
+ dependencies:
+ "@lerna/child-process" "4.0.0"
+ "@lerna/get-npm-exec-opts" "4.0.0"
+ fs-extra "^9.1.0"
+ npm-package-arg "^8.1.0"
+ npmlog "^4.1.2"
+ signal-exit "^3.0.3"
+ write-pkg "^4.0.0"
+
+"@lerna/npm-publish@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-4.0.0.tgz#84eb62e876fe949ae1fd62c60804423dbc2c4472"
+ integrity sha512-vQb7yAPRo5G5r77DRjHITc9piR9gvEKWrmfCH7wkfBnGWEqu7n8/4bFQ7lhnkujvc8RXOsYpvbMQkNfkYibD/w==
+ dependencies:
+ "@lerna/otplease" "4.0.0"
+ "@lerna/run-lifecycle" "4.0.0"
+ fs-extra "^9.1.0"
+ libnpmpublish "^4.0.0"
+ npm-package-arg "^8.1.0"
+ npmlog "^4.1.2"
+ pify "^5.0.0"
+ read-package-json "^3.0.0"
+
+"@lerna/npm-run-script@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-4.0.0.tgz#dfebf4f4601442e7c0b5214f9fb0d96c9350743b"
+ integrity sha512-Jmyh9/IwXJjOXqKfIgtxi0bxi1pUeKe5bD3S81tkcy+kyng/GNj9WSqD5ZggoNP2NP//s4CLDAtUYLdP7CU9rA==
+ dependencies:
+ "@lerna/child-process" "4.0.0"
+ "@lerna/get-npm-exec-opts" "4.0.0"
+ npmlog "^4.1.2"
+
+"@lerna/otplease@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/otplease/-/otplease-4.0.0.tgz#84972eb43448f8a1077435ba1c5e59233b725850"
+ integrity sha512-Sgzbqdk1GH4psNiT6hk+BhjOfIr/5KhGBk86CEfHNJTk9BK4aZYyJD4lpDbDdMjIV4g03G7pYoqHzH765T4fxw==
+ dependencies:
+ "@lerna/prompt" "4.0.0"
+
+"@lerna/output@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/output/-/output-4.0.0.tgz#b1d72215c0e35483e4f3e9994debc82c621851f2"
+ integrity sha512-Un1sHtO1AD7buDQrpnaYTi2EG6sLF+KOPEAMxeUYG5qG3khTs2Zgzq5WE3dt2N/bKh7naESt20JjIW6tBELP0w==
+ dependencies:
+ npmlog "^4.1.2"
+
+"@lerna/pack-directory@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-4.0.0.tgz#8b617db95d20792f043aaaa13a9ccc0e04cb4c74"
+ integrity sha512-NJrmZNmBHS+5aM+T8N6FVbaKFScVqKlQFJNY2k7nsJ/uklNKsLLl6VhTQBPwMTbf6Tf7l6bcKzpy7aePuq9UiQ==
+ dependencies:
+ "@lerna/get-packed" "4.0.0"
+ "@lerna/package" "4.0.0"
+ "@lerna/run-lifecycle" "4.0.0"
+ npm-packlist "^2.1.4"
+ npmlog "^4.1.2"
+ tar "^6.1.0"
+ temp-write "^4.0.0"
+
+"@lerna/package-graph@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-4.0.0.tgz#16a00253a8ac810f72041481cb46bcee8d8123dd"
+ integrity sha512-QED2ZCTkfXMKFoTGoccwUzjHtZMSf3UKX14A4/kYyBms9xfFsesCZ6SLI5YeySEgcul8iuIWfQFZqRw+Qrjraw==
+ dependencies:
+ "@lerna/prerelease-id-from-version" "4.0.0"
+ "@lerna/validation-error" "4.0.0"
+ npm-package-arg "^8.1.0"
+ npmlog "^4.1.2"
+ semver "^7.3.4"
+
+"@lerna/package@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/package/-/package-4.0.0.tgz#1b4c259c4bcff45c876ee1d591a043aacbc0d6b7"
+ integrity sha512-l0M/izok6FlyyitxiQKr+gZLVFnvxRQdNhzmQ6nRnN9dvBJWn+IxxpM+cLqGACatTnyo9LDzNTOj2Db3+s0s8Q==
+ dependencies:
+ load-json-file "^6.2.0"
+ npm-package-arg "^8.1.0"
+ write-pkg "^4.0.0"
+
+"@lerna/prerelease-id-from-version@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-4.0.0.tgz#c7e0676fcee1950d85630e108eddecdd5b48c916"
+ integrity sha512-GQqguzETdsYRxOSmdFZ6zDBXDErIETWOqomLERRY54f4p+tk4aJjoVdd9xKwehC9TBfIFvlRbL1V9uQGHh1opg==
+ dependencies:
+ semver "^7.3.4"
+
+"@lerna/profiler@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/profiler/-/profiler-4.0.0.tgz#8a53ab874522eae15d178402bff90a14071908e9"
+ integrity sha512-/BaEbqnVh1LgW/+qz8wCuI+obzi5/vRE8nlhjPzdEzdmWmZXuCKyWSEzAyHOJWw1ntwMiww5dZHhFQABuoFz9Q==
+ dependencies:
+ fs-extra "^9.1.0"
+ npmlog "^4.1.2"
+ upath "^2.0.1"
+
+"@lerna/project@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/project/-/project-4.0.0.tgz#ff84893935833533a74deff30c0e64ddb7f0ba6b"
+ integrity sha512-o0MlVbDkD5qRPkFKlBZsXZjoNTWPyuL58564nSfZJ6JYNmgAptnWPB2dQlAc7HWRZkmnC2fCkEdoU+jioPavbg==
+ dependencies:
+ "@lerna/package" "4.0.0"
+ "@lerna/validation-error" "4.0.0"
+ cosmiconfig "^7.0.0"
+ dedent "^0.7.0"
+ dot-prop "^6.0.1"
+ glob-parent "^5.1.1"
+ globby "^11.0.2"
+ load-json-file "^6.2.0"
+ npmlog "^4.1.2"
+ p-map "^4.0.0"
+ resolve-from "^5.0.0"
+ write-json-file "^4.3.0"
+
+"@lerna/prompt@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-4.0.0.tgz#5ec69a803f3f0db0ad9f221dad64664d3daca41b"
+ integrity sha512-4Ig46oCH1TH5M7YyTt53fT6TuaKMgqUUaqdgxvp6HP6jtdak6+amcsqB8YGz2eQnw/sdxunx84DfI9XpoLj4bQ==
+ dependencies:
+ inquirer "^7.3.3"
+ npmlog "^4.1.2"
+
+"@lerna/publish@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-4.0.0.tgz#f67011305adeba120066a3b6d984a5bb5fceef65"
+ integrity sha512-K8jpqjHrChH22qtkytA5GRKIVFEtqBF6JWj1I8dWZtHs4Jywn8yB1jQ3BAMLhqmDJjWJtRck0KXhQQKzDK2UPg==
+ dependencies:
+ "@lerna/check-working-tree" "4.0.0"
+ "@lerna/child-process" "4.0.0"
+ "@lerna/collect-updates" "4.0.0"
+ "@lerna/command" "4.0.0"
+ "@lerna/describe-ref" "4.0.0"
+ "@lerna/log-packed" "4.0.0"
+ "@lerna/npm-conf" "4.0.0"
+ "@lerna/npm-dist-tag" "4.0.0"
+ "@lerna/npm-publish" "4.0.0"
+ "@lerna/otplease" "4.0.0"
+ "@lerna/output" "4.0.0"
+ "@lerna/pack-directory" "4.0.0"
+ "@lerna/prerelease-id-from-version" "4.0.0"
+ "@lerna/prompt" "4.0.0"
+ "@lerna/pulse-till-done" "4.0.0"
+ "@lerna/run-lifecycle" "4.0.0"
+ "@lerna/run-topologically" "4.0.0"
+ "@lerna/validation-error" "4.0.0"
+ "@lerna/version" "4.0.0"
+ fs-extra "^9.1.0"
+ libnpmaccess "^4.0.1"
+ npm-package-arg "^8.1.0"
+ npm-registry-fetch "^9.0.0"
+ npmlog "^4.1.2"
+ p-map "^4.0.0"
+ p-pipe "^3.1.0"
+ pacote "^11.2.6"
+ semver "^7.3.4"
+
+"@lerna/pulse-till-done@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-4.0.0.tgz#04bace7d483a8205c187b806bcd8be23d7bb80a3"
+ integrity sha512-Frb4F7QGckaybRhbF7aosLsJ5e9WuH7h0KUkjlzSByVycxY91UZgaEIVjS2oN9wQLrheLMHl6SiFY0/Pvo0Cxg==
+ dependencies:
+ npmlog "^4.1.2"
+
+"@lerna/query-graph@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/query-graph/-/query-graph-4.0.0.tgz#09dd1c819ac5ee3f38db23931143701f8a6eef63"
+ integrity sha512-YlP6yI3tM4WbBmL9GCmNDoeQyzcyg1e4W96y/PKMZa5GbyUvkS2+Jc2kwPD+5KcXou3wQZxSPzR3Te5OenaDdg==
+ dependencies:
+ "@lerna/package-graph" "4.0.0"
+
+"@lerna/resolve-symlink@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-4.0.0.tgz#6d006628a210c9b821964657a9e20a8c9a115e14"
+ integrity sha512-RtX8VEUzqT+uLSCohx8zgmjc6zjyRlh6i/helxtZTMmc4+6O4FS9q5LJas2uGO2wKvBlhcD6siibGt7dIC3xZA==
+ dependencies:
+ fs-extra "^9.1.0"
+ npmlog "^4.1.2"
+ read-cmd-shim "^2.0.0"
+
+"@lerna/rimraf-dir@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-4.0.0.tgz#2edf3b62d4eb0ef4e44e430f5844667d551ec25a"
+ integrity sha512-QNH9ABWk9mcMJh2/muD9iYWBk1oQd40y6oH+f3wwmVGKYU5YJD//+zMiBI13jxZRtwBx0vmBZzkBkK1dR11cBg==
+ dependencies:
+ "@lerna/child-process" "4.0.0"
+ npmlog "^4.1.2"
+ path-exists "^4.0.0"
+ rimraf "^3.0.2"
+
+"@lerna/run-lifecycle@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-4.0.0.tgz#e648a46f9210a9bcd7c391df6844498cb5079334"
+ integrity sha512-IwxxsajjCQQEJAeAaxF8QdEixfI7eLKNm4GHhXHrgBu185JcwScFZrj9Bs+PFKxwb+gNLR4iI5rpUdY8Y0UdGQ==
+ dependencies:
+ "@lerna/npm-conf" "4.0.0"
+ npm-lifecycle "^3.1.5"
+ npmlog "^4.1.2"
+
+"@lerna/run-topologically@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/run-topologically/-/run-topologically-4.0.0.tgz#af846eeee1a09b0c2be0d1bfb5ef0f7b04bb1827"
+ integrity sha512-EVZw9hGwo+5yp+VL94+NXRYisqgAlj0jWKWtAIynDCpghRxCE5GMO3xrQLmQgqkpUl9ZxQFpICgYv5DW4DksQA==
+ dependencies:
+ "@lerna/query-graph" "4.0.0"
+ p-queue "^6.6.2"
+
+"@lerna/run@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/run/-/run-4.0.0.tgz#4bc7fda055a729487897c23579694f6183c91262"
+ integrity sha512-9giulCOzlMPzcZS/6Eov6pxE9gNTyaXk0Man+iCIdGJNMrCnW7Dme0Z229WWP/UoxDKg71F2tMsVVGDiRd8fFQ==
+ dependencies:
+ "@lerna/command" "4.0.0"
+ "@lerna/filter-options" "4.0.0"
+ "@lerna/npm-run-script" "4.0.0"
+ "@lerna/output" "4.0.0"
+ "@lerna/profiler" "4.0.0"
+ "@lerna/run-topologically" "4.0.0"
+ "@lerna/timer" "4.0.0"
+ "@lerna/validation-error" "4.0.0"
+ p-map "^4.0.0"
+
+"@lerna/symlink-binary@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-4.0.0.tgz#21009f62d53a425f136cb4c1a32c6b2a0cc02d47"
+ integrity sha512-zualodWC4q1QQc1pkz969hcFeWXOsVYZC5AWVtAPTDfLl+TwM7eG/O6oP+Rr3fFowspxo6b1TQ6sYfDV6HXNWA==
+ dependencies:
+ "@lerna/create-symlink" "4.0.0"
+ "@lerna/package" "4.0.0"
+ fs-extra "^9.1.0"
+ p-map "^4.0.0"
+
+"@lerna/symlink-dependencies@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-4.0.0.tgz#8910eca084ae062642d0490d8972cf2d98e9ebbd"
+ integrity sha512-BABo0MjeUHNAe2FNGty1eantWp8u83BHSeIMPDxNq0MuW2K3CiQRaeWT3EGPAzXpGt0+hVzBrA6+OT0GPn7Yuw==
+ dependencies:
+ "@lerna/create-symlink" "4.0.0"
+ "@lerna/resolve-symlink" "4.0.0"
+ "@lerna/symlink-binary" "4.0.0"
+ fs-extra "^9.1.0"
+ p-map "^4.0.0"
+ p-map-series "^2.1.0"
+
+"@lerna/timer@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-4.0.0.tgz#a52e51bfcd39bfd768988049ace7b15c1fd7a6da"
+ integrity sha512-WFsnlaE7SdOvjuyd05oKt8Leg3ENHICnvX3uYKKdByA+S3g+TCz38JsNs7OUZVt+ba63nC2nbXDlUnuT2Xbsfg==
+
+"@lerna/validation-error@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-4.0.0.tgz#af9d62fe8304eaa2eb9a6ba1394f9aa807026d35"
+ integrity sha512-1rBOM5/koiVWlRi3V6dB863E1YzJS8v41UtsHgMr6gB2ncJ2LsQtMKlJpi3voqcgh41H8UsPXR58RrrpPpufyw==
+ dependencies:
+ npmlog "^4.1.2"
+
+"@lerna/version@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/version/-/version-4.0.0.tgz#532659ec6154d8a8789c5ab53878663e244e3228"
+ integrity sha512-otUgiqs5W9zGWJZSCCMRV/2Zm2A9q9JwSDS7s/tlKq4mWCYriWo7+wsHEA/nPTMDyYyBO5oyZDj+3X50KDUzeA==
+ dependencies:
+ "@lerna/check-working-tree" "4.0.0"
+ "@lerna/child-process" "4.0.0"
+ "@lerna/collect-updates" "4.0.0"
+ "@lerna/command" "4.0.0"
+ "@lerna/conventional-commits" "4.0.0"
+ "@lerna/github-client" "4.0.0"
+ "@lerna/gitlab-client" "4.0.0"
+ "@lerna/output" "4.0.0"
+ "@lerna/prerelease-id-from-version" "4.0.0"
+ "@lerna/prompt" "4.0.0"
+ "@lerna/run-lifecycle" "4.0.0"
+ "@lerna/run-topologically" "4.0.0"
+ "@lerna/validation-error" "4.0.0"
+ chalk "^4.1.0"
+ dedent "^0.7.0"
+ load-json-file "^6.2.0"
+ minimatch "^3.0.4"
+ npmlog "^4.1.2"
+ p-map "^4.0.0"
+ p-pipe "^3.1.0"
+ p-reduce "^2.1.0"
+ p-waterfall "^2.1.1"
+ semver "^7.3.4"
+ slash "^3.0.0"
+ temp-write "^4.0.0"
+ write-json-file "^4.3.0"
+
+"@lerna/write-log-file@4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-4.0.0.tgz#18221a38a6a307d6b0a5844dd592ad53fa27091e"
+ integrity sha512-XRG5BloiArpXRakcnPHmEHJp+4AtnhRtpDIHSghmXD5EichI1uD73J7FgPp30mm2pDRq3FdqB0NbwSEsJ9xFQg==
+ dependencies:
+ npmlog "^4.1.2"
+ write-file-atomic "^3.0.3"
+
+"@malept/cross-spawn-promise@^2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d"
+ integrity sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==
+ dependencies:
+ cross-spawn "^7.0.1"
+
+"@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==
+ dependencies:
+ "@nodelib/fs.stat" "2.0.5"
+ 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.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==
+ dependencies:
+ "@nodelib/fs.scandir" "2.1.5"
+ fastq "^1.6.0"
+
+"@npmcli/ci-detect@^1.0.0":
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz#18478bbaa900c37bfbd8a2006a6262c62e8b0fe1"
+ integrity sha512-3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q==
+
+"@npmcli/fs@^1.0.0":
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
+ integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
+ dependencies:
+ "@gar/promisify" "^1.0.1"
+ semver "^7.3.5"
+
+"@npmcli/fs@^2.1.0":
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
+ integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
+ dependencies:
+ "@gar/promisify" "^1.1.3"
+ semver "^7.3.5"
+
+"@npmcli/git@^2.1.0":
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6"
+ integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==
+ dependencies:
+ "@npmcli/promise-spawn" "^1.3.2"
+ lru-cache "^6.0.0"
+ mkdirp "^1.0.4"
+ npm-pick-manifest "^6.1.1"
+ promise-inflight "^1.0.1"
+ promise-retry "^2.0.1"
+ semver "^7.3.5"
+ which "^2.0.2"
+
+"@npmcli/installed-package-contents@^1.0.6":
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
+ integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
+ dependencies:
+ npm-bundled "^1.1.1"
+ npm-normalize-package-bin "^1.0.1"
+
+"@npmcli/move-file@^1.0.1":
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
+ integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
+ dependencies:
+ mkdirp "^1.0.4"
+ rimraf "^3.0.2"
+
+"@npmcli/move-file@^2.0.0":
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
+ integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
+ dependencies:
+ mkdirp "^1.0.4"
+ rimraf "^3.0.2"
+
+"@npmcli/node-gyp@^1.0.2":
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33"
+ integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==
+
+"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5"
+ integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==
+ dependencies:
+ infer-owner "^1.0.4"
+
+"@npmcli/run-script@^1.8.2":
+ version "1.8.6"
+ resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7"
+ integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==
+ dependencies:
+ "@npmcli/node-gyp" "^1.0.2"
+ "@npmcli/promise-spawn" "^1.3.2"
+ node-gyp "^7.1.0"
+ read-package-json-fast "^2.0.1"
+
+"@octokit/auth-token@^2.4.4":
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.5.0.tgz#27c37ea26c205f28443402477ffd261311f21e36"
+ integrity sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==
+ dependencies:
+ "@octokit/types" "^6.0.3"
+
+"@octokit/core@^3.5.1":
+ version "3.6.0"
+ resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.6.0.tgz#3376cb9f3008d9b3d110370d90e0a1fcd5fe6085"
+ integrity sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==
+ dependencies:
+ "@octokit/auth-token" "^2.4.4"
+ "@octokit/graphql" "^4.5.8"
+ "@octokit/request" "^5.6.3"
+ "@octokit/request-error" "^2.0.5"
+ "@octokit/types" "^6.0.3"
+ before-after-hook "^2.2.0"
+ universal-user-agent "^6.0.0"
+
+"@octokit/endpoint@^6.0.1":
+ version "6.0.12"
+ resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.12.tgz#3b4d47a4b0e79b1027fb8d75d4221928b2d05658"
+ integrity sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==
+ dependencies:
+ "@octokit/types" "^6.0.3"
+ is-plain-object "^5.0.0"
+ universal-user-agent "^6.0.0"
+
+"@octokit/graphql@^4.5.8":
+ version "4.8.0"
+ resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.8.0.tgz#664d9b11c0e12112cbf78e10f49a05959aa22cc3"
+ integrity sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==
+ dependencies:
+ "@octokit/request" "^5.6.0"
+ "@octokit/types" "^6.0.3"
+ universal-user-agent "^6.0.0"
+
+"@octokit/openapi-types@^12.11.0":
+ version "12.11.0"
+ resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-12.11.0.tgz#da5638d64f2b919bca89ce6602d059f1b52d3ef0"
+ integrity sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==
+
+"@octokit/plugin-enterprise-rest@^6.0.1":
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz#e07896739618dab8da7d4077c658003775f95437"
+ integrity sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==
+
+"@octokit/plugin-paginate-rest@^2.16.8":
+ version "2.21.3"
+ resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz#7f12532797775640dbb8224da577da7dc210c87e"
+ integrity sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==
+ dependencies:
+ "@octokit/types" "^6.40.0"
+
+"@octokit/plugin-request-log@^1.0.4":
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
+ integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
+
+"@octokit/plugin-rest-endpoint-methods@^5.12.0":
+ version "5.16.2"
+ resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz#7ee8bf586df97dd6868cf68f641354e908c25342"
+ integrity sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==
+ dependencies:
+ "@octokit/types" "^6.39.0"
+ deprecation "^2.3.1"
+
+"@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677"
+ integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==
+ dependencies:
+ "@octokit/types" "^6.0.3"
+ deprecation "^2.0.0"
+ once "^1.4.0"
+
+"@octokit/request@^5.6.0", "@octokit/request@^5.6.3":
+ version "5.6.3"
+ resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.3.tgz#19a022515a5bba965ac06c9d1334514eb50c48b0"
+ integrity sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==
+ dependencies:
+ "@octokit/endpoint" "^6.0.1"
+ "@octokit/request-error" "^2.1.0"
+ "@octokit/types" "^6.16.1"
+ is-plain-object "^5.0.0"
+ node-fetch "^2.6.7"
+ universal-user-agent "^6.0.0"
+
+"@octokit/rest@^18.1.0":
+ version "18.12.0"
+ resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.12.0.tgz#f06bc4952fc87130308d810ca9d00e79f6988881"
+ integrity sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==
+ dependencies:
+ "@octokit/core" "^3.5.1"
+ "@octokit/plugin-paginate-rest" "^2.16.8"
+ "@octokit/plugin-request-log" "^1.0.4"
+ "@octokit/plugin-rest-endpoint-methods" "^5.12.0"
+
+"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.39.0", "@octokit/types@^6.40.0":
+ version "6.41.0"
+ resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.41.0.tgz#e58ef78d78596d2fb7df9c6259802464b5f84a04"
+ integrity sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==
+ dependencies:
+ "@octokit/openapi-types" "^12.11.0"
+
+"@phosphor/algorithm@1", "@phosphor/algorithm@^1.2.0":
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@phosphor/algorithm/-/algorithm-1.2.0.tgz#4a19aa59261b7270be696672dc3f0663f7bef152"
+ integrity sha512-C9+dnjXyU2QAkWCW6QVDGExk4hhwxzAKf5/FIuYlHAI9X5vFv99PYm0EREDxX1PbMuvfFBZhPNu0PvuSDQ7sFA==
+
+"@phosphor/collections@^1.2.0":
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@phosphor/collections/-/collections-1.2.0.tgz#a8cdd0edc0257de7c33306a91caf47910036307f"
+ integrity sha512-T9/0EjSuY6+ga2LIFRZ0xupciOR3Qnyy8Q95lhGTC0FXZUFwC8fl9e8On6IcwasCszS+1n8dtZUWSIynfgdpzw==
+ dependencies:
+ "@phosphor/algorithm" "^1.2.0"
+
+"@phosphor/commands@1", "@phosphor/commands@^1.7.2":
+ version "1.7.2"
+ resolved "https://registry.yarnpkg.com/@phosphor/commands/-/commands-1.7.2.tgz#df724f2896ae43c4a3a9e2b5a6445a15e0d60487"
+ integrity sha512-iSyBIWMHsus323BVEARBhuVZNnVel8USo+FIPaAxGcq+icTSSe6+NtSxVQSmZblGN6Qm4iw6I6VtiSx0e6YDgQ==
+ dependencies:
+ "@phosphor/algorithm" "^1.2.0"
+ "@phosphor/coreutils" "^1.3.1"
+ "@phosphor/disposable" "^1.3.1"
+ "@phosphor/domutils" "^1.1.4"
+ "@phosphor/keyboard" "^1.1.3"
+ "@phosphor/signaling" "^1.3.1"
+
+"@phosphor/coreutils@1", "@phosphor/coreutils@^1.3.1":
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/@phosphor/coreutils/-/coreutils-1.3.1.tgz#441e34f42340f7faa742a88b2a181947a88d7226"
+ integrity sha512-9OHCn8LYRcPU/sbHm5v7viCA16Uev3gbdkwqoQqlV+EiauDHl70jmeL7XVDXdigl66Dz0LI11C99XOxp+s3zOA==
+
+"@phosphor/disposable@^1.3.1":
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/@phosphor/disposable/-/disposable-1.3.1.tgz#be98fe12bd8c9a4600741cb83b0a305df28628f3"
+ integrity sha512-0NGzoTXTOizWizK/brKKd5EjJhuuEH4903tLika7q6wl/u0tgneJlTh7R+MBVeih0iNxtuJAfBa3IEY6Qmj+Sw==
+ dependencies:
+ "@phosphor/algorithm" "^1.2.0"
+ "@phosphor/signaling" "^1.3.1"
+
+"@phosphor/domutils@1", "@phosphor/domutils@^1.1.4":
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/@phosphor/domutils/-/domutils-1.1.4.tgz#4c6aecf7902d3793b45db325319340e0a0b5543b"
+ integrity sha512-ivwq5TWjQpKcHKXO8PrMl+/cKqbgxPClPiCKc1gwbMd+6hnW5VLwNG0WBzJTxCzXK43HxX18oH+tOZ3E04wc3w==
+
+"@phosphor/dragdrop@1", "@phosphor/dragdrop@^1.4.1":
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/@phosphor/dragdrop/-/dragdrop-1.4.1.tgz#45887dfe8f5849db2b4d1c0329a377f0f0854464"
+ integrity sha512-77paMoubIWk7pdwA2GVFkqba1WP48hTZZvS17N30+KVOeWfSqBL3flPSnW2yC4y6FnOP2PFOCtuPIbQv+pYhCA==
+ dependencies:
+ "@phosphor/coreutils" "^1.3.1"
+ "@phosphor/disposable" "^1.3.1"
+
+"@phosphor/keyboard@^1.1.3":
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/@phosphor/keyboard/-/keyboard-1.1.3.tgz#e5fd13af0479034ef0b5fffcf43ef2d4a266b5b6"
+ integrity sha512-dzxC/PyHiD6mXaESRy6PZTd9JeK+diwG1pyngkyUf127IXOEzubTIbu52VSdpGBklszu33ws05BAGDa4oBE4mQ==
-"@theia/cli@1.20.0", "@theia/cli@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-1.20.0.tgz#b57ff2beb146a7afd17234e851410cc3598a0024"
- integrity sha512-HPRF376Usjcm7vZvMH4kgPR6o4qhrqD6sILY+Ckm24RnO/D1Z1/WvkMPJZrSTwaC1Jj/ojGispiDm9GsfKE/zg==
+"@phosphor/messaging@1", "@phosphor/messaging@^1.3.0":
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/@phosphor/messaging/-/messaging-1.3.0.tgz#a140e6dd28a496260779acf74860f738c654c65e"
+ integrity sha512-k0JE+BTMKlkM335S2AmmJxoYYNRwOdW5jKBqLgjJdGRvUQkM0+2i60ahM45+J23atGJDv9esKUUBINiKHFhLew==
+ dependencies:
+ "@phosphor/algorithm" "^1.2.0"
+ "@phosphor/collections" "^1.2.0"
+
+"@phosphor/properties@1", "@phosphor/properties@^1.1.3":
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/@phosphor/properties/-/properties-1.1.3.tgz#63e4355be5e22a411c566fd1860207038f171598"
+ integrity sha512-GiglqzU77s6+tFVt6zPq9uuyu/PLQPFcqZt914ZhJ4cN/7yNI/SLyMzpYZ56IRMXvzK9TUgbRna6URE3XAwFUg==
+
+"@phosphor/signaling@1", "@phosphor/signaling@^1.3.1":
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/@phosphor/signaling/-/signaling-1.3.1.tgz#1cd10b069bdb2c9adb3ba74245b30141e5afc2d7"
+ integrity sha512-Eq3wVCPQAhUd9+gUGaYygMr+ov7dhSGblSBXiDzpZlSIfa8OVD4P3cCvYXr/acDTNmZ/gHTcSFO8/n3rDkeXzg==
+ dependencies:
+ "@phosphor/algorithm" "^1.2.0"
+
+"@phosphor/virtualdom@1", "@phosphor/virtualdom@^1.2.0":
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@phosphor/virtualdom/-/virtualdom-1.2.0.tgz#6a233312f817eb02555a0359c4ae3e501fa62bca"
+ integrity sha512-L9mKNhK2XtVjzjuHLG2uYuepSz8uPyu6vhF4EgCP0rt0TiLYaZeHwuNu3XeFbul9DMOn49eBpye/tfQVd4Ks+w==
+ dependencies:
+ "@phosphor/algorithm" "^1.2.0"
+
+"@phosphor/widgets@1":
+ version "1.9.3"
+ resolved "https://registry.yarnpkg.com/@phosphor/widgets/-/widgets-1.9.3.tgz#b8b7ad69fd7cc7af8e8c312ebead0e0965a4cefd"
+ integrity sha512-61jsxloDrW/+WWQs8wOgsS5waQ/MSsXBuhONt0o6mtdeL93HVz7CYO5krOoot5owammfF6oX1z0sDaUYIYgcPA==
+ dependencies:
+ "@phosphor/algorithm" "^1.2.0"
+ "@phosphor/commands" "^1.7.2"
+ "@phosphor/coreutils" "^1.3.1"
+ "@phosphor/disposable" "^1.3.1"
+ "@phosphor/domutils" "^1.1.4"
+ "@phosphor/dragdrop" "^1.4.1"
+ "@phosphor/keyboard" "^1.1.3"
+ "@phosphor/messaging" "^1.3.0"
+ "@phosphor/properties" "^1.1.3"
+ "@phosphor/signaling" "^1.3.1"
+ "@phosphor/virtualdom" "^1.2.0"
+
+"@sindresorhus/df@^1.0.1":
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/@sindresorhus/df/-/df-1.0.1.tgz#c69b66f52f6fcdd287c807df210305dbaf78500d"
+ integrity sha1-xptm9S9vzdKHyAffIQMF2694UA0=
+
+"@sindresorhus/df@^2.1.0":
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/@sindresorhus/df/-/df-2.1.0.tgz#d208cf27e06f0bb476d14d7deccd7d726e9aa389"
+ integrity sha1-0gjPJ+BvC7R20U197M19cm6ao4k=
+ dependencies:
+ execa "^0.2.2"
+
+"@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==
+
+"@sindresorhus/is@^4.0.0":
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
+ integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
+
+"@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.8.3":
+ version "1.8.3"
+ resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
+ integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
+ dependencies:
+ type-detect "4.0.8"
+
+"@sinonjs/fake-timers@>=5":
+ version "9.1.2"
+ resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
+ integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
+ dependencies:
+ "@sinonjs/commons" "^1.7.0"
+
+"@sinonjs/fake-timers@^8.1.0":
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7"
+ integrity sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==
dependencies:
- "@theia/application-manager" "1.20.0"
- "@theia/application-package" "1.20.0"
- "@theia/localization-manager" "1.20.0"
- "@theia/ovsx-client" "1.20.0"
+ "@sinonjs/commons" "^1.7.0"
+
+"@sinonjs/samsam@^6.0.2":
+ version "6.1.1"
+ resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-6.1.1.tgz#627f7f4cbdb56e6419fa2c1a3e4751ce4f6a00b1"
+ integrity sha512-cZ7rKJTLiE7u7Wi/v9Hc2fs3Ucc3jrWeMgPHbbTCeVAB2S0wOBbYlkJVeNSL04i7fdhT8wIbDq1zhC/PXTD2SA==
+ dependencies:
+ "@sinonjs/commons" "^1.6.0"
+ lodash.get "^4.4.2"
+ type-detect "^4.0.8"
+
+"@sinonjs/text-encoding@^0.7.1":
+ version "0.7.2"
+ resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz#5981a8db18b56ba38ef0efb7d995b12aa7b51918"
+ integrity sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==
+
+"@socket.io/component-emitter@~3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.0.0.tgz#8863915676f837d9dad7b76f50cb500c1e9422e9"
+ integrity sha512-2pTGuibAXJswAPJjaKisthqS/NOK5ypG4LYT6tEAV0S/mxW0zOIvYvGK0V8w8+SHxAm6vRMSjqSalFXeBAqs+Q==
+
+"@stroncium/procfs@^1.0.0":
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/@stroncium/procfs/-/procfs-1.2.1.tgz#6b9be6fd20fb0a4c20e99a8695e083c699bb2b45"
+ integrity sha512-X1Iui3FUNZP18EUvysTHxt+Avu2nlVzyf90YM8OYgP6SGzTzzX/0JgObfO1AQQDzuZtNNz29bVh8h5R97JrjxA==
+
+"@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==
+ dependencies:
+ defer-to-connect "^1.0.1"
+
+"@szmarczak/http-timer@^4.0.5":
+ version "4.0.6"
+ resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
+ integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
+ dependencies:
+ defer-to-connect "^2.0.0"
+
+"@theia/application-manager@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-1.27.0.tgz#ba5a84a42dfd6151239de315d038a61eafc47c27"
+ integrity sha512-uhj9UiPGdi2oQ/O8sn8UCxjUAo+lVY8nR5U0RhA7jbkSqaNlIEEPAREsG8JMoIjxmuGHaOfqRykkKY/ybwTJHA==
+ dependencies:
+ "@babel/core" "^7.10.0"
+ "@babel/plugin-transform-classes" "^7.10.0"
+ "@babel/plugin-transform-runtime" "^7.10.0"
+ "@babel/preset-env" "^7.10.0"
+ "@theia/application-package" "1.27.0"
+ "@theia/ffmpeg" "1.27.0"
+ "@types/fs-extra" "^4.0.2"
+ "@types/semver" "^7.3.8"
+ babel-loader "^8.2.2"
+ buffer "^6.0.3"
+ circular-dependency-plugin "^5.2.2"
+ compression-webpack-plugin "^9.0.0"
+ copy-webpack-plugin "^8.1.1"
+ css-loader "^6.2.0"
+ electron-rebuild "^3.2.7"
+ fs-extra "^4.0.2"
+ ignore-loader "^0.1.2"
+ less "^3.0.3"
+ node-abi "*"
+ path-browserify "^1.0.1"
+ semver "^7.3.5"
+ setimmediate "^1.0.5"
+ source-map "^0.6.1"
+ source-map-loader "^2.0.1"
+ source-map-support "^0.5.19"
+ style-loader "^2.0.0"
+ umd-compat-loader "^2.1.2"
+ webpack "^5.48.0"
+ webpack-cli "4.7.0"
+ worker-loader "^3.0.8"
+ yargs "^15.3.1"
+
+"@theia/application-package@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.27.0.tgz#e51b240294e10bce169024a99fba2fa10cbc6d53"
+ integrity sha512-yn/zRV3OVrxQOgFfJU3Pbv6rk4+VkhFS9y1mrr4w0ZyemLJ8qSuBU6CEHgQ04GFCq7hJHiZ/hyoCldVxGKaY+A==
+ dependencies:
+ "@types/fs-extra" "^4.0.2"
+ "@types/request" "^2.0.3"
+ "@types/semver" "^5.4.0"
+ "@types/write-json-file" "^2.2.1"
+ deepmerge "^4.2.2"
+ fs-extra "^4.0.2"
+ is-electron "^2.1.0"
+ nano "^9.0.5"
+ request "^2.82.0"
+ semver "^5.4.1"
+ write-json-file "^2.2.0"
+
+"@theia/bulk-edit@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/bulk-edit/-/bulk-edit-1.27.0.tgz#57f10dbd8e30878e4cea18f143423bc481319b40"
+ integrity sha512-DjG9awhCrtiOKSGEZqpm8OmAtHRVvVpBFdU5holCM99HvBg4Y8BfKn252Iev41Clba5JEVFecOfhOe9HnYa1mQ==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/editor" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/monaco" "1.27.0"
+ "@theia/monaco-editor-core" "1.65.2"
+ "@theia/workspace" "1.27.0"
+
+"@theia/callhierarchy@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/callhierarchy/-/callhierarchy-1.27.0.tgz#3f2ff2a6abbc9d6de4f800ea52c3d207c785d68c"
+ integrity sha512-ORCit2eSUvxQfBky8vBFLby8yJHhGOxuLjNtK6DCSen+btg/f3lQCzd4uFf+UhY8yYQi2g27JoM7kSLFtv+o8g==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/editor" "1.27.0"
+ ts-md5 "^1.2.2"
+
+"@theia/cli@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-1.27.0.tgz#2bda8f755bc9e75248143fbfc7570b7004bc33c6"
+ integrity sha512-EcRZaAiEbZCfjt3aMTP7US1xc3uiDjQ3n1qykmbtv4ob6xMOsu+lQvf9kwF+Eodbxv61UHfNEx5svs5kb7+rmQ==
+ dependencies:
+ "@theia/application-manager" "1.27.0"
+ "@theia/application-package" "1.27.0"
+ "@theia/ffmpeg" "1.27.0"
+ "@theia/localization-manager" "1.27.0"
+ "@theia/ovsx-client" "1.27.0"
+ "@theia/request" "1.27.0"
"@types/chai" "^4.2.7"
- "@types/mkdirp" "^0.5.2"
"@types/mocha" "^5.2.7"
"@types/node-fetch" "^2.5.7"
"@types/puppeteer" "^2.0.0"
- "@types/requestretry" "^1.12.3"
- "@types/tar" "^4.0.3"
chai "^4.2.0"
- colors "^1.4.0"
+ chalk "4.0.0"
decompress "^4.2.1"
- https-proxy-agent "^5.0.0"
mocha "^7.0.0"
- node-fetch "^2.6.0"
- proxy-from-env "^1.1.0"
puppeteer "^2.0.0"
puppeteer-to-istanbul "^1.2.2"
temp "^0.9.1"
yargs "^15.3.1"
-"@theia/console@1.20.0", "@theia/console@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/console/-/console-1.20.0.tgz#e555724be99ebf03ccfc644f9b2c398e2ffc58c0"
- integrity sha512-MmEqFjTopz5OxN6c/mqAdZpWcsAAqvnZz1DgcxyYN5Eass7r5RcQxpiZXlnJ9tcfjIpj4MVJdDIkcfCCiMkkQQ==
+"@theia/console@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/console/-/console-1.27.0.tgz#1ae6eb5c5f534cc149f692801b543ae00e260330"
+ integrity sha512-ps0GCYouBLDu2yr57vB9ncb79R2oubvz/CJTEnl6DMrjkpZ9iw/+LMMDPieHxGE/wrYwsrrou0y9Voa3rvSWVA==
dependencies:
- "@theia/core" "1.20.0"
- "@theia/monaco" "1.20.0"
+ "@theia/core" "1.27.0"
+ "@theia/monaco" "1.27.0"
+ "@theia/monaco-editor-core" "1.65.2"
anser "^2.0.1"
-"@theia/core@1.20.0", "@theia/core@^1.0.0", "@theia/core@latest", "@theia/core@next":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.20.0.tgz#daf005811ea0a3e00b1430d49117088230da61a0"
- integrity sha512-0A11Lw29ijDRxph3Pcht87wkcbbIUa8pIZvmyLfu9oQLT5Zwbj02qWT7NJTLQyZxNsSHS7kml9IeOI+wmP9oMw==
+"@theia/core@1.20.0", "@theia/core@1.27.0", "@theia/core@^1.0.0", "@theia/core@^1.18.0", "@theia/core@^1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.27.0.tgz#509db566ee3b061948c92abe0f4fb41f4b907423"
+ integrity sha512-Z52q3zqxqbzBOG3DZ7AKYd8hdiu0cHV70fHc3IyAZ4Anieur5fFOdr8TUlrr4PO3ZCzWNu2MHkv+hvSDdanPnQ==
dependencies:
"@babel/runtime" "^7.10.0"
"@phosphor/algorithm" "1"
@@ -1359,8 +2385,8 @@
"@phosphor/signaling" "1"
"@phosphor/virtualdom" "1"
"@phosphor/widgets" "1"
- "@primer/octicons-react" "^9.0.0"
- "@theia/application-package" "1.20.0"
+ "@theia/application-package" "1.27.0"
+ "@theia/request" "1.27.0"
"@types/body-parser" "^1.16.4"
"@types/cookie" "^0.3.3"
"@types/dompurify" "^2.2.2"
@@ -1368,6 +2394,7 @@
"@types/fs-extra" "^4.0.2"
"@types/lodash.debounce" "4.0.3"
"@types/lodash.throttle" "^4.1.3"
+ "@types/markdown-it" "^12.2.3"
"@types/react" "^16.8.0"
"@types/react-dom" "^16.8.0"
"@types/react-virtualized" "^9.18.3"
@@ -1387,12 +2414,15 @@
font-awesome "^4.7.0"
fs-extra "^4.0.2"
fuzzy "^0.1.3"
+ http-proxy-agent "^5.0.0"
+ https-proxy-agent "^5.0.0"
iconv-lite "^0.6.0"
inversify "^5.1.1"
jschardet "^2.1.1"
keytar "7.2.0"
lodash.debounce "^4.0.8"
lodash.throttle "^4.1.1"
+ markdown-it "^12.3.2"
nsfw "^2.1.2"
p-debounce "^2.1.0"
perfect-scrollbar "^1.3.0"
@@ -1400,74 +2430,77 @@
react-dom "^16.8.0"
react-tooltip "^4.2.21"
react-virtualized "^9.20.0"
- reconnecting-websocket "^4.2.0"
reflect-metadata "^0.1.10"
route-parser "^0.0.5"
safer-buffer "^2.1.2"
+ socket.io "4.4.1"
+ socket.io-client "4.4.1"
uuid "^8.3.2"
vscode-languageserver-protocol "~3.15.3"
- vscode-languageserver-types "^3.15.1"
vscode-uri "^2.1.1"
- vscode-ws-jsonrpc "^0.2.0"
ws "^7.1.2"
yargs "^15.3.1"
-"@theia/debug@1.20.0", "@theia/debug@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/debug/-/debug-1.20.0.tgz#de220886c890cd94075ad0f3375daf8472987476"
- integrity sha512-HbPwIT3i1DNDiuxQWCtZD4rrPB43T1ylQntjYSsH1lJqjBb/jvFhVDPEfmMYxzBmQuE1C410J3JYkLorAuRClQ==
- dependencies:
- "@theia/console" "1.20.0"
- "@theia/core" "1.20.0"
- "@theia/editor" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/markers" "1.20.0"
- "@theia/monaco" "1.20.0"
- "@theia/output" "1.20.0"
- "@theia/preferences" "1.20.0"
- "@theia/process" "1.20.0"
- "@theia/task" "1.20.0"
- "@theia/terminal" "1.20.0"
- "@theia/userstorage" "1.20.0"
- "@theia/variable-resolver" "1.20.0"
- "@theia/workspace" "1.20.0"
+"@theia/debug@1.27.0", "@theia/debug@^1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/debug/-/debug-1.27.0.tgz#4031335027540d51815467ac21eee4d7535a5448"
+ integrity sha512-0ImDGg0iAcI5DVBOeF1HgL5IVDssv7E1fmvsOk8dNS251qm+eeC/GnKgOj3RFNV2zfu37cjjQXNn1SHdO0cn+g==
+ dependencies:
+ "@theia/console" "1.27.0"
+ "@theia/core" "1.27.0"
+ "@theia/editor" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/markers" "1.27.0"
+ "@theia/monaco" "1.27.0"
+ "@theia/monaco-editor-core" "1.65.2"
+ "@theia/output" "1.27.0"
+ "@theia/process" "1.27.0"
+ "@theia/task" "1.27.0"
+ "@theia/terminal" "1.27.0"
+ "@theia/variable-resolver" "1.27.0"
+ "@theia/workspace" "1.27.0"
jsonc-parser "^2.2.0"
mkdirp "^0.5.0"
p-debounce "^2.1.0"
- requestretry "^3.1.0"
+ requestretry "^7.0.0"
tar "^4.0.0"
unzip-stream "^0.3.0"
vscode-debugprotocol "^1.32.0"
-"@theia/editor@1.20.0", "@theia/editor@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.20.0.tgz#f64d96af13f6d656c410e02207f4ede60f082e16"
- integrity sha512-FNA1V9FKQtAEVDfpD+a5DQY2VrJLyP5AatSTHO9QRteOyjFoIhwmi0IU2PVWsmwp4BZUgtF+YfkMGVt848jnMw==
+"@theia/editor@1.27.0", "@theia/editor@^1.18.0", "@theia/editor@^1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.27.0.tgz#c79164c06bc0bfcd3e0e74c206283e3c9d0fec5d"
+ integrity sha512-C6DPi7hP0gyLG0aqCJLB+WHiyOVwnFjY+U0YiC205tXncOTGhWcV4VO+V+0xwnTJsjGG5/ChAr57KQLA5MfyRQ==
dependencies:
- "@theia/core" "1.20.0"
- "@theia/variable-resolver" "1.20.0"
- "@types/base64-arraybuffer" "0.1.0"
- base64-arraybuffer "^0.1.5"
+ "@theia/core" "1.27.0"
+ "@theia/variable-resolver" "1.27.0"
-"@theia/file-search@1.20.0", "@theia/file-search@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-1.20.0.tgz#d53f3f314ad1de29370a779d22bd0963488a6d6c"
- integrity sha512-CQ+axKFm/pJzl6R+7CRGo+kQjlpfBr4Gwzi20qOMnBzfHALQbpgj8iiRfBKOAr9bVVGDJ9F4gLF8OjL6qo/Wmw==
+"@theia/ffmpeg@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/ffmpeg/-/ffmpeg-1.27.0.tgz#5e7678796ec4f58740b96fb8a3e37e4a8823feca"
+ integrity sha512-S/XvQdQWLOSmd80XyJZhtdCTnNWPdJ1+9uUVOMOMpfa3eKGGA1PKuFWGxSkgFtA9x72s+v92CuKXCptd/A22OQ==
dependencies:
- "@theia/core" "1.20.0"
- "@theia/editor" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/monaco" "1.20.0"
- "@theia/process" "1.20.0"
- "@theia/workspace" "1.20.0"
+ "@electron/get" "^1.12.4"
+ unzipper "^0.9.11"
+
+"@theia/file-search@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-1.27.0.tgz#d1c0f484146c4ead2180761d8ab44174572c7bde"
+ integrity sha512-GJra+1/URHa9kg0Zc8ev1no0KRGUQ+dmpT0ynVfvZZUpz5u1U13wKbaB2tVOmlQ/bmetpB1JALB/IIAGqVKf6A==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/editor" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/process" "1.27.0"
+ "@theia/workspace" "1.27.0"
vscode-ripgrep "^1.2.4"
-"@theia/filesystem@1.20.0", "@theia/filesystem@^1.0.0", "@theia/filesystem@latest", "@theia/filesystem@next":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.20.0.tgz#1cc2c98e1783e6ae57f7d321c8dc8f7119143cff"
- integrity sha512-CrG0ktkaLjXIckR1qQEbWRTHQZw+3HYokIwXWFp7cacoHjOyIsN9ahevFWwmnzs2cmwxChcTJzc4CLwDyeqGkg==
+"@theia/filesystem@1.27.0", "@theia/filesystem@^1.18.0", "@theia/filesystem@^1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.27.0.tgz#126a77c749097a5c81d31880e8466d096e51e041"
+ integrity sha512-UF+LgUFITruRP8K+exLm1NU3X52rnWo3loMDRtDQZxIKidMlxbWsIyvqD3UfEjd+QL8tvAX78n7Kol9awVjkfQ==
dependencies:
- "@theia/core" "1.20.0"
+ "@theia/core" "1.27.0"
"@types/body-parser" "^1.17.0"
"@types/multer" "^1.4.7"
"@types/rimraf" "^2.0.2"
@@ -1477,234 +2510,225 @@
body-parser "^1.18.3"
http-status-codes "^1.3.0"
minimatch "^3.0.4"
- multer "^1.4.2"
- perfect-scrollbar "^1.3.0"
+ multer "1.4.4-lts.1"
rimraf "^2.6.2"
tar-fs "^1.16.2"
trash "^6.1.1"
uuid "^8.0.0"
vscode-languageserver-textdocument "^1.0.1"
-"@theia/git@1.20.0", "@theia/git@latest":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/git/-/git-1.20.0.tgz#0fd9ddc82c7f39957ba4e6a3df6264393b689694"
- integrity sha512-9jCI8AXmNy84tsNdvraSW2CqNq9FVhMdj2mQh2Fm3IgjbLih/bXCOqCPjaCSVozOLrUXXhU7MO9e1lWrvGjHPA==
- dependencies:
- "@theia/core" "1.20.0"
- "@theia/editor" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/monaco" "1.20.0"
- "@theia/navigator" "1.20.0"
- "@theia/scm" "1.20.0"
- "@theia/scm-extra" "1.20.0"
- "@theia/workspace" "1.20.0"
+"@theia/git@1.20.0", "@theia/git@1.27.0", "@theia/git@^1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/git/-/git-1.27.0.tgz#5362d31ba5f41a27f78b930292489d07bfb8a865"
+ integrity sha512-12yKhFdNtoHsephHghD1m6K1leohCR/EhXG1jlZofOnc8C5Js/QWTD5ci/LXvVelmXT8MgZKNRwATUmkwn2q5Q==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/editor" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/monaco-editor-core" "1.65.2"
+ "@theia/navigator" "1.27.0"
+ "@theia/scm" "1.27.0"
+ "@theia/scm-extra" "1.27.0"
+ "@theia/workspace" "1.27.0"
"@types/diff" "^3.2.2"
"@types/p-queue" "^2.3.1"
diff "^3.4.0"
- dugite-extra "0.1.14"
- find-git-exec "^0.0.3"
+ dugite-extra "0.1.15"
+ find-git-exec "^0.0.4"
find-git-repositories "^0.1.1"
- moment "2.24.0"
+ luxon "^2.4.0"
octicons "^7.1.0"
p-queue "^2.4.2"
ts-md5 "^1.2.2"
-"@theia/keymaps@1.20.0", "@theia/keymaps@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/keymaps/-/keymaps-1.20.0.tgz#2748e7bf8f9a12fdcbf008c8142eb79cc67def34"
- integrity sha512-oMQC8z9Xai2+wkYEr7spHihEs6tVncOHo2G1JRPbv16ClzZf7cpBMV+jIvryMIZ3//LxOyp9i1FZ6UYkpsgngQ==
+"@theia/keymaps@1.27.0", "@theia/keymaps@^1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/keymaps/-/keymaps-1.27.0.tgz#c2e6333a9537b3873aedba7c06d01cc34e3b26d0"
+ integrity sha512-pbSLQeByKgHBbK0Y38/Pzw8Al9xtFah1nEgthLFzN4iaCuvZTnbeSs9yPq2Smcr4TOwGP/qtRK09Q1zYUG9emQ==
dependencies:
- "@theia/core" "1.20.0"
- "@theia/monaco" "1.20.0"
- "@theia/userstorage" "1.20.0"
- "@theia/workspace" "1.20.0"
- "@types/lodash.debounce" "4.0.3"
- ajv "^6.5.3"
+ "@theia/core" "1.27.0"
+ "@theia/monaco" "1.27.0"
+ "@theia/monaco-editor-core" "1.65.2"
+ "@theia/preferences" "1.27.0"
+ "@theia/userstorage" "1.27.0"
jsonc-parser "^2.2.0"
-"@theia/localization-manager@1.20.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/localization-manager/-/localization-manager-1.20.0.tgz#1bbb5976d044e9100e8a343bdc7168698d4707ad"
- integrity sha512-qMx1F9RgLw6v/ys/apDJHX68dB4GCw4Axap9Yt+YBr4GmNCCeRIKZuc0a9XEwn9SdWfuAw9MkPAAwIksiNK6Og==
+"@theia/localization-manager@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/localization-manager/-/localization-manager-1.27.0.tgz#971863d7fa5db7a86f2ce425fb8b0262a77f735d"
+ integrity sha512-vZkf6DcTQjc/nH3cxpdbLl8ADRg+geBDgl+JCw+da+CAsytgGDjxTvqEo82ZiSX3EWhQrtV3Ok9i7dluDO0X/g==
dependencies:
+ "@types/bent" "^7.0.1"
"@types/fs-extra" "^4.0.2"
+ bent "^7.1.0"
+ chalk "4.0.0"
deepmerge "^4.2.2"
fs-extra "^4.0.2"
glob "^7.2.0"
- typescript "^4.4.3"
+ typescript "~4.5.5"
-"@theia/markers@1.20.0", "@theia/markers@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.20.0.tgz#60155e6eb5e7a9095a83772c20e3a9560ee05adf"
- integrity sha512-aOhbEZIENrAk1j4yim4kRhQV1wcseAgct9twvUaXbKlb0YXQ3BtXfKDCqB0oYFKO85tXp87J+4sAHrbda5FXiQ==
+"@theia/markers@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.27.0.tgz#1b36da2829def83e9c490ca4e870d0c43e5380a2"
+ integrity sha512-vkFkiWsRUReEsyyUURx/hcrqN9qSmwW4CA11ukCcqinWzRKPgO0YBdx/FKGA8uapnmNwRURtVWY1sOP3bhzoUQ==
dependencies:
- "@theia/core" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/navigator" "1.20.0"
- "@theia/workspace" "1.20.0"
+ "@theia/core" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/workspace" "1.27.0"
-"@theia/messages@1.20.0", "@theia/messages@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-1.20.0.tgz#e5235915b1ffc2728371442463793c03a2e398b3"
- integrity sha512-xMlY4AD+ySVNF3fS/C4Fr96dg+trI2e9t6EMUY8Zkr/mnYiMai2H2dZCfzaSBCblNWddlqofghWOZg5OSGPT/Q==
+"@theia/messages@1.27.0", "@theia/messages@^1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-1.27.0.tgz#1d876127bbe3cd7ccc95744d081b8a49300cf3de"
+ integrity sha512-g1MaKAVEAqKJu7Px2cdrbrt/AKk90wSaEXw1MK2GHp3RM6Jbr5oQ6YPRuzpUp9jGfz9k07ypdRgu7arRJ58LPg==
dependencies:
- "@theia/core" "1.20.0"
- markdown-it "^8.4.0"
+ "@theia/core" "1.27.0"
react-perfect-scrollbar "^1.5.3"
ts-md5 "^1.2.2"
-"@theia/metrics@1.20.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/metrics/-/metrics-1.20.0.tgz#b891c7f800556d4976d8b0721fb52463ee358b70"
- integrity sha512-Q0sLa0YcGYS+01kVBLJZfJ6Rcnq8O0DTNYT5+MUuFjYemYW5d/ZgL6MLyTLLuh5uxf9JSMoYW04ZHrE3MHgVHA==
+"@theia/metrics@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/metrics/-/metrics-1.27.0.tgz#5123812f53dc1f07d55259ba9377d11febdd822f"
+ integrity sha512-fSyPVAJazVvnIyN21J1sOQw53yc6OD19Th2Pa6e2bcEOGxWiy6eoreXqXYfhYckrXsPjoeDHNkac8Nbw3f3kvA==
dependencies:
- "@theia/core" "1.20.0"
+ "@theia/core" "1.27.0"
prom-client "^10.2.0"
-"@theia/mini-browser@1.20.0", "@theia/mini-browser@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/mini-browser/-/mini-browser-1.20.0.tgz#aec3f18ee1694d3acc33804d612f2d557fb65eef"
- integrity sha512-xPAMmQbqHXoKGrqx3njhO5NJtkp2RmJSVyI1hDhHl2ZzMnLEn0sGaO7qevItN1lPrvIPkOrCWpVAzEBS806jZQ==
+"@theia/mini-browser@1.27.0", "@theia/mini-browser@^1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/mini-browser/-/mini-browser-1.27.0.tgz#da6813455154b31cf0640e8d81f66ec79294549e"
+ integrity sha512-6lAFix3aEyjDcWxyNXYzZn02vL5BipYH2D1YELb8sqbXOByV+krX9d1LyjjSAHzRtHcsGbw+lUdpPBUgTs8xoA==
dependencies:
- "@theia/core" "1.20.0"
- "@theia/filesystem" "1.20.0"
+ "@theia/core" "1.27.0"
+ "@theia/filesystem" "1.27.0"
"@types/mime-types" "^2.1.0"
mime-types "^2.1.18"
pdfobject "^2.0.201604172"
uuid "^8.0.0"
vhost "^3.0.2"
-"@theia/monaco-editor-core@0.23.0":
- version "0.23.0"
- resolved "https://registry.yarnpkg.com/@theia/monaco-editor-core/-/monaco-editor-core-0.23.0.tgz#7a1cbb7a857a509ce8e75c9965abea752bd76e80"
- integrity sha512-WyrotTd6ZfeXAX4icgFALTzlqE356tAQ5nRuwa2E0Qdp2YIO9GDcw5G2l2NJ8INO2ygujbE5pEdD5kJM5N4TOQ==
-
-"@theia/monaco@1.20.0", "@theia/monaco@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.20.0.tgz#68ebdd79e858917c1d6d071f472beddcbee2a642"
- integrity sha512-f8z7Tw0RWvng/alEn/pxH5yv9VW1TPemndeoGHn3W6h59R1Y78MIrsM+mGlF8JMXUVosSvEiKTqd2aVTPgzMew==
- dependencies:
- "@theia/core" "1.20.0"
- "@theia/editor" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/markers" "1.20.0"
- "@theia/monaco-editor-core" "0.23.0"
- "@theia/outline-view" "1.20.0"
- "@theia/workspace" "1.20.0"
+"@theia/monaco-editor-core@1.65.2":
+ version "1.65.2"
+ resolved "https://registry.yarnpkg.com/@theia/monaco-editor-core/-/monaco-editor-core-1.65.2.tgz#91bc9ce2afe1b6011789ce83a5bee898f0153430"
+ integrity sha512-2UmGjcEW/YpZ2DsFuVevKR3CBMe44Rd6DgwP/5s4pyOe6K/s6TKY7Sh24lO0BXetQKofAEx3zh+ldEvjwhNwDw==
+
+"@theia/monaco@1.27.0", "@theia/monaco@^1.18.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.27.0.tgz#0fc29730f1d01ec996355eb50be32cadb053721b"
+ integrity sha512-fRJO2/7aW5/vzCJjALqtoLAhKUi7C5wJrEQ82ZFpV/9E09O++Op0+Ovyyn7SlgRzjD4FlVTcj8YRifX+5vBsYA==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/editor" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/markers" "1.27.0"
+ "@theia/monaco-editor-core" "1.65.2"
+ "@theia/outline-view" "1.27.0"
fast-plist "^0.1.2"
idb "^4.0.5"
jsonc-parser "^2.2.0"
onigasm "^2.2.0"
vscode-textmate "^4.4.0"
-"@theia/navigator@1.20.0", "@theia/navigator@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.20.0.tgz#9a6b2f333363fffd2b69cc5a0509f6a07fe1f55f"
- integrity sha512-5skEu8oqETvu6fbzM/h9QEY5w2aG5qzO/4Hz76t/tCfVi12d9xoEUdc5vhsnhOzItJiX+9uaeBDp6M4jihN/Bw==
+"@theia/navigator@1.27.0", "@theia/navigator@^1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.27.0.tgz#01039c52a05fe5a97715dde8b3c07e7e1b169a84"
+ integrity sha512-9NJvOLFAerF3P6RBsgLd693OOATCqTiSm8FEZ1PL0u0IWY6gHNxNXj+YnFUst4I69tdIhRqV04NAw8n1/NxB1A==
dependencies:
- "@theia/core" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/workspace" "1.20.0"
+ "@theia/core" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/workspace" "1.27.0"
minimatch "^3.0.4"
-"@theia/node-pty@0.9.0-theia.6":
- version "0.9.0-theia.6"
- resolved "https://registry.yarnpkg.com/@theia/node-pty/-/node-pty-0.9.0-theia.6.tgz#b34710419a0b4917cc97e6a7f4d1b5535cae03ab"
- integrity sha512-TvzoyV1dXWIldBldc7emPNqj9Iy8hWmlNZt/kV6m4bW1NyQrG2/P2MGOy8Ei85IA6G8GVcfZms8TwNiqscC0TA==
+"@theia/outline-view@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.27.0.tgz#cb9f11607e9c2fe77b2f00f3b2bb28634e1569e0"
+ integrity sha512-aBdMFrhK7VISgx9TwjHXJ6vv1tPeI8gEUUWX89pE7NhBwcbJeTCOHk8ZNj2dGx/VOfu8kuJxSTPhM02hNN7ceg==
dependencies:
- nan "^2.14.0"
-
-"@theia/outline-view@1.20.0", "@theia/outline-view@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.20.0.tgz#fde3db6ac9f77fb0a1807707fd89bdb6b0c31a27"
- integrity sha512-Lj0tb145Nopgnd+FTbpVtGI+SY5FWvoq5xI/prnaUyw/rlfe2KBz7ZIA6vU3pGmiNpEQLs45+BJq2UGSoH/aXA==
- dependencies:
- "@theia/core" "1.20.0"
- perfect-scrollbar "^1.3.0"
+ "@theia/core" "1.27.0"
-"@theia/output@1.20.0", "@theia/output@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/output/-/output-1.20.0.tgz#ec70516717497e96a69816cb3660075f2c7d2825"
- integrity sha512-9SJHeXk3wV/GvIw/voHtSEjP+dsgYDXndMpXe7gznp+fOQhhvhN8le5N3QYBwgdXoWu6Fuf+y1N1Ij9SZYQIXw==
+"@theia/output@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/output/-/output-1.27.0.tgz#462ddbaa0dce285eba3dbda920dc2e7b14e20768"
+ integrity sha512-1GzcRD8Rip4ijea1YduPFXsGrMCICNM/1ST4YJcNQZLVveSIOeaHPtpQeesIHbL7hvsmwUENVH67tCmbaCLS1w==
dependencies:
- "@theia/core" "1.20.0"
- "@theia/editor" "1.20.0"
- "@theia/monaco" "1.20.0"
+ "@theia/core" "1.27.0"
+ "@theia/editor" "1.27.0"
+ "@theia/monaco" "1.27.0"
+ "@theia/monaco-editor-core" "1.65.2"
"@types/p-queue" "^2.3.1"
p-queue "^2.4.2"
-"@theia/ovsx-client@1.20.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/ovsx-client/-/ovsx-client-1.20.0.tgz#9be2a4beff23e3a9f16e805f7220a10e8a6cc176"
- integrity sha512-32v9pjIJNMdAtvLs1Gzgdh8rtfwsIJBZ7V8pArN8Xck38GVQq/z19U4aqIkoWNV49Rzrh03TUkPiTKfcEyC62A==
+"@theia/ovsx-client@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/ovsx-client/-/ovsx-client-1.27.0.tgz#584b7126f5f1d51c5b83a3bcf480c2e3a060039e"
+ integrity sha512-jxPhr2sLwzFQdUVJY9L8aJKHxodbDidWtoH8xW8dPvIdBtd0m6a01mEj1ScEUs3Isto3dT96sMJdBZxRzEnanQ==
dependencies:
- "@types/bent" "^7.0.1"
- bent "^7.1.0"
+ "@theia/request" "1.27.0"
semver "^5.4.1"
-"@theia/plugin-dev@1.20.0", "@theia/plugin-dev@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/plugin-dev/-/plugin-dev-1.20.0.tgz#fad9fcf1e75153d2c419c0e5801bded26156253a"
- integrity sha512-Vtm1cZ9O+upO0SspWKJTdVISfjK3VkY7+qEFGo6ALewUd8miVjLcjSk4XYbkgxmLLXywABr4BSoHoXyJseXy2g==
- dependencies:
- "@theia/core" "1.20.0"
- "@theia/debug" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/output" "1.20.0"
- "@theia/plugin-ext" "1.20.0"
- "@theia/preferences" "1.20.0"
- "@theia/workspace" "1.20.0"
+"@theia/plugin-dev@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/plugin-dev/-/plugin-dev-1.27.0.tgz#04c4328cf24881e3c24cd6dcb70a1133eb781855"
+ integrity sha512-dqr0pUh6z3l1fS2dQdTTEytBByCe25NStjaz2XB27QAieNpoWvltafBBshGnUzYVUwhCGjlY8vHPW2txXIdoQA==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/debug" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/output" "1.27.0"
+ "@theia/plugin-ext" "1.27.0"
+ "@theia/workspace" "1.27.0"
"@types/request" "^2.0.3"
ps-tree "^1.2.0"
request "^2.82.0"
-"@theia/plugin-ext-vscode@1.20.0", "@theia/plugin-ext-vscode@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/plugin-ext-vscode/-/plugin-ext-vscode-1.20.0.tgz#38785b8e4ad41ec0297adeb286612c96032a30a2"
- integrity sha512-7b05unT04MDMO8IWlKg6cJp+7z8sFNnQ+KD2GNnTkukoHZKhDqztZPYpe+MrF0IwAqD1Ag9mzOa56t3on7EA4w==
- dependencies:
- "@theia/callhierarchy" "1.20.0"
- "@theia/core" "1.20.0"
- "@theia/editor" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/monaco" "1.20.0"
- "@theia/navigator" "1.20.0"
- "@theia/plugin" "1.20.0"
- "@theia/plugin-ext" "1.20.0"
- "@theia/terminal" "1.20.0"
- "@theia/userstorage" "1.20.0"
- "@theia/workspace" "1.20.0"
+"@theia/plugin-ext-vscode@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/plugin-ext-vscode/-/plugin-ext-vscode-1.27.0.tgz#c48ee83c63ff4ed493556eca8008a9edb9bb7129"
+ integrity sha512-VMO8q4I2wdjVVi2lteemdsuzAxs3FBB9iXFzcbwkasOuih/WBkbL2rlo10wwKbGtxVqtbc/T6Sf6HY3HG89ciw==
+ dependencies:
+ "@theia/callhierarchy" "1.27.0"
+ "@theia/core" "1.27.0"
+ "@theia/editor" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/monaco" "1.27.0"
+ "@theia/monaco-editor-core" "1.65.2"
+ "@theia/navigator" "1.27.0"
+ "@theia/plugin" "1.27.0"
+ "@theia/plugin-ext" "1.27.0"
+ "@theia/terminal" "1.27.0"
+ "@theia/userstorage" "1.27.0"
+ "@theia/workspace" "1.27.0"
"@types/request" "^2.0.3"
filenamify "^4.1.0"
request "^2.82.0"
-"@theia/plugin-ext@1.20.0", "@theia/plugin-ext@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/plugin-ext/-/plugin-ext-1.20.0.tgz#02d27671b2a94c2bcd2f0e03f89c638c4c150016"
- integrity sha512-+YW3OYxRixJ4c5xdNsgNQpM0EbDpB0t/idTkWuoKXq93NdbnPjZYJLra6ADjWpRQCUEID7qrDqDiu1GEppTDDw==
- dependencies:
- "@theia/bulk-edit" "1.20.0"
- "@theia/callhierarchy" "1.20.0"
- "@theia/console" "1.20.0"
- "@theia/core" "1.20.0"
- "@theia/debug" "1.20.0"
- "@theia/editor" "1.20.0"
- "@theia/file-search" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/markers" "1.20.0"
- "@theia/messages" "1.20.0"
- "@theia/monaco" "1.20.0"
- "@theia/navigator" "1.20.0"
- "@theia/output" "1.20.0"
- "@theia/plugin" "1.20.0"
- "@theia/preferences" "1.20.0"
- "@theia/scm" "1.20.0"
- "@theia/search-in-workspace" "1.20.0"
- "@theia/task" "1.20.0"
- "@theia/terminal" "1.20.0"
- "@theia/timeline" "1.20.0"
- "@theia/workspace" "1.20.0"
- "@types/markdown-it" "*"
+"@theia/plugin-ext@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/plugin-ext/-/plugin-ext-1.27.0.tgz#dc8bea8ceedea90a9d7fb03aa7e82e7d4d9f2125"
+ integrity sha512-7nq7vU0x1hHAYdhg4rrtPL4njq7+4Zqud1exPZLfX8qtvF3bWaAEtUuV5b4eMyiweSwaO/7zWGzLWkQ5PkTrcQ==
+ dependencies:
+ "@theia/bulk-edit" "1.27.0"
+ "@theia/callhierarchy" "1.27.0"
+ "@theia/console" "1.27.0"
+ "@theia/core" "1.27.0"
+ "@theia/debug" "1.27.0"
+ "@theia/editor" "1.27.0"
+ "@theia/file-search" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/markers" "1.27.0"
+ "@theia/messages" "1.27.0"
+ "@theia/monaco" "1.27.0"
+ "@theia/monaco-editor-core" "1.65.2"
+ "@theia/navigator" "1.27.0"
+ "@theia/output" "1.27.0"
+ "@theia/plugin" "1.27.0"
+ "@theia/preferences" "1.27.0"
+ "@theia/scm" "1.27.0"
+ "@theia/search-in-workspace" "1.27.0"
+ "@theia/task" "1.27.0"
+ "@theia/terminal" "1.27.0"
+ "@theia/timeline" "1.27.0"
+ "@theia/variable-resolver" "1.27.0"
+ "@theia/workspace" "1.27.0"
"@types/mime" "^2.0.1"
decompress "^4.2.1"
escape-html "^1.0.3"
@@ -1713,201 +2737,228 @@
jsonc-parser "^2.2.0"
lodash.clonedeep "^4.5.0"
macaddress "^0.2.9"
- markdown-it "^8.4.0"
mime "^2.4.4"
ps-tree "^1.2.0"
request "^2.82.0"
+ semver "^5.4.1"
uuid "^8.0.0"
vhost "^3.0.2"
vscode-debugprotocol "^1.32.0"
+ vscode-proxy-agent "^0.11.0"
vscode-textmate "^4.0.1"
-"@theia/plugin-metrics@1.20.0", "@theia/plugin-metrics@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/plugin-metrics/-/plugin-metrics-1.20.0.tgz#b28920e8fa80466295dd2befcede208bf2ab1b89"
- integrity sha512-uPOLX2H4RNtWUmP3OsV93F4OlUvwJjsqFG4NGhy/mRfOKNjxVkSoyyEObYcHRUQGU2k6hLGV7KYgY4yQIcpVvQ==
- dependencies:
- "@theia/core" "1.20.0"
- "@theia/metrics" "1.20.0"
- "@theia/plugin" "1.20.0"
- "@theia/plugin-ext" "1.20.0"
-
-"@theia/plugin@1.20.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/plugin/-/plugin-1.20.0.tgz#3cf271b8fd77ba3c575008cfbc7c5fcad86a8fb2"
- integrity sha512-rFUsyTIVbEiLEMAzySXHpj0UgXOz0WE0NO07g6WrH9axwTQtDo76I3ql+FcmIH5SzCNINeOv5/t+ZYXlMe7alA==
-
-"@theia/preferences@1.20.0", "@theia/preferences@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.20.0.tgz#ccf2d332e4235aa4fd7981fd50dee118c6d7340c"
- integrity sha512-A4X9Z5YiiPVz7hheB0owGok7VoccSKoZf6/xG60nQkn1ok1MygQZZWXKf+qWKEB+OJT1tM0H+6+sEGvWoJy8Uw==
- dependencies:
- "@theia/core" "1.20.0"
- "@theia/editor" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/monaco" "1.20.0"
- "@theia/userstorage" "1.20.0"
- "@theia/workspace" "1.20.0"
+"@theia/plugin-metrics@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/plugin-metrics/-/plugin-metrics-1.27.0.tgz#ec2b24d0ad131eb483f1670e92a7678bf419aba1"
+ integrity sha512-xOmjSslWpaYMH4Ymgy3MjyewISTHHDnK1BW0KsHHcDqtJT8GkYBKI8QW3/n6XdpHvtwfURTzJJA+t316Z7FH+w==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/metrics" "1.27.0"
+ "@theia/monaco-editor-core" "1.65.2"
+ "@theia/plugin" "1.27.0"
+ "@theia/plugin-ext" "1.27.0"
+
+"@theia/plugin@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/plugin/-/plugin-1.27.0.tgz#0d9a720766a6eaf9841ba11f377ebde459afaf6a"
+ integrity sha512-1VAx8Aa3qHinTt1XixkzUUy3lh0bOBBKPbIdwmEN3Pd1//Ls8m46bwtAqGL9HKflEWEFb3OBcrvNuNmAZ6F+kw==
+
+"@theia/preferences@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.27.0.tgz#f316e8e8f591eef235c52538b75afda5e9a0d5a7"
+ integrity sha512-203AjU5WfTcpqc+5xZHp4aH1kAelnIrttLmgLfb3M/zYPXforYODvyOgyznBePvz6eitbcOy139r8cgXq0CCzQ==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/editor" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/monaco" "1.27.0"
+ "@theia/monaco-editor-core" "1.65.2"
+ "@theia/userstorage" "1.27.0"
+ "@theia/workspace" "1.27.0"
+ async-mutex "^0.3.1"
jsonc-parser "^2.2.0"
+ p-debounce "^2.1.0"
-"@theia/process@1.20.0", "@theia/process@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.20.0.tgz#3fb1150186a8ce35ea827a89ebe94de1edeb2f41"
- integrity sha512-VmfoFO/ErH2UT5ygs5b+g6SSx21v7DktPuAPGxcmA7nllFurCEIpyKOKRf6Ncflw9kUKLeCtD7t8r3RkQuy4ew==
+"@theia/process@1.20.0", "@theia/process@1.27.0", "@theia/process@^1.0.0", "@theia/process@^1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.27.0.tgz#f71b3c851958c390951dee26b79e3769fd273b28"
+ integrity sha512-zBkOn/u7aGzwulp+41ZfYxZWQ2TjsXEK+OCmJK3iaDPvjm6td32oazEz6OJdMESsuXh4t/5Rig9pqQOwnh0FYQ==
dependencies:
- "@theia/core" "1.20.0"
- "@theia/node-pty" "0.9.0-theia.6"
+ "@theia/core" "1.27.0"
+ node-pty "0.11.0-beta17"
string-argv "^0.1.1"
-"@theia/scm-extra@1.20.0", "@theia/scm-extra@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/scm-extra/-/scm-extra-1.20.0.tgz#2672b89249d34a29eae314e3ce7c67a3ee7d892b"
- integrity sha512-bkNiES3yNx6KWWwMW3xQm1Cpk7lLDYxP2gXhV0E5toDYWnOQYVaf8bEFufrYZTxaFD0IR8wh75UFtOvT9ByaPw==
+"@theia/request@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/request/-/request-1.27.0.tgz#0432dc0ca73454b79c74ca468936ac7d3d16116a"
+ integrity sha512-Hxkg9CVL466jgFhsSQ0eCRI4uBPPcTJtxgGSbDIwtJaabYtVsboKPmiyepZcHCAoN5dSIPfd9lUnsa8PpOLjlQ==
dependencies:
- "@theia/core" "1.20.0"
- "@theia/editor" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/navigator" "1.20.0"
- "@theia/scm" "1.20.0"
+ http-proxy-agent "^5.0.0"
+ https-proxy-agent "^5.0.0"
-"@theia/scm@1.20.0", "@theia/scm@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-1.20.0.tgz#f2356be2857d5d65c5db1e8a5dcde4acfa3a59e2"
- integrity sha512-2er9AKuZZ7QFYqqGPVsCTCqgj9CkvGPsTjmHd5rlzPiM4gfmlF5QuNCqmPXxuZ3kLGt26ApiFMMHwxatbxQvSA==
- dependencies:
- "@theia/core" "1.20.0"
- "@theia/editor" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/navigator" "1.20.0"
+"@theia/scm-extra@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/scm-extra/-/scm-extra-1.27.0.tgz#e2f76ec2e7817ff7d24918a2f298038b03468485"
+ integrity sha512-umFbUagqyhV42fJLn2SAjM00wrUfkmjo08S0OOF2Y9Lkaq6suu7Bvs7+EWaDcuxnkT6p2KSFvwnv2XACzsdiRw==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/editor" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/navigator" "1.27.0"
+ "@theia/scm" "1.27.0"
+
+"@theia/scm@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-1.27.0.tgz#db3abf00ac472a58db9e20d6562e0c6661a31bb9"
+ integrity sha512-IJKV+LWbXQrSfIARg0DUeROPmEvjoT3l0/kCFBvIjrpGufqipNIAvHuDOMWFAYCD3kYSb4NCdIQhXJVOoFXmgw==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/editor" "1.27.0"
+ "@theia/filesystem" "1.27.0"
"@types/diff" "^3.2.2"
diff "^3.4.0"
p-debounce "^2.1.0"
react-autosize-textarea "^7.0.0"
ts-md5 "^1.2.2"
-"@theia/search-in-workspace@1.20.0", "@theia/search-in-workspace@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-1.20.0.tgz#4f52cb3abf9c6edcf0e430513352107de15f8130"
- integrity sha512-YMTuRVzeZ560GwYVzH3QdLdgliVKp20ReejC/lgi0+XaQJl0JP1D/AG0Wt8zJz662pnYYZDBy4Fcn+3Bf/a2cA==
- dependencies:
- "@theia/core" "1.20.0"
- "@theia/editor" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/navigator" "1.20.0"
- "@theia/process" "1.20.0"
- "@theia/workspace" "1.20.0"
+"@theia/search-in-workspace@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-1.27.0.tgz#75410acfb6f6b5396c9cbbb561ac7b57f6bbb9c1"
+ integrity sha512-bMWbsR8sYH3+W3DCDGFv12sy3BFCUnsPigZrAsYRcIynfLUg+MhZiBpikQCiDhCqry1sobFEOjO1tzuY5BdLcg==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/editor" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/navigator" "1.27.0"
+ "@theia/process" "1.27.0"
+ "@theia/workspace" "1.27.0"
minimatch "^3.0.4"
vscode-ripgrep "^1.2.4"
-"@theia/task@1.20.0", "@theia/task@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/task/-/task-1.20.0.tgz#64fee3c82bbd2f194cc16f85c92eb54b76a1b6b4"
- integrity sha512-un1qPXYTtUdytGB0oSwW525A6pAWXmCbZfNQedHDnWQj5KmP8G4GyaboXZqIcW1ytGCkWW/sT0MlsDeP6PT3FA==
- dependencies:
- "@theia/core" "1.20.0"
- "@theia/editor" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/markers" "1.20.0"
- "@theia/monaco" "1.20.0"
- "@theia/preferences" "1.20.0"
- "@theia/process" "1.20.0"
- "@theia/terminal" "1.20.0"
- "@theia/userstorage" "1.20.0"
- "@theia/variable-resolver" "1.20.0"
- "@theia/workspace" "1.20.0"
- ajv "^6.5.3"
+"@theia/task@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/task/-/task-1.27.0.tgz#0cabd212829f7672df7a42ed02020fcef2646f9b"
+ integrity sha512-n9c43IV4XN+bo77F9AwRHbSuxKGxMxUB2dEaQZzvgCb9hSJ6vDgpmfeeYVcwQNoz18MO9SgDk2x4A8h9XWPv/g==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/editor" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/markers" "1.27.0"
+ "@theia/monaco" "1.27.0"
+ "@theia/monaco-editor-core" "1.65.2"
+ "@theia/process" "1.27.0"
+ "@theia/terminal" "1.27.0"
+ "@theia/userstorage" "1.27.0"
+ "@theia/variable-resolver" "1.27.0"
+ "@theia/workspace" "1.27.0"
async-mutex "^0.3.1"
jsonc-parser "^2.2.0"
p-debounce "^2.1.0"
-"@theia/terminal@1.20.0", "@theia/terminal@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.20.0.tgz#99a7f310819f4406a26de4deb7ac12d0f346f0fc"
- integrity sha512-ZwdLQMbRr82yOuRrHrw/42W4CBPpaLqjBniSi6aR4Hx53Y+JDmgQcg9ApcLpp0i2/D4znoKb5BHb62i23zDA+A==
- dependencies:
- "@theia/core" "1.20.0"
- "@theia/editor" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/monaco" "1.20.0"
- "@theia/process" "1.20.0"
- "@theia/workspace" "1.20.0"
- xterm "~4.11.0"
- xterm-addon-fit "~0.5.0"
- xterm-addon-search "~0.8.0"
-
-"@theia/timeline@1.20.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/timeline/-/timeline-1.20.0.tgz#ce45550febabfe842694489f0a3e3bcb639d6aa5"
- integrity sha512-NcuTo2fU0DN3saCeUK/cb+coh97lQhVg/HbUvd3YzpprTVde9GAgLxGk/VltdMC0gpCr73Q/yefuGNCfVkvRhw==
- dependencies:
- "@theia/core" "1.20.0"
- "@theia/navigator" "1.20.0"
-
-"@theia/typehierarchy@1.20.0", "@theia/typehierarchy@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/typehierarchy/-/typehierarchy-1.20.0.tgz#c556ab6ddad40a5182f736e30b648f79d6f2bcdc"
- integrity sha512-Fe9QGIxhkg6E89xVGyif1cWTqG244+GdpGGQnVIN7LbOPfpsgBZ6KjtQBgxCwFqflkCArdWCure1xD8/S7UsUQ==
- dependencies:
- "@theia/core" "1.20.0"
- "@theia/editor" "1.20.0"
+"@theia/terminal@1.27.0", "@theia/terminal@^1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.27.0.tgz#e174c1140ccc6744615ff0eef4ffdf14f3097b06"
+ integrity sha512-0ZlkAX6h2swGhX8AEoZly8V3gv+vyZz3x00l+K8UVGIRg/W/p/KSzOzW9aU1tn8igOcFL/rtjQVYSBwDjsEv9g==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/editor" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/process" "1.27.0"
+ "@theia/workspace" "1.27.0"
+ xterm "^4.16.0"
+ xterm-addon-fit "^0.5.0"
+ xterm-addon-search "^0.8.2"
+
+"@theia/timeline@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/timeline/-/timeline-1.27.0.tgz#dc365db88170f62fca7b69eb52fd8a3b18cefe60"
+ integrity sha512-ptjXCgiF+o4FveDCkPvsAAzdaqcZbtDZZN+gkXbP8h+DBzRIPQ1Dup4YaByTTG17QJUe8q7NBV2KLt5Tk0wCtA==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/navigator" "1.27.0"
+
+"@theia/typehierarchy@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/typehierarchy/-/typehierarchy-1.27.0.tgz#1e98fab76e8c4ce0336b44189c358f030f956f3c"
+ integrity sha512-J3ztvcCihINIyRudIM+kR3mvGnVSAYiH9zHSpIZyzjDmPSjzh5yGJy/OlxS4s6Sip9HlsT0w+f6YDTThtDON4g==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/editor" "1.27.0"
"@types/uuid" "^7.0.3"
uuid "^8.0.0"
-"@theia/userstorage@1.20.0", "@theia/userstorage@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.20.0.tgz#a44f1be290f52014248422c16e6067ee493051af"
- integrity sha512-q0iChacxP74wcBtWKeCsg3JFBdGfkk8fU85UqY0ynZffNXAl38D1VOPUrLig+UYs0Gh3qn8l+UnzQEiMcdr9CQ==
- dependencies:
- "@theia/core" "1.20.0"
- "@theia/filesystem" "1.20.0"
-
-"@theia/variable-resolver@1.20.0", "@theia/variable-resolver@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.20.0.tgz#bd7ff53ecd90e7389e2875b2cd32193696967b7d"
- integrity sha512-Gf7F3dwc974/q//d5cJ2Fc8F91sdIE5K9/p7pbQ7jAlTDX7/XaJnepGOe6GUkx6AHFuqMLfeObi3D7qgKhQwMA==
- dependencies:
- "@theia/core" "1.20.0"
-
-"@theia/vsx-registry@1.20.0", "@theia/vsx-registry@^1.0.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/vsx-registry/-/vsx-registry-1.20.0.tgz#85af160f4c5afd72f9a6a865bb90d0b65338a6a4"
- integrity sha512-f8oU5SWpJ5tpyF8uSlGDWjlxHMX0qtAnEAxVQNaPTUHxxfpeIJyfcIfzMozams4PjTZE0dJYkrsW/VYqfBAzSw==
- dependencies:
- "@theia/core" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/ovsx-client" "1.20.0"
- "@theia/plugin-ext" "1.20.0"
- "@theia/plugin-ext-vscode" "1.20.0"
- "@theia/preferences" "1.20.0"
- "@theia/workspace" "1.20.0"
- "@types/bent" "^7.0.1"
- "@types/markdown-it" "*"
- "@types/showdown" "^1.7.1"
- bent "^7.1.0"
- markdown-it "^8.4.0"
+"@theia/userstorage@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.27.0.tgz#94ef58ac144811a3f59b70917c049bab9b743c5d"
+ integrity sha512-C2L9+NtDIARB+LxxIwx4gYWrVFXXy1t1H5w++FHXfkQn9s2NYzXnVsJpLNBJNudEuD7l7QctLv/kJIYEc9M27Q==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+
+"@theia/variable-resolver@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.27.0.tgz#50c35919671c75ed5144bdebeab8d36d1eaf655d"
+ integrity sha512-LEPTe2t2P0hhnrXC0pSgBMcMVU4L7YhaQfUiRsSwHaWPW+VuM7hluVN1098nRO3TNnPPnYoOqh0fmBnSKfUMaQ==
+ dependencies:
+ "@theia/core" "1.27.0"
+
+"@theia/vsx-registry@1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/vsx-registry/-/vsx-registry-1.27.0.tgz#f2dbf82cf81f88f07f308d2e2401208881648cab"
+ integrity sha512-a97mT6odiDPAyNa/lqqvw9W6nEqx5NmoD1Ls6bD1dcNJQ3uQNRPLYft910AsIQGFbyr23WfeOXrnOsz+G58wyA==
+ dependencies:
+ "@theia/core" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/ovsx-client" "1.27.0"
+ "@theia/plugin-ext" "1.27.0"
+ "@theia/plugin-ext-vscode" "1.27.0"
+ "@theia/preferences" "1.27.0"
+ "@theia/workspace" "1.27.0"
+ luxon "^2.4.0"
p-debounce "^2.1.0"
- requestretry "^3.1.0"
semver "^5.4.1"
- showdown "^1.9.1"
uuid "^8.0.0"
-"@theia/workspace@1.20.0", "@theia/workspace@^1.0.0", "@theia/workspace@next":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.20.0.tgz#1d6cd88c662b3be99f3ff61ea7ae7f9db58776a6"
- integrity sha512-Y0o1+5V41l6oFLENrvnLf/3GEBOtSnhNaF2j2o6Qg7WlUC/poZ3Ca4zNB2KpRQOrsLfz0T5icyUe54QU0CLjWQ==
+"@theia/workspace@1.20.0", "@theia/workspace@1.27.0", "@theia/workspace@^1.0.0", "@theia/workspace@^1.27.0":
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.27.0.tgz#070d0c632bf80191b85c107b8dded3e6a2b5c31e"
+ integrity sha512-qMMJkKTOua1uSA2RltAvQTCweD4uLKlT7aBhucZYYu0Q2FoMZnImMcruX7Bw7F5YB1URJAoUhVt7o6tJ5qKv7w==
dependencies:
- "@theia/core" "1.20.0"
- "@theia/filesystem" "1.20.0"
- "@theia/variable-resolver" "1.20.0"
- ajv "^6.5.3"
+ "@theia/core" "1.27.0"
+ "@theia/filesystem" "1.27.0"
+ "@theia/variable-resolver" "1.27.0"
jsonc-parser "^2.2.0"
- moment "2.24.0"
valid-filename "^2.0.1"
-"@types/base64-arraybuffer@0.1.0":
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/@types/base64-arraybuffer/-/base64-arraybuffer-0.1.0.tgz#739eea0a974d13ae831f96d97d882ceb0b187543"
- integrity sha512-oyV0CGER7tX6OlfnLfGze0XbsA7tfRuTtsQ2JbP8K5KBUzc24yoYRD+0XjMRQgOejvZWeIbtkNaHlE8akzj4aQ==
+"@tootallnate/once@1", "@tootallnate/once@^1.1.2":
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
+ integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+
+"@tootallnate/once@2":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+ integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
+"@tsconfig/node10@^1.0.7":
+ version "1.0.9"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
+ integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
+
+"@tsconfig/node12@^1.0.7":
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+ integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
+
+"@tsconfig/node14@^1.0.0":
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+ integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
+
+"@tsconfig/node16@^1.0.2":
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
+ integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
"@types/bent@^7.0.1":
version "7.3.2"
@@ -1924,16 +2975,36 @@
"@types/connect" "*"
"@types/node" "*"
+"@types/cacheable-request@^6.0.1":
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.2.tgz#c324da0197de0a98a2312156536ae262429ff6b9"
+ integrity sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==
+ dependencies:
+ "@types/http-cache-semantics" "*"
+ "@types/keyv" "*"
+ "@types/node" "*"
+ "@types/responselike" "*"
+
"@types/caseless@*":
version "0.12.2"
resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8"
integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==
+"@types/chai@^4.2.22":
+ version "4.3.3"
+ resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.3.tgz#3c90752792660c4b562ad73b3fbd68bf3bc7ae07"
+ integrity sha512-hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g==
+
"@types/chai@^4.2.7":
version "4.3.0"
resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.0.tgz#23509ebc1fa32f1b4d50d6a66c4032d5b8eaabdc"
integrity sha512-/ceqdqeRraGolFTcfoXNiqjyQhZzbINDngeoAq9GoHa8PPK1yNzTaxWjA6BFWp5Ua9JpXEMSS4s5i9tS0hOJtw==
+"@types/component-emitter@^1.2.10":
+ version "1.2.11"
+ resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.11.tgz#50d47d42b347253817a39709fef03ce66a108506"
+ integrity sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==
+
"@types/connect@*":
version "3.4.35"
resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
@@ -1946,6 +3017,16 @@
resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.3.3.tgz#85bc74ba782fb7aa3a514d11767832b0e3bc6803"
integrity sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==
+"@types/cookie@^0.4.1":
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
+ integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
+
+"@types/cors@^2.8.12":
+ version "2.8.12"
+ resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
+ integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
+
"@types/diff@^3.2.2":
version "3.5.5"
resolved "https://registry.yarnpkg.com/@types/diff/-/diff-3.5.5.tgz#d1ddc082c03a26f0490856da47d57c29093d1e76"
@@ -2010,6 +3091,13 @@
dependencies:
"@types/node" "*"
+"@types/fs-extra@^9.0.13":
+ version "9.0.13"
+ resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"
+ integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==
+ dependencies:
+ "@types/node" "*"
+
"@types/glob@*":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
@@ -2026,7 +3114,17 @@
"@types/react" "*"
hoist-non-react-statics "^3.3.0"
-"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/http-cache-semantics@*":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
+ integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
+
+"@types/json-buffer@~3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@types/json-buffer/-/json-buffer-3.0.0.tgz#85c1ff0f0948fc159810d4b5be35bf8c20875f64"
+ integrity sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==
+
+"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
version "7.0.10"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.10.tgz#9b05b7896166cd00e9cbd59864853abf65d9ac23"
integrity sha512-BLO9bBq59vW3fxCpD4o0N4U+DXsvwvIcl+jofw0frQo/GrBFC+/jRZj1E7kgp6dvTyNmA4y6JCV5Id/r3mNP5A==
@@ -2036,6 +3134,13 @@
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+"@types/keyv@*":
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
+ integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
+ dependencies:
+ "@types/node" "*"
+
"@types/linkify-it@*":
version "3.0.2"
resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
@@ -2060,7 +3165,7 @@
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.180.tgz#4ab7c9ddfc92ec4a887886483bc14c79fb380670"
integrity sha512-XOKXa1KIxtNXgASAnwj7cnttJxS4fksBRywK/9LzRV5YxrF80BXZIGeQSuoESQ/VkUj30Ae0+YcuHc15wJCB2g==
-"@types/markdown-it@*":
+"@types/markdown-it@^12.2.3":
version "12.2.3"
resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==
@@ -2088,30 +3193,26 @@
resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.3.tgz#c893b73721db73699943bfc3653b1deb7faa4a3a"
integrity sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==
-"@types/minimatch@*":
+"@types/minimatch@*", "@types/minimatch@^3.0.3":
version "3.0.5"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
-"@types/minipass@*":
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/@types/minipass/-/minipass-3.1.2.tgz#e2d7f9df0698aff421dcf145b4fc05b8183b9030"
- integrity sha512-foLGjgrJkUjLG/o2t2ymlZGEoBNBa/TfoUZ7oCTkOjP1T43UGBJspovJou/l3ZuHvye2ewR5cZNtp2zyWgILMA==
- dependencies:
- "@types/node" "*"
-
-"@types/mkdirp@^0.5.2":
- version "0.5.2"
- resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.5.2.tgz#503aacfe5cc2703d5484326b1b27efa67a339c1f"
- integrity sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==
- dependencies:
- "@types/node" "*"
+"@types/minimist@^1.2.0":
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
+ integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
"@types/mocha@^5.2.7":
version "5.2.7"
resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea"
integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==
+"@types/mocha@^9.0.0":
+ version "9.1.1"
+ resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4"
+ integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==
+
"@types/multer@^1.4.7":
version "1.4.7"
resolved "https://registry.yarnpkg.com/@types/multer/-/multer-1.4.7.tgz#89cf03547c28c7bbcc726f029e2a76a7232cc79e"
@@ -2119,14 +3220,6 @@
dependencies:
"@types/express" "*"
-"@types/node-fetch@2.5.7":
- version "2.5.7"
- resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
- integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
- dependencies:
- "@types/node" "*"
- form-data "^3.0.0"
-
"@types/node-fetch@^2.5.7":
version "2.6.1"
resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975"
@@ -2140,11 +3233,26 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644"
integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==
+"@types/node@16.x":
+ version "16.11.56"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.56.tgz#dcbb617669481e158e0f1c6204d1c768cd675901"
+ integrity sha512-aFcUkv7EddxxOa/9f74DINReQ/celqH8DiB3fRYgVDM2Xm5QJL8sl80QKuAnGvwAsMn+H3IFA6WCrQh1CY7m1A==
+
+"@types/node@>=10.0.0":
+ version "18.7.14"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.14.tgz#0fe081752a3333392d00586d815485a17c2cf3c9"
+ integrity sha512-6bbDaETVi8oyIARulOE9qF1/Qdi/23z6emrUh0fNJRUmjznqrixD4MpGDdgOFk5Xb0m2H6Xu42JGdvAxaJR/wA==
+
"@types/node@^10.14.22":
version "10.17.60"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
+"@types/normalize-package-data@^2.4.0":
+ version "2.4.1"
+ resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
+ integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
+
"@types/object-hash@^1.3.0":
version "1.3.4"
resolved "https://registry.yarnpkg.com/@types/object-hash/-/object-hash-1.3.4.tgz#079ba142be65833293673254831b5e3e847fe58b"
@@ -2155,6 +3263,11 @@
resolved "https://registry.yarnpkg.com/@types/p-queue/-/p-queue-2.3.2.tgz#16bc5fece69ef85efaf2bce8b13f3ebe39c5a1c8"
integrity sha512-eKAv5Ql6k78dh3ULCsSBxX6bFNuGjTmof5Q/T6PiECDq0Yf8IIn46jCyp3RJvCi8owaEmm3DZH1PEImjBMd/vQ==
+"@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==
+
"@types/prop-types@*":
version "15.7.4"
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
@@ -2220,7 +3333,7 @@
"@types/scheduler" "*"
csstype "^3.0.2"
-"@types/request@*", "@types/request@^2.0.3":
+"@types/request@^2.0.3":
version "2.48.8"
resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.8.tgz#0b90fde3b655ab50976cb8c5ac00faca22f5a82c"
integrity sha512-whjk1EDJPcAR2kYHRbFl/lKeeKYTi05A15K9bnLInCVroNDCtXce57xKdI0/rQaA3K+6q0eFyUBPmqfSndUZdQ==
@@ -2230,13 +3343,12 @@
"@types/tough-cookie" "*"
form-data "^2.5.0"
-"@types/requestretry@^1.12.3":
- version "1.12.8"
- resolved "https://registry.yarnpkg.com/@types/requestretry/-/requestretry-1.12.8.tgz#d3f02ee0b4d18e1cee15324506704052a25e1ebd"
- integrity sha512-NKdv2WmEe6/V1PmJrflfvGVN9bvuOsnHmNRC4m8TFXPMQnRFKvnnkFN4I6AxAtw4hUi2h3A+z/aH+ir2HYTNOg==
+"@types/responselike@*", "@types/responselike@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
+ integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
dependencies:
"@types/node" "*"
- "@types/request" "*"
"@types/rimraf@^2.0.2":
version "2.0.5"
@@ -2268,6 +3380,11 @@
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
+"@types/semver@^7.3.8":
+ version "7.3.12"
+ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.12.tgz#920447fdd78d76b19de0438b7f60df3c4a80bf1c"
+ integrity sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==
+
"@types/serve-static@*":
version "1.13.10"
resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
@@ -2276,10 +3393,17 @@
"@types/mime" "^1"
"@types/node" "*"
-"@types/showdown@^1.7.1":
- version "1.9.4"
- resolved "https://registry.yarnpkg.com/@types/showdown/-/showdown-1.9.4.tgz#5385adf34143abad9309561661fa6c781d2ab962"
- integrity sha512-50ehC3IAijfkvoNqmQ+VL73S7orOxmAK8ljQAFBv8o7G66lAZyxQj1L3BAv2dD86myLXI+sgKP1kcxAaxW356w==
+"@types/sinon@^10.0.6":
+ version "10.0.13"
+ resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-10.0.13.tgz#60a7a87a70d9372d0b7b38cc03e825f46981fb83"
+ integrity sha512-UVjDqJblVNQYvVNUsj0PuYYw0ELRmgt1Nt5Vk0pT5f16ROGfcKJY8o1HVuMOJOpD727RrGB9EGvoaTQE5tgxZQ==
+ dependencies:
+ "@types/sinonjs__fake-timers" "*"
+
+"@types/sinonjs__fake-timers@*":
+ version "8.1.2"
+ resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz#bf2e02a3dbd4aecaf95942ecd99b7402e03fad5e"
+ integrity sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA==
"@types/tar-fs@^1.16.1":
version "1.16.3"
@@ -2296,19 +3420,16 @@
dependencies:
"@types/node" "*"
-"@types/tar@^4.0.3":
- version "4.0.5"
- resolved "https://registry.yarnpkg.com/@types/tar/-/tar-4.0.5.tgz#5f953f183e36a15c6ce3f336568f6051b7b183f3"
- integrity sha512-cgwPhNEabHaZcYIy5xeMtux2EmYBitfqEceBUi2t5+ETy4dW6kswt6WX4+HqLeiiKOo42EXbGiDmVJ2x+vi37Q==
- dependencies:
- "@types/minipass" "*"
- "@types/node" "*"
-
"@types/tough-cookie@*":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.1.tgz#8f80dd965ad81f3e1bc26d6f5c727e132721ff40"
integrity sha512-Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg==
+"@types/tough-cookie@^4.0.0":
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
+ integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
+
"@types/trusted-types@*":
version "2.0.2"
resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756"
@@ -2319,10 +3440,10 @@
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-7.0.5.tgz#b1d2f772142a301538fae9bdf9cf15b9f2573a29"
integrity sha512-hKB88y3YHL8oPOs/CNlaXtjWn93+Bs48sDQR37ZUqG2tLeCS7EA1cmnkKsuQsub9OKEB/y/Rw9zqJqqNSbqVlQ==
-"@types/vscode@1.43.0":
- version "1.43.0"
- resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.43.0.tgz#22276e60034c693b33117f1068ffaac0e89522db"
- integrity sha512-kIaR9qzd80rJOxePKpCB/mdy00mz8Apt2QA5Y6rdrKFn13QNFNeP3Hzmsf37Bwh/3cS7QjtAeGSK7wSqAU0sYQ==
+"@types/vscode@1.65.0":
+ version "1.65.0"
+ resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.65.0.tgz#042dd8d93c32ac62cb826cd0fa12376069d1f448"
+ integrity sha512-wQhExnh2nEzpjDMSKhUvnNmz3ucpd3E+R7wJkOhBNK3No6fG3VUdmVmMOKD0A8NDZDDDiQcLNxe3oGmX5SjJ5w==
"@types/which@^1.3.2":
version "1.3.2"
@@ -2354,75 +3475,98 @@
dependencies:
"@types/yargs-parser" "*"
-"@typescript-eslint/eslint-plugin@^4.32.0":
- version "4.33.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276"
- integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==
+"@typescript-eslint/eslint-plugin@^5.13.0":
+ version "5.36.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.1.tgz#471f64dc53600025e470dad2ca4a9f2864139019"
+ integrity sha512-iC40UK8q1tMepSDwiLbTbMXKDxzNy+4TfPWgIL661Ym0sD42vRcQU93IsZIrmi+x292DBr60UI/gSwfdVYexCA==
dependencies:
- "@typescript-eslint/experimental-utils" "4.33.0"
- "@typescript-eslint/scope-manager" "4.33.0"
- debug "^4.3.1"
+ "@typescript-eslint/scope-manager" "5.36.1"
+ "@typescript-eslint/type-utils" "5.36.1"
+ "@typescript-eslint/utils" "5.36.1"
+ debug "^4.3.4"
functional-red-black-tree "^1.0.1"
- ignore "^5.1.8"
- regexpp "^3.1.0"
- semver "^7.3.5"
+ ignore "^5.2.0"
+ regexpp "^3.2.0"
+ semver "^7.3.7"
tsutils "^3.21.0"
-"@typescript-eslint/experimental-utils@4.33.0":
- version "4.33.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd"
- integrity sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==
+"@typescript-eslint/experimental-utils@^5.0.0":
+ version "5.36.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.36.1.tgz#a80560ec2aad2411eb148ec1e955dabf5b4609e5"
+ integrity sha512-zLbD16KK1P0tjYXHRKWUcEjJIGDMhbrvjTJyWTfKRLB9NXW45S1zWw4+GZfxEdGzIPyaw22DUgUtyGgr3d7jAg==
dependencies:
- "@types/json-schema" "^7.0.7"
- "@typescript-eslint/scope-manager" "4.33.0"
- "@typescript-eslint/types" "4.33.0"
- "@typescript-eslint/typescript-estree" "4.33.0"
- eslint-scope "^5.1.1"
- eslint-utils "^3.0.0"
+ "@typescript-eslint/utils" "5.36.1"
-"@typescript-eslint/parser@^4.32.0":
- version "4.33.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899"
- integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==
+"@typescript-eslint/parser@^5.13.0":
+ version "5.36.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.36.1.tgz#931c22c7bacefd17e29734628cdec8b2acdcf1ce"
+ integrity sha512-/IsgNGOkBi7CuDfUbwt1eOqUXF9WGVBW9dwEe1pi+L32XrTsZIgmDFIi2RxjzsvB/8i+MIf5JIoTEH8LOZ368A==
dependencies:
- "@typescript-eslint/scope-manager" "4.33.0"
- "@typescript-eslint/types" "4.33.0"
- "@typescript-eslint/typescript-estree" "4.33.0"
- debug "^4.3.1"
+ "@typescript-eslint/scope-manager" "5.36.1"
+ "@typescript-eslint/types" "5.36.1"
+ "@typescript-eslint/typescript-estree" "5.36.1"
+ debug "^4.3.4"
+
+"@typescript-eslint/scope-manager@5.36.1":
+ version "5.36.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.36.1.tgz#23c49b7ddbcffbe09082e6694c2524950766513f"
+ integrity sha512-pGC2SH3/tXdu9IH3ItoqciD3f3RRGCh7hb9zPdN2Drsr341zgd6VbhP5OHQO/reUqihNltfPpMpTNihFMarP2w==
+ dependencies:
+ "@typescript-eslint/types" "5.36.1"
+ "@typescript-eslint/visitor-keys" "5.36.1"
-"@typescript-eslint/scope-manager@4.33.0":
- version "4.33.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3"
- integrity sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==
+"@typescript-eslint/type-utils@5.36.1":
+ version "5.36.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.36.1.tgz#016fc2bff6679f54c0b2df848a493f0ca3d4f625"
+ integrity sha512-xfZhfmoQT6m3lmlqDvDzv9TiCYdw22cdj06xY0obSznBsT///GK5IEZQdGliXpAOaRL34o8phEvXzEo/VJx13Q==
dependencies:
- "@typescript-eslint/types" "4.33.0"
- "@typescript-eslint/visitor-keys" "4.33.0"
+ "@typescript-eslint/typescript-estree" "5.36.1"
+ "@typescript-eslint/utils" "5.36.1"
+ debug "^4.3.4"
+ tsutils "^3.21.0"
-"@typescript-eslint/types@4.33.0":
- version "4.33.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"
- integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==
+"@typescript-eslint/types@5.36.1":
+ version "5.36.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.36.1.tgz#1cf0e28aed1cb3ee676917966eb23c2f8334ce2c"
+ integrity sha512-jd93ShpsIk1KgBTx9E+hCSEuLCUFwi9V/urhjOWnOaksGZFbTOxAT47OH2d4NLJnLhkVD+wDbB48BuaycZPLBg==
-"@typescript-eslint/typescript-estree@4.33.0":
- version "4.33.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609"
- integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==
+"@typescript-eslint/typescript-estree@5.36.1":
+ version "5.36.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.1.tgz#b857f38d6200f7f3f4c65cd0a5afd5ae723f2adb"
+ integrity sha512-ih7V52zvHdiX6WcPjsOdmADhYMDN15SylWRZrT2OMy80wzKbc79n8wFW0xpWpU0x3VpBz/oDgTm2xwDAnFTl+g==
dependencies:
- "@typescript-eslint/types" "4.33.0"
- "@typescript-eslint/visitor-keys" "4.33.0"
- debug "^4.3.1"
- globby "^11.0.3"
- is-glob "^4.0.1"
- semver "^7.3.5"
+ "@typescript-eslint/types" "5.36.1"
+ "@typescript-eslint/visitor-keys" "5.36.1"
+ debug "^4.3.4"
+ globby "^11.1.0"
+ is-glob "^4.0.3"
+ semver "^7.3.7"
tsutils "^3.21.0"
-"@typescript-eslint/visitor-keys@4.33.0":
- version "4.33.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd"
- integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==
+"@typescript-eslint/utils@5.36.1":
+ version "5.36.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.36.1.tgz#136d5208cc7a3314b11c646957f8f0b5c01e07ad"
+ integrity sha512-lNj4FtTiXm5c+u0pUehozaUWhh7UYKnwryku0nxJlYUEWetyG92uw2pr+2Iy4M/u0ONMKzfrx7AsGBTCzORmIg==
dependencies:
- "@typescript-eslint/types" "4.33.0"
- eslint-visitor-keys "^2.0.0"
+ "@types/json-schema" "^7.0.9"
+ "@typescript-eslint/scope-manager" "5.36.1"
+ "@typescript-eslint/types" "5.36.1"
+ "@typescript-eslint/typescript-estree" "5.36.1"
+ eslint-scope "^5.1.1"
+ eslint-utils "^3.0.0"
+
+"@typescript-eslint/visitor-keys@5.36.1":
+ version "5.36.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.1.tgz#7731175312d65738e501780f923896d200ad1615"
+ integrity sha512-ojB9aRyRFzVMN3b5joSYni6FAS10BBSCAfKJhjJAV08t/a95aM6tAhz+O1jF+EtgxktuSO3wJysp2R+Def/IWQ==
+ dependencies:
+ "@typescript-eslint/types" "5.36.1"
+ eslint-visitor-keys "^3.3.0"
+
+"@ungap/promise-all-settled@1.1.2":
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
+ integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
"@vscode/codicons@*":
version "0.0.29"
@@ -2600,7 +3744,7 @@ abbrev@1:
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-accepts@~1.3.7, accepts@~1.3.8:
+accepts@~1.3.4, accepts@~1.3.7, 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==
@@ -2613,12 +3757,17 @@ acorn-import-assertions@^1.7.6:
resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
-acorn-jsx@^5.2.0, acorn-jsx@^5.3.1:
+acorn-jsx@^5.2.0, acorn-jsx@^5.3.2:
version "5.3.2"
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
-acorn@^7.1.1, acorn@^7.4.0:
+acorn-walk@^8.1.1:
+ 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@^7.1.1:
version "7.4.1"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
@@ -2628,6 +3777,11 @@ acorn@^8.4.1, acorn@^8.5.0:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
+acorn@^8.8.0:
+ version "8.8.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
+ integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
+
add-stream@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
@@ -2638,13 +3792,22 @@ agent-base@5:
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
-agent-base@6:
+agent-base@6, agent-base@^6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
dependencies:
debug "4"
+agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
+ integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
+ dependencies:
+ debug "^4.1.0"
+ depd "^1.1.2"
+ humanize-ms "^1.2.1"
+
aggregate-error@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -2682,7 +3845,7 @@ ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.5.3:
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
-ajv@^8.0.0, ajv@^8.0.1, ajv@^8.6.1, ajv@^8.8.0:
+ajv@^8.0.0, ajv@^8.6.1, 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==
@@ -2702,16 +3865,11 @@ ansi-colors@3.2.3:
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
-ansi-colors@^4.1.1:
+ansi-colors@4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-ansi-escapes@^3.0.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
- integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
-
ansi-escapes@^4.2.1:
version "4.3.2"
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
@@ -2753,7 +3911,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
dependencies:
color-convert "^2.0.1"
-anymatch@~3.1.1:
+anymatch@~3.1.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==
@@ -2771,6 +3929,19 @@ aproba@^1.0.3:
resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+"aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+ integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
+
+are-we-there-yet@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
+ integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
+ dependencies:
+ delegates "^1.0.0"
+ readable-stream "^3.6.0"
+
are-we-there-yet@~1.1.2:
version "1.1.7"
resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
@@ -2779,6 +3950,11 @@ are-we-there-yet@~1.1.2:
delegates "^1.0.0"
readable-stream "^2.0.6"
+arg@^4.1.0:
+ version "4.1.3"
+ resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+ integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
argparse@^1.0.7:
version "1.0.10"
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2786,10 +3962,15 @@ argparse@^1.0.7:
dependencies:
sprintf-js "~1.0.2"
-array-find-index@^1.0.1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
- integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
+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==
+
+array-differ@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b"
+ integrity sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==
array-flatten@1.1.1:
version "1.1.1"
@@ -2801,7 +3982,7 @@ array-ify@^1.0.0:
resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
-array-includes@^3.1.3, array-includes@^3.1.4:
+array-includes@^3.1.4:
version "3.1.4"
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
@@ -2838,20 +4019,21 @@ array.prototype.flat@^1.2.5:
define-properties "^1.1.3"
es-abstract "^1.19.0"
-array.prototype.flatmap@^1.2.5:
- version "1.2.5"
- resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446"
- integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==
- dependencies:
- call-bind "^1.0.0"
- define-properties "^1.1.3"
- es-abstract "^1.19.0"
-
arrify@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
+arrify@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
+ integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
+
+asap@^2.0.0:
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+ integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
+
asn1@~0.2.3:
version "0.2.6"
resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
@@ -2884,11 +4066,6 @@ astral-regex@^1.0.0:
resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-astral-regex@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
- integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
async-limiter@~1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
@@ -2901,21 +4078,26 @@ async-mutex@^0.3.1:
dependencies:
tslib "^2.3.1"
-async@^1.5.0:
- version "1.5.2"
- resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
- integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
-
asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+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==
+
autocompleter@5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/autocompleter/-/autocompleter-5.1.0.tgz#da80488ddf1f1d89b0a8f5d36cab24439de18ab8"
integrity sha512-xFZla6guwywqFJutoi5xrhAmaKw4/TU8CcLuNep/3OtiUfpNXtgzuBkkXJ6ysJIfG6MEEXFtUBg3PREN6HUVyw==
+autocompleter@^5.1.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/autocompleter/-/autocompleter-5.2.0.tgz#9ed3df262614fd557bf4d5bf67ab13cdee008203"
+ integrity sha512-CMYgI+r7RGZFaT0SvXcyBn1hb/Ne6XbjXimWQPc16LcwZgUGFBHg/Pv8honrwkTZE4DbfrD/MzqlG+Bn2u+1ng==
+
autosize@^4.0.2:
version "4.0.4"
resolved "https://registry.yarnpkg.com/autosize/-/autosize-4.0.4.tgz#924f13853a466b633b9309330833936d8bccce03"
@@ -2931,25 +4113,35 @@ aws4@^1.8.0:
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
-azure-devops-node-api@^7.2.0:
- version "7.2.0"
- resolved "https://registry.yarnpkg.com/azure-devops-node-api/-/azure-devops-node-api-7.2.0.tgz#131d4e01cf12ebc6e45569b5e0c5c249e4114d6d"
- integrity sha512-pMfGJ6gAQ7LRKTHgiRF+8iaUUeGAI0c8puLaqHLc7B8AR7W6GJLozK9RFeUHFjEGybC9/EB3r67WPd7e46zQ8w==
+axios-cookiejar-support@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/axios-cookiejar-support/-/axios-cookiejar-support-1.0.1.tgz#7b32af7d932508546c68b1fc5ba8f562884162e1"
+ integrity sha512-IZJxnAJ99XxiLqNeMOqrPbfR7fRyIfaoSLdPUf4AMQEGkH8URs0ghJK/xtqBsD+KsSr3pKl4DEQjCn834pHMig==
dependencies:
- os "0.1.1"
- tunnel "0.0.4"
- typed-rest-client "1.2.0"
- underscore "1.8.3"
+ is-redirect "^1.0.0"
+ pify "^5.0.0"
-babel-loader@8.0.6:
- version "8.0.6"
- resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"
- integrity sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==
+axios@^0.21.1:
+ version "0.21.4"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
+ integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
dependencies:
- find-cache-dir "^2.0.0"
- loader-utils "^1.0.2"
- mkdirp "^0.5.1"
- pify "^4.0.1"
+ follow-redirects "^1.14.0"
+
+axios@^0.24.0:
+ version "0.24.0"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"
+ integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==
+ dependencies:
+ follow-redirects "^1.14.4"
+
+azure-devops-node-api@^11.0.1:
+ version "11.2.0"
+ resolved "https://registry.yarnpkg.com/azure-devops-node-api/-/azure-devops-node-api-11.2.0.tgz#bf04edbef60313117a0507415eed4790a420ad6b"
+ integrity sha512-XdiGPhrpaT5J8wdERRKs5g8E0Zy1pvOYTli7z9E8nmOn3YGp4FhtjhrOyFmX/8veWCwdI69mCHKJw6l+4J/bHA==
+ dependencies:
+ tunnel "0.0.6"
+ typed-rest-client "^1.8.4"
babel-loader@^8.2.2:
version "8.2.3"
@@ -2992,10 +4184,10 @@ babel-plugin-polyfill-regenerator@^0.3.0:
dependencies:
"@babel/helper-define-polyfill-provider" "^0.3.1"
-back@~0.1.5:
- version "0.1.5"
- resolved "https://registry.yarnpkg.com/back/-/back-0.1.5.tgz#342b96b804657b03ec9a31f248a11f200608dcc2"
- integrity sha1-NCuWuARlewPsmjHySKEfIAYI3MI=
+backo2@~1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+ integrity sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==
balanced-match@^1.0.0:
version "1.0.2"
@@ -3007,16 +4199,16 @@ balloon-css@^0.5.0:
resolved "https://registry.yarnpkg.com/balloon-css/-/balloon-css-0.5.2.tgz#9e2163565a136c9d4aa20e8400772ce3b738d3ff"
integrity sha512-zheJpzwyNrG4t39vusA67v3BYg1HTVXOF8cErPEHzWK88PEOFwgo6Ea9VHOgOWNMgeuOtFVtB73NE2NWl9uDyQ==
-base64-arraybuffer@^0.1.5:
- version "0.1.5"
- resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
- integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
-
base64-js@^1.3.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+base64id@2.0.0, base64id@~2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
+ integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
+
bcrypt-pbkdf@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
@@ -3024,6 +4216,11 @@ bcrypt-pbkdf@^1.0.0:
dependencies:
tweetnacl "^0.14.3"
+before-after-hook@^2.2.0:
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"
+ integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
+
bent@^7.1.0:
version "7.3.12"
resolved "https://registry.yarnpkg.com/bent/-/bent-7.3.12.tgz#e0a2775d4425e7674c64b78b242af4f49da6b035"
@@ -3033,6 +4230,11 @@ bent@^7.1.0:
caseless "~0.12.0"
is-stream "^2.0.0"
+big-integer@^1.6.17:
+ version "1.6.51"
+ resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686"
+ integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==
+
big.js@^5.2.2:
version "5.2.2"
resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -3043,10 +4245,10 @@ binary-extensions@^2.0.0:
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-binary@^0.3.0:
+binary@^0.3.0, binary@~0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79"
- integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=
+ integrity sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==
dependencies:
buffers "~0.1.1"
chainsaw "~0.1.0"
@@ -3071,7 +4273,7 @@ bl@^1.0.0:
readable-stream "^2.3.5"
safe-buffer "^5.1.1"
-bl@^4.0.3:
+bl@^4.0.3, bl@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
@@ -3080,6 +4282,11 @@ bl@^4.0.3:
inherits "^2.0.4"
readable-stream "^3.4.0"
+bluebird@~3.4.1:
+ version "3.4.7"
+ resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
+ integrity sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==
+
body-parser@1.19.0:
version "1.19.0"
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
@@ -3117,6 +4324,11 @@ boolbase@^1.0.0:
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
+boolean@^3.0.1:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
+ integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==
+
brace-expansion@^1.1.7:
version "1.1.11"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -3125,6 +4337,13 @@ brace-expansion@^1.1.7:
balanced-match "^1.0.0"
concat-map "0.0.1"
+brace-expansion@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+ integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+ dependencies:
+ balanced-match "^1.0.0"
+
braces@^3.0.1, braces@~3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
@@ -3176,6 +4395,11 @@ buffer-from@^1.0.0:
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+buffer-indexof-polyfill@~1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz#d2732135c5999c64b277fcf9b1abe3498254729c"
+ integrity sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==
+
buffer@^5.2.1, buffer@^5.5.0:
version "5.7.1"
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
@@ -3197,19 +4421,28 @@ buffers@~0.1.1:
resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s=
-busboy@^0.2.11:
- version "0.2.14"
- resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.2.14.tgz#6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"
- integrity sha1-bCpiLvz0fFe7vh4qnDetNseSVFM=
+builtins@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+ integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==
+
+busboy@^1.0.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
+ integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
dependencies:
- dicer "0.2.5"
- readable-stream "1.1.x"
+ streamsearch "^1.1.0"
byline@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=
+byte-size@^7.0.0:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-7.0.1.tgz#b1daf3386de7ab9d706b941a748dbfc71130dee3"
+ integrity sha512-crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A==
+
bytes@3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
@@ -3225,6 +4458,85 @@ bytesish@^0.4.1:
resolved "https://registry.yarnpkg.com/bytesish/-/bytesish-0.4.4.tgz#f3b535a0f1153747427aee27256748cff92347e6"
integrity sha512-i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ==
+cacache@^15.0.5, cacache@^15.2.0:
+ version "15.3.0"
+ resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
+ integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
+ dependencies:
+ "@npmcli/fs" "^1.0.0"
+ "@npmcli/move-file" "^1.0.1"
+ chownr "^2.0.0"
+ fs-minipass "^2.0.0"
+ glob "^7.1.4"
+ infer-owner "^1.0.4"
+ lru-cache "^6.0.0"
+ minipass "^3.1.1"
+ minipass-collect "^1.0.2"
+ minipass-flush "^1.0.5"
+ minipass-pipeline "^1.2.2"
+ mkdirp "^1.0.3"
+ p-map "^4.0.0"
+ promise-inflight "^1.0.1"
+ rimraf "^3.0.2"
+ ssri "^8.0.1"
+ tar "^6.0.2"
+ unique-filename "^1.1.1"
+
+cacache@^16.1.0:
+ version "16.1.3"
+ resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
+ integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
+ dependencies:
+ "@npmcli/fs" "^2.1.0"
+ "@npmcli/move-file" "^2.0.0"
+ chownr "^2.0.0"
+ fs-minipass "^2.1.0"
+ glob "^8.0.1"
+ infer-owner "^1.0.4"
+ lru-cache "^7.7.1"
+ minipass "^3.1.6"
+ minipass-collect "^1.0.2"
+ minipass-flush "^1.0.5"
+ minipass-pipeline "^1.2.4"
+ mkdirp "^1.0.4"
+ p-map "^4.0.0"
+ promise-inflight "^1.0.1"
+ rimraf "^3.0.2"
+ ssri "^9.0.0"
+ tar "^6.1.11"
+ unique-filename "^2.0.0"
+
+cacheable-lookup@^5.0.3:
+ version "5.0.4"
+ resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
+ integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
+
+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==
+ 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"
+
+cacheable-request@^7.0.2:
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
+ integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
+ dependencies:
+ clone-response "^1.0.2"
+ get-stream "^5.1.0"
+ http-cache-semantics "^4.0.0"
+ keyv "^4.0.0"
+ lowercase-keys "^2.0.0"
+ normalize-url "^6.0.1"
+ responselike "^2.0.0"
+
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"
@@ -3243,54 +4555,36 @@ callsites@^3.0.0:
resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-camelcase-keys@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
- integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
- dependencies:
- camelcase "^2.0.0"
- map-obj "^1.0.0"
-
-camelcase-keys@^4.0.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
- integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=
+camelcase-keys@^6.2.2:
+ version "6.2.2"
+ resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
+ integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
dependencies:
- camelcase "^4.1.0"
- map-obj "^2.0.0"
- quick-lru "^1.0.0"
-
-camelcase@^2.0.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
- integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
-
-camelcase@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
- integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
+ camelcase "^5.3.1"
+ map-obj "^4.0.0"
+ quick-lru "^4.0.1"
-camelcase@^5.0.0:
+camelcase@^5.0.0, camelcase@^5.3.1:
version "5.3.1"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+camelcase@^6.0.0:
+ version "6.3.0"
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+ integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
+
caniuse-lite@^1.0.30001317:
version "1.0.30001317"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001317.tgz#0548fb28fd5bc259a70b8c1ffdbe598037666a1b"
integrity sha512-xIZLh8gBm4dqNX0gkzrBeyI86J2eCjWzYAs40q88smG844YIrN4tVQl/RhquHvKEKImWWFIVh1Lxe5n1G/N+GQ==
-capture-stack-trace@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
- integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
-
caseless@~0.12.0:
version "0.12.0"
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-chai@^4.2.0:
+chai@^4.2.0, chai@^4.3.4:
version "4.3.6"
resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.6.tgz#ffe4ba2d9fa9d6680cc0b370adae709ec9011e9c"
integrity sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==
@@ -3310,7 +4604,15 @@ chainsaw@~0.1.0:
dependencies:
traverse ">=0.3.0 <0.4"
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.2:
+chalk@4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72"
+ integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==
+ dependencies:
+ ansi-styles "^4.1.0"
+ supports-color "^7.1.0"
+
+chalk@^2.0.0, chalk@^2.1.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==
@@ -3327,21 +4629,6 @@ chalk@^4.0.0, chalk@^4.1.0:
ansi-styles "^4.1.0"
supports-color "^7.1.0"
-changes-stream@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/changes-stream/-/changes-stream-2.2.0.tgz#9cf2bdbc2173c29c634aec9948e5d23b24d37c18"
- integrity sha1-nPK9vCFzwpxjSuyZSOXSOyTTfBg=
- dependencies:
- back "~0.1.5"
- debug "~0.8.0"
- http-https "~1.0.0"
- readable-stream "1.0.x"
-
-chardet@^0.4.0:
- version "0.4.2"
- resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
- integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=
-
chardet@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -3359,29 +4646,30 @@ checksum@^0.1.1:
dependencies:
optimist "~0.3.5"
-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==
- dependencies:
- css-select "^4.1.3"
- css-what "^5.0.1"
- domelementtype "^2.2.0"
- domhandler "^4.2.0"
- domutils "^2.7.0"
-
-cheerio@^1.0.0-rc.1:
- 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"
+cheerio-select@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4"
+ integrity sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==
+ dependencies:
+ boolbase "^1.0.0"
+ css-select "^5.1.0"
+ css-what "^6.1.0"
+ domelementtype "^2.3.0"
+ domhandler "^5.0.3"
+ domutils "^3.0.1"
+
+cheerio@^1.0.0-rc.9:
+ version "1.0.0-rc.12"
+ resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683"
+ integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==
+ dependencies:
+ cheerio-select "^2.1.0"
+ dom-serializer "^2.0.0"
+ domhandler "^5.0.3"
+ domutils "^3.0.1"
+ htmlparser2 "^8.0.1"
+ parse5 "^7.0.0"
+ parse5-htmlparser2-tree-adapter "^7.0.0"
chokidar@3.3.0:
version "3.3.0"
@@ -3398,20 +4686,40 @@ chokidar@3.3.0:
optionalDependencies:
fsevents "~2.1.1"
+chokidar@3.5.3:
+ version "3.5.3"
+ resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+ integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+ 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"
+
chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+chownr@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+ integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
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==
-ci-info@^1.5.0:
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
- integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
+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==
circular-dependency-plugin@^5.2.2:
version "5.2.2"
@@ -3423,13 +4731,6 @@ clean-stack@^2.0.0:
resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-cli-cursor@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
- integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
- dependencies:
- restore-cursor "^2.0.0"
-
cli-cursor@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
@@ -3437,30 +4738,16 @@ cli-cursor@^3.1.0:
dependencies:
restore-cursor "^3.1.0"
-cli-spinners@^2.0.0:
- version "2.6.1"
- resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
- integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
-
-cli-width@^2.0.0:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
- integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
+cli-spinners@^2.5.0:
+ version "2.7.0"
+ resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a"
+ integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==
cli-width@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
-cliui@^3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
- integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
- dependencies:
- string-width "^1.0.1"
- strip-ansi "^3.0.1"
- wrap-ansi "^2.0.0"
-
cliui@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -3479,6 +4766,15 @@ cliui@^6.0.0:
strip-ansi "^6.0.0"
wrap-ansi "^6.2.0"
+cliui@^7.0.2:
+ version "7.0.4"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+ integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+ dependencies:
+ string-width "^4.2.0"
+ strip-ansi "^6.0.0"
+ wrap-ansi "^7.0.0"
+
clone-deep@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -3488,6 +4784,13 @@ clone-deep@^4.0.1:
kind-of "^6.0.2"
shallow-clone "^3.0.0"
+clone-response@^1.0.2:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3"
+ integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==
+ dependencies:
+ mimic-response "^1.0.0"
+
clone@^1.0.2:
version "1.0.4"
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
@@ -3503,13 +4806,12 @@ clsx@^1.0.4:
resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
-cmd-shim@^2.0.2:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.1.0.tgz#e59a08d4248dda3bb502044083a4db4ac890579a"
- integrity sha512-A5C0Cyf2H8sKsHqX0tvIWRXw5/PK++3Dc0lDbsugr90nOECLLuSPahVQBG8pgmgiXgm/TzBWMqI2rWdZwHduAw==
+cmd-shim@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-4.1.0.tgz#b3a904a6743e9fede4148c6f3800bf2a08135bdd"
+ integrity sha512-lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw==
dependencies:
- graceful-fs "^4.1.2"
- mkdirp "~0.5.0"
+ mkdirp-infer-owner "^2.0.0"
code-point-at@^1.0.0:
version "1.1.0"
@@ -3540,16 +4842,16 @@ color-name@~1.1.4:
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+color-support@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+ integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
colorette@^1.2.1:
version "1.4.0"
resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
-colors@^1.3.3, colors@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
- integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
columnify@^1.5.4:
version "1.6.0"
resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
@@ -3565,18 +4867,16 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
dependencies:
delayed-stream "~1.0.0"
-command-join@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.1.tgz#0a9e58a84e94bd0d1b6c75ce1078723d8a7645cb"
- integrity sha512-LBA9kSxtg2SA8itaBeuitpn4pZQOhGVP1dyU1cnXLYrBpF3sikaPhjWPqyqVh7oGpneI05RtJs9a0fftIEgXcA==
- dependencies:
- "@improved/node" "^1.0.0"
-
commander@^2.20.0, commander@^2.8.1:
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@^6.1.0:
+ version "6.2.1"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
+ integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
+
commander@^7.0.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
@@ -3587,13 +4887,26 @@ commondir@^1.0.1:
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
-compare-func@^1.3.1:
- version "1.3.4"
- resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.4.tgz#6b07c4c5e8341119baf44578085bda0f4a823516"
- integrity sha512-sq2sWtrqKPkEXAC8tEJA1+BqAH9GbFkGBtUOqrUX57VSfwp8xyktctk+uLoRy5eccTdxzDcVIztlYDpKs3Jv1Q==
+compare-func@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3"
+ integrity sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==
dependencies:
array-ify "^1.0.0"
- dot-prop "^3.0.0"
+ dot-prop "^5.1.0"
+
+component-emitter@~1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+ integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
+compress-brotli@^1.3.8:
+ version "1.3.8"
+ resolved "https://registry.yarnpkg.com/compress-brotli/-/compress-brotli-1.3.8.tgz#0c0a60c97a989145314ec381e84e26682e7b38db"
+ integrity sha512-lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ==
+ dependencies:
+ "@types/json-buffer" "~3.0.0"
+ json-buffer "~3.0.1"
compression-webpack-plugin@^9.0.0:
version "9.2.0"
@@ -3613,7 +4926,7 @@ concat-map@0.0.1:
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-concat-stream@^1.4.10, concat-stream@^1.5.2, concat-stream@^1.6.2:
+concat-stream@^1.5.2, concat-stream@^1.6.2:
version "1.6.2"
resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -3623,196 +4936,129 @@ concat-stream@^1.4.10, concat-stream@^1.5.2, concat-stream@^1.6.2:
readable-stream "^2.2.2"
typedarray "^0.0.6"
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
- integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
-content-disposition@0.5.3:
- version "0.5.3"
- resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
- integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
- dependencies:
- safe-buffer "5.1.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==
- dependencies:
- 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==
-
-conventional-changelog-angular@^1.6.6:
- version "1.6.6"
- resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f"
- integrity sha512-suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==
- dependencies:
- compare-func "^1.3.1"
- q "^1.5.1"
-
-conventional-changelog-atom@^0.2.8:
- version "0.2.8"
- resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz#8037693455990e3256f297320a45fa47ee553a14"
- integrity sha512-8pPZqhMbrnltNBizjoDCb/Sz85KyUXNDQxuAEYAU5V/eHn0okMBVjqc8aHWYpHrytyZWvMGbayOlDv7i8kEf6g==
- dependencies:
- q "^1.5.1"
-
-conventional-changelog-cli@^1.3.13:
- version "1.3.22"
- resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.22.tgz#13570fe1728f56f013ff7a88878ff49d5162a405"
- integrity sha512-pnjdIJbxjkZ5VdAX/H1wndr1G10CY8MuZgnXuJhIHglOXfIrXygb7KZC836GW9uo1u8PjEIvIw/bKX0lOmOzZg==
- dependencies:
- add-stream "^1.0.0"
- conventional-changelog "^1.1.24"
- lodash "^4.2.1"
- meow "^4.0.0"
- tempfile "^1.1.1"
-
-conventional-changelog-codemirror@^0.3.8:
- version "0.3.8"
- resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz#a1982c8291f4ee4d6f2f62817c6b2ecd2c4b7b47"
- integrity sha512-3HFZKtBXTaUCHvz7ai6nk2+psRIkldDoNzCsom0egDtVmPsvvHZkzjynhdQyULfacRSsBTaiQ0ol6nBOL4dDiQ==
- dependencies:
- q "^1.5.1"
-
-conventional-changelog-core@^2.0.11:
- version "2.0.11"
- resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz#19b5fbd55a9697773ed6661f4e32030ed7e30287"
- integrity sha512-HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg==
+concat-stream@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
+ integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
dependencies:
- conventional-changelog-writer "^3.0.9"
- conventional-commits-parser "^2.1.7"
- dateformat "^3.0.0"
- get-pkg-repo "^1.0.0"
- git-raw-commits "^1.3.6"
- git-remote-origin-url "^2.0.0"
- git-semver-tags "^1.3.6"
- lodash "^4.2.1"
- normalize-package-data "^2.3.5"
- q "^1.5.1"
- read-pkg "^1.1.0"
- read-pkg-up "^1.0.1"
- through2 "^2.0.0"
+ buffer-from "^1.0.0"
+ inherits "^2.0.3"
+ readable-stream "^3.0.2"
+ typedarray "^0.0.6"
-conventional-changelog-ember@^0.3.12:
- version "0.3.12"
- resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz#b7d31851756d0fcb49b031dffeb6afa93b202400"
- integrity sha512-mmJzA7uzbrOqeF89dMMi6z17O07ORTXlTMArnLG9ZTX4oLaKNolUlxFUFlFm9JUoVWajVpaHQWjxH1EOQ+ARoQ==
+config-chain@^1.1.11, config-chain@^1.1.12:
+ version "1.1.13"
+ resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
+ integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
dependencies:
- q "^1.5.1"
+ ini "^1.3.4"
+ proto-list "~1.2.1"
-conventional-changelog-eslint@^1.0.9:
- version "1.0.9"
- resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz#b13cc7e4b472c819450ede031ff1a75c0e3d07d3"
- integrity sha512-h87nfVh2fdk9fJIvz26wCBsbDC/KxqCc5wSlNMZbXcARtbgNbNDIF7Y7ctokFdnxkzVdaHsbINkh548T9eBA7Q==
- dependencies:
- q "^1.5.1"
+console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+ integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
-conventional-changelog-express@^0.3.6:
- version "0.3.6"
- resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz#4a6295cb11785059fb09202180d0e59c358b9c2c"
- integrity sha512-3iWVtBJZ9RnRnZveNDzOD8QRn6g6vUif0qVTWWyi5nUIAbuN1FfPVyKdAlJJfp5Im+dE8Kiy/d2SpaX/0X678Q==
+content-disposition@0.5.3:
+ version "0.5.3"
+ resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+ integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
dependencies:
- q "^1.5.1"
+ safe-buffer "5.1.2"
-conventional-changelog-jquery@^0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz#0208397162e3846986e71273b6c79c5b5f80f510"
- integrity sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=
+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==
dependencies:
- q "^1.4.1"
+ safe-buffer "5.2.1"
-conventional-changelog-jscs@^0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz#0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"
- integrity sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=
+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==
+
+conventional-changelog-angular@^5.0.12:
+ version "5.0.13"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz#896885d63b914a70d4934b59d2fe7bde1832b28c"
+ integrity sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==
dependencies:
- q "^1.4.1"
+ compare-func "^2.0.0"
+ q "^1.5.1"
-conventional-changelog-jshint@^0.3.8:
- version "0.3.8"
- resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz#9051c1ac0767abaf62a31f74d2fe8790e8acc6c8"
- integrity sha512-hn9QU4ZI/5V50wKPJNPGT4gEWgiBFpV6adieILW4MaUFynuDYOvQ71EMSj3EznJyKi/KzuXpc9dGmX8njZMjig==
+conventional-changelog-core@^4.2.2:
+ version "4.2.4"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz#e50d047e8ebacf63fac3dc67bf918177001e1e9f"
+ integrity sha512-gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg==
dependencies:
- compare-func "^1.3.1"
+ add-stream "^1.0.0"
+ conventional-changelog-writer "^5.0.0"
+ conventional-commits-parser "^3.2.0"
+ dateformat "^3.0.0"
+ get-pkg-repo "^4.0.0"
+ git-raw-commits "^2.0.8"
+ git-remote-origin-url "^2.0.0"
+ git-semver-tags "^4.1.1"
+ lodash "^4.17.15"
+ normalize-package-data "^3.0.0"
q "^1.5.1"
+ read-pkg "^3.0.0"
+ read-pkg-up "^3.0.0"
+ through2 "^4.0.0"
-conventional-changelog-preset-loader@^1.1.8:
- version "1.1.8"
- resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz#40bb0f142cd27d16839ec6c74ee8db418099b373"
- integrity sha512-MkksM4G4YdrMlT2MbTsV2F6LXu/hZR0Tc/yenRrDIKRwBl/SP7ER4ZDlglqJsCzLJi4UonBc52Bkm5hzrOVCcw==
+conventional-changelog-preset-loader@^2.3.4:
+ version "2.3.4"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz#14a855abbffd59027fd602581f1f34d9862ea44c"
+ integrity sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==
-conventional-changelog-writer@^3.0.9:
- version "3.0.9"
- resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz#4aecdfef33ff2a53bb0cf3b8071ce21f0e994634"
- integrity sha512-n9KbsxlJxRQsUnK6wIBRnARacvNnN4C/nxnxCkH+B/R1JS2Fa+DiP1dU4I59mEDEjgnFaN2+9wr1P1s7GYB5/Q==
+conventional-changelog-writer@^5.0.0:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz#e0757072f045fe03d91da6343c843029e702f359"
+ integrity sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ==
dependencies:
- compare-func "^1.3.1"
- conventional-commits-filter "^1.1.6"
+ conventional-commits-filter "^2.0.7"
dateformat "^3.0.0"
- handlebars "^4.0.2"
+ handlebars "^4.7.7"
json-stringify-safe "^5.0.1"
- lodash "^4.2.1"
- meow "^4.0.0"
- semver "^5.5.0"
+ lodash "^4.17.15"
+ meow "^8.0.0"
+ semver "^6.0.0"
split "^1.0.0"
- through2 "^2.0.0"
+ through2 "^4.0.0"
-conventional-changelog@^1.1.24:
- version "1.1.24"
- resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.24.tgz#3d94c29c960f5261c002678315b756cdd3d7d1f0"
- integrity sha512-2WcSUst4Y3Z4hHvoMTWXMJr/DmgVdLiMOVY1Kak2LfFz+GIz2KDp5naqbFesYbfXPmaZ5p491dO0FWZIJoJw1Q==
- dependencies:
- conventional-changelog-angular "^1.6.6"
- conventional-changelog-atom "^0.2.8"
- conventional-changelog-codemirror "^0.3.8"
- conventional-changelog-core "^2.0.11"
- conventional-changelog-ember "^0.3.12"
- conventional-changelog-eslint "^1.0.9"
- conventional-changelog-express "^0.3.6"
- conventional-changelog-jquery "^0.1.0"
- conventional-changelog-jscs "^0.1.0"
- conventional-changelog-jshint "^0.3.8"
- conventional-changelog-preset-loader "^1.1.8"
-
-conventional-commits-filter@^1.1.1, conventional-commits-filter@^1.1.6:
- version "1.1.6"
- resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz#4389cd8e58fe89750c0b5fb58f1d7f0cc8ad3831"
- integrity sha512-KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q==
+conventional-commits-filter@^2.0.7:
+ version "2.0.7"
+ resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz#f8d9b4f182fce00c9af7139da49365b136c8a0b3"
+ integrity sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==
dependencies:
- is-subset "^0.1.1"
+ lodash.ismatch "^4.4.0"
modify-values "^1.0.0"
-conventional-commits-parser@^2.1.1, conventional-commits-parser@^2.1.7:
- version "2.1.7"
- resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e"
- integrity sha512-BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==
+conventional-commits-parser@^3.2.0:
+ version "3.2.4"
+ resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz#a7d3b77758a202a9b2293d2112a8d8052c740972"
+ integrity sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==
dependencies:
JSONStream "^1.0.4"
- is-text-path "^1.0.0"
- lodash "^4.2.1"
- meow "^4.0.0"
- split2 "^2.0.0"
- through2 "^2.0.0"
- trim-off-newlines "^1.0.0"
+ is-text-path "^1.0.1"
+ lodash "^4.17.15"
+ meow "^8.0.0"
+ split2 "^3.0.0"
+ through2 "^4.0.0"
-conventional-recommended-bump@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-1.2.1.tgz#1b7137efb5091f99fe009e2fe9ddb7cc490e9375"
- integrity sha512-oJjG6DkRgtnr/t/VrPdzmf4XZv8c4xKVJrVT4zrSHd92KEL+EYxSbYoKq8lQ7U5yLMw7130wrcQTLRjM/T+d4w==
- dependencies:
- concat-stream "^1.4.10"
- conventional-commits-filter "^1.1.1"
- conventional-commits-parser "^2.1.1"
- git-raw-commits "^1.3.0"
- git-semver-tags "^1.3.0"
- meow "^3.3.0"
- object-assign "^4.0.1"
+conventional-recommended-bump@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz#cfa623285d1de554012f2ffde70d9c8a22231f55"
+ integrity sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw==
+ dependencies:
+ concat-stream "^2.0.0"
+ conventional-changelog-preset-loader "^2.3.4"
+ conventional-commits-filter "^2.0.7"
+ conventional-commits-parser "^3.2.0"
+ git-raw-commits "^2.0.8"
+ git-semver-tags "^4.1.1"
+ meow "^8.0.0"
+ q "^1.5.1"
convert-source-map@^1.7.0:
version "1.8.0"
@@ -3831,7 +5077,7 @@ cookie@0.4.0:
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
-cookie@0.4.2, cookie@^0.4.0:
+cookie@0.4.2, cookie@^0.4.0, cookie@~0.4.1:
version "0.4.2"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
@@ -3886,6 +5132,25 @@ core-util-is@~1.0.0:
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+cors@~2.8.5:
+ version "2.8.5"
+ resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+ integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
+ dependencies:
+ object-assign "^4"
+ vary "^1"
+
+cosmiconfig@^7.0.0:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
+ integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
+ 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"
+
cp-file@^6.1.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-6.2.0.tgz#40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d"
@@ -3897,12 +5162,10 @@ cp-file@^6.1.0:
pify "^4.0.1"
safe-buffer "^5.0.1"
-create-error-class@^3.0.0:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
- integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
- dependencies:
- capture-stack-trace "^1.0.0"
+create-require@^1.1.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+ integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
cross-spawn-async@^2.1.1:
version "2.2.5"
@@ -3912,15 +5175,6 @@ cross-spawn-async@^2.1.1:
lru-cache "^4.0.0"
which "^1.2.8"
-cross-spawn@^5.0.1:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
- integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
- dependencies:
- lru-cache "^4.0.1"
- shebang-command "^1.2.0"
- which "^1.2.9"
-
cross-spawn@^6.0.5:
version "6.0.5"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -3932,7 +5186,7 @@ cross-spawn@^6.0.5:
shebang-command "^1.2.0"
which "^1.2.9"
-cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.1, cross-spawn@^7.0.2, 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==
@@ -3955,21 +5209,21 @@ css-loader@^6.2.0:
postcss-value-parser "^4.2.0"
semver "^7.3.5"
-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@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6"
+ integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==
dependencies:
boolbase "^1.0.0"
- css-what "^5.1.0"
- domhandler "^4.3.0"
- domutils "^2.8.0"
+ css-what "^6.1.0"
+ domhandler "^5.0.2"
+ domutils "^3.0.1"
nth-check "^2.0.1"
-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@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
+ integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
cssesc@^3.0.0:
version "3.0.0"
@@ -3981,19 +5235,10 @@ csstype@^3.0.2:
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"
integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==
-currently-unhandled@^0.4.1:
- version "0.4.1"
- resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
- integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
- dependencies:
- array-find-index "^1.0.1"
-
-dargs@^4.0.1:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
- integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=
- dependencies:
- number-is-nan "^1.0.0"
+dargs@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc"
+ integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==
dashdash@^1.12.0:
version "1.14.1"
@@ -4002,12 +5247,17 @@ dashdash@^1.12.0:
dependencies:
assert-plus "^1.0.0"
+data-uri-to-buffer@3:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636"
+ integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==
+
dateformat@^3.0.0:
version "3.0.3"
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
-debug@2.6.9, debug@^2.5.1, debug@^2.6.9:
+debug@2.6.9, debug@^2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -4021,13 +5271,20 @@ debug@3.2.6:
dependencies:
ms "^2.1.1"
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
+debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
version "4.3.4"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
dependencies:
ms "2.1.2"
+debug@4.3.3:
+ version "4.3.3"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
+ integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+ dependencies:
+ ms "2.1.2"
+
debug@^3.1.0, debug@^3.2.7:
version "3.2.7"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -4035,24 +5292,41 @@ debug@^3.1.0, debug@^3.2.7:
dependencies:
ms "^2.1.1"
-debug@~0.8.0:
- version "0.8.1"
- resolved "https://registry.yarnpkg.com/debug/-/debug-0.8.1.tgz#20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"
- integrity sha1-IP9NJvXkIstoobrLu2EDmtjBwTA=
+debuglog@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+ integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==
-decamelize-keys@^1.0.0:
+decamelize-keys@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
- integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
+ integrity sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==
dependencies:
decamelize "^1.1.0"
map-obj "^1.0.0"
-decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
+decamelize@^1.1.0, decamelize@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+decamelize@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
+ integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
+
+decode-uri-component@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+ integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==
+
+decompress-response@^3.3.0:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+ integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==
+ dependencies:
+ mimic-response "^1.0.0"
+
decompress-response@^4.2.0:
version "4.2.1"
resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986"
@@ -4060,6 +5334,13 @@ decompress-response@^4.2.0:
dependencies:
mimic-response "^2.0.0"
+decompress-response@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
+ integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
+ dependencies:
+ mimic-response "^3.1.0"
+
decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1"
@@ -4147,6 +5428,16 @@ defaults@^1.0.3:
dependencies:
clone "^1.0.2"
+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==
+
+defer-to-connect@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
+ integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
+
define-properties@^1.1.2, define-properties@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -4169,10 +5460,15 @@ denodeify@^1.2.1:
resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631"
integrity sha1-OjYof1A05pnnV3kBBSwubJQlFjE=
-depd@~1.1.2:
+depd@^1.1.2, depd@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
- integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+ integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
+
+deprecation@^2.0.0, deprecation@^2.3.1:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
+ integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
destroy@~1.0.4:
version "1.0.4"
@@ -4184,24 +5480,59 @@ detect-indent@^5.0.0:
resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
+detect-indent@^6.0.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
+ integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
+
detect-libc@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-dicer@0.2.5:
- version "0.2.5"
- resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.2.5.tgz#5996c086bb33218c812c090bddc09cd12facb70f"
- integrity sha1-WZbAhrszIYyBLAkL3cCc0S+stw8=
+detect-libc@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
+ integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
+
+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==
+
+dezalgo@^1.0.0:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81"
+ integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==
dependencies:
- readable-stream "1.1.x"
- streamsearch "0.1.2"
+ asap "^2.0.0"
+ wrappy "1"
diff@3.5.0, diff@^3.4.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+diff@4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
+ integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
+
+diff@5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
+ integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
+
+diff@^4.0.1:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+ integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
+diff@^5.0.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40"
+ integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
+
dir-glob@^2.0.0:
version "2.2.2"
resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
@@ -4238,47 +5569,54 @@ dom-helpers@^5.1.3:
"@babel/runtime" "^7.8.7"
csstype "^3.0.2"
-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@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
+ integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
dependencies:
- domelementtype "^2.0.1"
- domhandler "^4.2.0"
- entities "^2.0.0"
+ domelementtype "^2.3.0"
+ domhandler "^5.0.2"
+ entities "^4.2.0"
-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==
+domelementtype@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+ integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
-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==
+domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3:
+ version "5.0.3"
+ resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
+ integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
dependencies:
- domelementtype "^2.2.0"
+ domelementtype "^2.3.0"
dompurify@^2.2.9:
version "2.3.6"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.6.tgz#2e019d7d7617aacac07cbbe3d88ae3ad354cf875"
integrity sha512-OFP2u/3T1R5CEgWCEONuJ1a5+MFKnOYpkywpUSxv/dj1LeBT1erK+JwM7zK0ROy2BRhqVCf0LRw/kHqKuMkVGg==
-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@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c"
+ integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==
dependencies:
- dom-serializer "^1.0.1"
- domelementtype "^2.2.0"
- domhandler "^4.2.0"
+ dom-serializer "^2.0.0"
+ domelementtype "^2.3.0"
+ domhandler "^5.0.1"
-dot-prop@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
- integrity sha1-G3CK8JSknJoOfbyteQq6U52sEXc=
+dot-prop@^5.1.0:
+ version "5.3.0"
+ resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
+ integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
+ dependencies:
+ is-obj "^2.0.0"
+
+dot-prop@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083"
+ integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==
dependencies:
- is-obj "^1.0.0"
+ is-obj "^2.0.0"
drivelist@^9.0.2:
version "9.2.4"
@@ -4290,15 +5628,15 @@ drivelist@^9.0.2:
nan "^2.14.0"
prebuild-install "^5.2.4"
-dugite-extra@0.1.14:
- version "0.1.14"
- resolved "https://registry.yarnpkg.com/dugite-extra/-/dugite-extra-0.1.14.tgz#514c89b6c597bf8b748b4febd53382559a2a8fdd"
- integrity sha512-apUiaj322iSSBx5X7/8Dg3GP6mDLl5y6RaeEWBpLUHfBKxQyTTVHG0YpzYCKe2ke1EbrSmreVNo1FwDnIb3qlw==
+dugite-extra@0.1.15:
+ version "0.1.15"
+ resolved "https://registry.yarnpkg.com/dugite-extra/-/dugite-extra-0.1.15.tgz#322406b628ea5515c5c6fcd65e4d040543d6268a"
+ integrity sha512-beLmQcIXLA8aXqWQZF/ooECoZvYKpBywIFwgqAoYnV04NdWUXDtZ6mMcjQf5eAz5PjXGXAYSuQ31zkPL8J85+A==
dependencies:
byline "^5.0.0"
dugite-no-gpl "1.69.0"
- find-git-exec "^0.0.3"
- upath "^1.0.0"
+ find-git-exec "^0.0.4"
+ upath "^2.0.1"
dugite-no-gpl@1.69.0:
version "1.69.0"
@@ -4312,6 +5650,13 @@ dugite-no-gpl@1.69.0:
rimraf "^2.5.4"
tar "^4.0.2"
+duplexer2@~0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+ integrity sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==
+ dependencies:
+ readable-stream "^2.0.2"
+
duplexer3@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@@ -4335,20 +5680,25 @@ ee-first@1.1.1:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-electron-rebuild@^1.8.6:
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.11.0.tgz#e384773a9ad30fe0a6a5bbb326b779d51f668b6a"
- integrity sha512-cn6AqZBQBVtaEyj5jZW1/LOezZZ22PA1HvhEP7asvYPJ8PDF4i4UFt9be4i9T7xJKiSiomXvY5Fd+dSq3FXZxA==
+electron-rebuild@^3.2.7:
+ version "3.2.9"
+ resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-3.2.9.tgz#ea372be15f591f8d6d978ee9bca6526dadbcf20f"
+ integrity sha512-FkEZNFViUem3P0RLYbZkUjC8LUFIK+wKq09GHoOITSJjfDAVQv964hwaNseTTWt58sITQX3/5fHNYcTefqaCWw==
dependencies:
- colors "^1.3.3"
+ "@malept/cross-spawn-promise" "^2.0.0"
+ chalk "^4.0.0"
debug "^4.1.1"
- detect-libc "^1.0.3"
- fs-extra "^8.1.0"
- node-abi "^2.11.0"
- node-gyp "^6.0.1"
- ora "^3.4.0"
- spawn-rx "^3.0.0"
- yargs "^14.2.0"
+ detect-libc "^2.0.1"
+ fs-extra "^10.0.0"
+ got "^11.7.0"
+ lzma-native "^8.0.5"
+ node-abi "^3.0.0"
+ node-api-version "^0.1.4"
+ node-gyp "^9.0.0"
+ ora "^5.1.0"
+ semver "^7.3.5"
+ tar "^6.0.5"
+ yargs "^17.0.1"
electron-to-chromium@^1.4.84:
version "1.4.86"
@@ -4370,10 +5720,17 @@ emojis-list@^3.0.0:
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
-encodeurl@~1.0.2:
+encodeurl@^1.0.2, encodeurl@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
- integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+ integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
+
+encoding@^0.1.12, encoding@^0.1.13:
+ version "0.1.13"
+ resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+ integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
+ dependencies:
+ iconv-lite "^0.6.2"
end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
version "1.4.4"
@@ -4382,6 +5739,42 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
dependencies:
once "^1.4.0"
+engine.io-client@~6.1.1:
+ version "6.1.1"
+ resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.1.1.tgz#800d4b9db5487d169686729e5bd887afa78d36b0"
+ integrity sha512-V05mmDo4gjimYW+FGujoGmmmxRaDsrVr7AXA3ZIfa04MWM1jOfZfUwou0oNqhNwy/votUDvGDt4JA4QF4e0b4g==
+ dependencies:
+ "@socket.io/component-emitter" "~3.0.0"
+ debug "~4.3.1"
+ engine.io-parser "~5.0.0"
+ has-cors "1.1.0"
+ parseqs "0.0.6"
+ parseuri "0.0.6"
+ ws "~8.2.3"
+ xmlhttprequest-ssl "~2.0.0"
+ yeast "0.1.2"
+
+engine.io-parser@~5.0.0, engine.io-parser@~5.0.3:
+ version "5.0.4"
+ resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0"
+ integrity sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==
+
+engine.io@~6.1.0:
+ version "6.1.3"
+ resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.1.3.tgz#f156293d011d99a3df5691ac29d63737c3302e6f"
+ integrity sha512-rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA==
+ dependencies:
+ "@types/cookie" "^0.4.1"
+ "@types/cors" "^2.8.12"
+ "@types/node" ">=10.0.0"
+ accepts "~1.3.4"
+ base64id "2.0.0"
+ cookie "~0.4.1"
+ cors "~2.8.5"
+ debug "~4.3.1"
+ engine.io-parser "~5.0.3"
+ ws "~8.2.3"
+
enhanced-resolve@^5.9.2:
version "5.9.2"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz#0224dcd6a43389ebfb2d55efee517e5466772dd9"
@@ -4390,38 +5783,36 @@ enhanced-resolve@^5.9.2:
graceful-fs "^4.2.4"
tapable "^2.2.0"
-enquirer@^2.3.5:
- version "2.3.6"
- resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
- integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
- dependencies:
- ansi-colors "^4.1.1"
-
-entities@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
- integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
-
-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==
+entities@^4.2.0, entities@^4.3.0:
+ version "4.3.1"
+ resolved "https://registry.yarnpkg.com/entities/-/entities-4.3.1.tgz#c34062a94c865c322f9d67b4384e4169bcede6a4"
+ integrity sha512-o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg==
entities@~2.0.0:
version "2.0.3"
resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
+entities@~2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+ integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
+
env-paths@^2.2.0:
version "2.2.1"
resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
-envinfo@^7.7.3:
+envinfo@^7.7.3, envinfo@^7.7.4:
version "7.8.1"
resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
+err-code@^2.0.2:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
+ integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
+
errno@^0.1.1:
version "0.1.8"
resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
@@ -4429,7 +5820,7 @@ errno@^0.1.1:
dependencies:
prr "~1.0.1"
-error-ex@^1.2.0, error-ex@^1.3.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==
@@ -4476,6 +5867,11 @@ es-to-primitive@^1.2.1:
is-date-object "^1.0.1"
is-symbol "^1.0.2"
+es6-error@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
+ integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
+
es6-promise@^4.2.4:
version "4.2.8"
resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
@@ -4496,12 +5892,12 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
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:
+escape-string-regexp@4.0.0, 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-config-prettier@^8.3.0:
+eslint-config-prettier@^8.5.0:
version "8.5.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
@@ -4514,80 +5910,56 @@ eslint-import-resolver-node@^0.3.6:
debug "^3.2.7"
resolve "^1.20.0"
-eslint-module-utils@^2.7.2:
- version "2.7.3"
- resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
- integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==
+eslint-module-utils@^2.7.3:
+ version "2.7.4"
+ resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974"
+ integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
dependencies:
debug "^3.2.7"
- find-up "^2.1.0"
eslint-plugin-chai-friendly@^0.7.2:
version "0.7.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-chai-friendly/-/eslint-plugin-chai-friendly-0.7.2.tgz#0ebfbb2c1244f5de2997f3963d155758234f2b0f"
integrity sha512-LOIfGx5sZZ5FwM1shr2GlYAWV9Omdi+1/3byuVagvQNoGUuU0iHhp7AfjA1uR+4dJ4Isfb4+FwBJgQajIw9iAg==
+eslint-plugin-deprecation@^1.3.2:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.3.2.tgz#a8125d28c56158cdfa1a685197e6be8ed86f189e"
+ integrity sha512-z93wbx9w7H/E3ogPw6AZMkkNJ6m51fTZRNZPNQqxQLmx+KKt7aLkMU9wN67s71i+VVHN4tLOZ3zT3QLbnlC0Mg==
+ dependencies:
+ "@typescript-eslint/experimental-utils" "^5.0.0"
+ tslib "^2.3.1"
+ tsutils "^3.21.0"
+
eslint-plugin-header@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz#6ce512432d57675265fac47292b50d1eff11acd6"
integrity sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==
-eslint-plugin-import@^2.24.2:
- version "2.25.4"
- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1"
- integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==
+eslint-plugin-import@^2.25.4:
+ version "2.26.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
+ integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==
dependencies:
array-includes "^3.1.4"
array.prototype.flat "^1.2.5"
debug "^2.6.9"
doctrine "^2.1.0"
eslint-import-resolver-node "^0.3.6"
- eslint-module-utils "^2.7.2"
+ eslint-module-utils "^2.7.3"
has "^1.0.3"
- is-core-module "^2.8.0"
+ is-core-module "^2.8.1"
is-glob "^4.0.3"
- minimatch "^3.0.4"
+ minimatch "^3.1.2"
object.values "^1.1.5"
- resolve "^1.20.0"
- tsconfig-paths "^3.12.0"
+ resolve "^1.22.0"
+ tsconfig-paths "^3.14.1"
eslint-plugin-no-null@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-no-null/-/eslint-plugin-no-null-1.0.2.tgz#1236a812391390a1877ad4007c26e745341c951f"
integrity sha1-EjaoEjkTkKGHetQAfCbnRTQclR8=
-eslint-plugin-prettier@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0"
- integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==
- dependencies:
- prettier-linter-helpers "^1.0.0"
-
-eslint-plugin-react-hooks@^4.0.8:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz#318dbf312e06fab1c835a4abef00121751ac1172"
- integrity sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==
-
-eslint-plugin-react@^7.20.3:
- version "7.29.4"
- resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz#4717de5227f55f3801a5fd51a16a4fa22b5914d2"
- integrity sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ==
- dependencies:
- array-includes "^3.1.4"
- array.prototype.flatmap "^1.2.5"
- doctrine "^2.1.0"
- estraverse "^5.3.0"
- jsx-ast-utils "^2.4.1 || ^3.0.0"
- minimatch "^3.1.2"
- object.entries "^1.1.5"
- object.fromentries "^2.0.5"
- object.hasown "^1.1.0"
- object.values "^1.1.5"
- prop-types "^15.8.1"
- resolve "^2.0.0-next.3"
- semver "^6.3.0"
- string.prototype.matchall "^4.0.6"
-
eslint-scope@5.1.1, eslint-scope@^5.0.0, eslint-scope@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
@@ -4596,6 +5968,14 @@ eslint-scope@5.1.1, eslint-scope@^5.0.0, eslint-scope@^5.1.1:
esrecurse "^4.3.0"
estraverse "^4.1.1"
+eslint-scope@^7.1.1:
+ version "7.1.1"
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
+ integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+ dependencies:
+ esrecurse "^4.3.0"
+ estraverse "^5.2.0"
+
eslint-utils@^1.4.3:
version "1.4.3"
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
@@ -4603,13 +5983,6 @@ eslint-utils@^1.4.3:
dependencies:
eslint-visitor-keys "^1.1.0"
-eslint-utils@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
- integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
- dependencies:
- eslint-visitor-keys "^1.1.0"
-
eslint-utils@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
@@ -4617,7 +5990,7 @@ eslint-utils@^3.0.0:
dependencies:
eslint-visitor-keys "^2.0.0"
-eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+eslint-visitor-keys@^1.1.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
@@ -4627,6 +6000,11 @@ eslint-visitor-keys@^2.0.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
+eslint-visitor-keys@^3.3.0:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
+ integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+
eslint@^6.8.0:
version "6.8.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
@@ -4670,51 +6048,50 @@ eslint@^6.8.0:
text-table "^0.2.0"
v8-compile-cache "^2.0.3"
-eslint@^7.32.0:
- version "7.32.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
- integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
+eslint@^8.10.0:
+ version "8.23.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.0.tgz#a184918d288820179c6041bb3ddcc99ce6eea040"
+ integrity sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==
dependencies:
- "@babel/code-frame" "7.12.11"
- "@eslint/eslintrc" "^0.4.3"
- "@humanwhocodes/config-array" "^0.5.0"
+ "@eslint/eslintrc" "^1.3.1"
+ "@humanwhocodes/config-array" "^0.10.4"
+ "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
+ "@humanwhocodes/module-importer" "^1.0.1"
ajv "^6.10.0"
chalk "^4.0.0"
cross-spawn "^7.0.2"
- debug "^4.0.1"
+ debug "^4.3.2"
doctrine "^3.0.0"
- enquirer "^2.3.5"
escape-string-regexp "^4.0.0"
- eslint-scope "^5.1.1"
- eslint-utils "^2.1.0"
- eslint-visitor-keys "^2.0.0"
- espree "^7.3.1"
+ eslint-scope "^7.1.1"
+ eslint-utils "^3.0.0"
+ eslint-visitor-keys "^3.3.0"
+ espree "^9.4.0"
esquery "^1.4.0"
esutils "^2.0.2"
fast-deep-equal "^3.1.3"
file-entry-cache "^6.0.1"
+ find-up "^5.0.0"
functional-red-black-tree "^1.0.1"
- glob-parent "^5.1.2"
- globals "^13.6.0"
- ignore "^4.0.6"
+ glob-parent "^6.0.1"
+ globals "^13.15.0"
+ globby "^11.1.0"
+ grapheme-splitter "^1.0.4"
+ ignore "^5.2.0"
import-fresh "^3.0.0"
imurmurhash "^0.1.4"
is-glob "^4.0.0"
- js-yaml "^3.13.1"
+ js-yaml "^4.1.0"
json-stable-stringify-without-jsonify "^1.0.1"
levn "^0.4.1"
lodash.merge "^4.6.2"
- minimatch "^3.0.4"
+ minimatch "^3.1.2"
natural-compare "^1.4.0"
optionator "^0.9.1"
- progress "^2.0.0"
- regexpp "^3.1.0"
- semver "^7.2.1"
- strip-ansi "^6.0.0"
+ regexpp "^3.2.0"
+ strip-ansi "^6.0.1"
strip-json-comments "^3.1.0"
- table "^6.0.9"
text-table "^0.2.0"
- v8-compile-cache "^2.0.3"
espree@^6.1.2:
version "6.2.1"
@@ -4725,14 +6102,14 @@ espree@^6.1.2:
acorn-jsx "^5.2.0"
eslint-visitor-keys "^1.1.0"
-espree@^7.3.0, espree@^7.3.1:
- version "7.3.1"
- resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
- integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+espree@^9.4.0:
+ version "9.4.0"
+ resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a"
+ integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==
dependencies:
- acorn "^7.4.0"
- acorn-jsx "^5.3.1"
- eslint-visitor-keys "^1.3.0"
+ acorn "^8.8.0"
+ acorn-jsx "^5.3.2"
+ eslint-visitor-keys "^3.3.0"
esprima@^4.0.0:
version "4.0.1"
@@ -4763,7 +6140,7 @@ estraverse@^4.1.1:
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
+estraverse@^5.1.0, 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==
@@ -4791,7 +6168,12 @@ event-stream@=3.3.4:
stream-combiner "~0.0.4"
through "~2.3.1"
-events@^3.2.0:
+eventemitter3@^4.0.4:
+ version "4.0.7"
+ resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+ integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+
+events@^3.2.0, events@^3.3.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
@@ -4807,32 +6189,6 @@ execa@^0.2.2:
path-key "^1.0.0"
strip-eof "^1.0.0"
-execa@^0.7.0:
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
- integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
- dependencies:
- cross-spawn "^5.0.1"
- get-stream "^3.0.0"
- is-stream "^1.1.0"
- npm-run-path "^2.0.0"
- p-finally "^1.0.0"
- signal-exit "^3.0.0"
- strip-eof "^1.0.0"
-
-execa@^0.8.0:
- version "0.8.0"
- resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"
- integrity sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=
- dependencies:
- cross-spawn "^5.0.1"
- get-stream "^3.0.0"
- is-stream "^1.1.0"
- npm-run-path "^2.0.0"
- p-finally "^1.0.0"
- signal-exit "^3.0.0"
- strip-eof "^1.0.0"
-
execa@^5.0.0:
version "5.1.1"
resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -4930,15 +6286,6 @@ extend@^3.0.2, extend@~3.0.2:
resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-external-editor@^2.0.4:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
- integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==
- dependencies:
- chardet "^0.4.0"
- iconv-lite "^0.4.17"
- tmp "^0.0.33"
-
external-editor@^3.0.3:
version "3.1.0"
resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
@@ -4973,11 +6320,6 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^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==
-fast-diff@^1.1.2:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
- integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
-
fast-glob@^3.2.5, fast-glob@^3.2.9:
version "3.2.11"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
@@ -4989,6 +6331,11 @@ fast-glob@^3.2.5, fast-glob@^3.2.9:
merge2 "^1.3.0"
micromatch "^4.0.4"
+fast-json-patch@^3.1.0:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-3.1.1.tgz#85064ea1b1ebf97a3f7ad01e23f9337e72c66947"
+ integrity sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==
+
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"
@@ -5023,13 +6370,6 @@ fd-slicer@~1.1.0:
dependencies:
pend "~1.2.0"
-figures@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
- integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
- dependencies:
- escape-string-regexp "^1.0.5"
-
figures@^3.0.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
@@ -5056,10 +6396,10 @@ file-icons-js@~1.0.3:
resolved "https://registry.yarnpkg.com/file-icons-js/-/file-icons-js-1.0.3.tgz#d0765dc1d86aba4b2d7664a39e4ef7af9f12c5af"
integrity sha512-n4zoKEpMaAxBTUB7wtgrFBa4dM3b7mBLLA1VI/Q5Cdk/k2UA8S8oaxvnECp3QOzg0Dn+KKRzfIHF7qSdRkA65Q==
-file-saver@2.0.2:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.2.tgz#06d6e728a9ea2df2cce2f8d9e84dfcdc338ec17a"
- integrity sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw==
+file-saver@^2.0.2:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
+ integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
file-type@^3.8.0:
version "3.9.0"
@@ -5081,6 +6421,11 @@ file-uri-to-path@1.0.0:
resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+file-uri-to-path@2:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz#7b415aeba227d575851e0a5b0c640d7656403fba"
+ integrity sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==
+
filename-reserved-regex@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229"
@@ -5102,6 +6447,11 @@ fill-range@^7.0.1:
dependencies:
to-regex-range "^5.0.1"
+filter-obj@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
+ integrity sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==
+
finalhandler@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
@@ -5115,15 +6465,6 @@ finalhandler@~1.1.2:
statuses "~1.5.0"
unpipe "~1.0.0"
-find-cache-dir@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
- integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
- dependencies:
- commondir "^1.0.1"
- make-dir "^2.0.0"
- pkg-dir "^3.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"
@@ -5133,10 +6474,10 @@ find-cache-dir@^3.3.1:
make-dir "^3.0.2"
pkg-dir "^4.1.0"
-find-git-exec@^0.0.3:
- version "0.0.3"
- resolved "https://registry.yarnpkg.com/find-git-exec/-/find-git-exec-0.0.3.tgz#4ce941859ebe7f359fb8e56aafd2acf3c955b52c"
- integrity sha512-cGsuku5hwdOpToV6axI0fRCABuw1yozFtQv13pVK0j7BjILU8buDtHKmSrsZN340Sjj3Z42n8fcF1Xu4nRuBbA==
+find-git-exec@^0.0.4:
+ version "0.0.4"
+ resolved "https://registry.yarnpkg.com/find-git-exec/-/find-git-exec-0.0.4.tgz#f1d0d35f93ad99bc81aacd357388d00ae902bc92"
+ integrity sha512-klzQwno+dpdeahtHhvZZ5Yn6K+zme1Aj+YJ4ZD+DywSLrQoyCywTrsubUZa1hHRehmfwBThoeKjS7fsaxhpfNA==
dependencies:
"@types/node" "^10.14.22"
"@types/which" "^1.3.2"
@@ -5156,15 +6497,15 @@ find-up@3.0.0, find-up@^3.0.0:
dependencies:
locate-path "^3.0.0"
-find-up@^1.0.0:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
- integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
+find-up@5.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==
dependencies:
- path-exists "^2.0.0"
- pinkie-promise "^2.0.0"
+ locate-path "^6.0.0"
+ path-exists "^4.0.0"
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -5203,6 +6544,11 @@ flat@^4.1.0:
dependencies:
is-buffer "~2.0.3"
+flat@^5.0.2:
+ version "5.0.2"
+ resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
+ integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
+
flatted@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
@@ -5213,6 +6559,11 @@ flatted@^3.1.0:
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
+follow-redirects@^1.14.0, follow-redirects@^1.14.4:
+ version "1.15.1"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
+ integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
+
font-awesome@^4.7.0:
version "4.7.0"
resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
@@ -5270,7 +6621,16 @@ fs-constants@^1.0.0:
resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-fs-extra@^4.0.1, fs-extra@^4.0.2:
+fs-extra@^10.0.0, fs-extra@^10.1.0:
+ version "10.1.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+ integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
+ dependencies:
+ graceful-fs "^4.2.0"
+ jsonfile "^6.0.1"
+ universalify "^2.0.0"
+
+fs-extra@^4.0.2:
version "4.0.3"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
@@ -5288,6 +6648,16 @@ fs-extra@^8.1.0:
jsonfile "^4.0.0"
universalify "^0.1.0"
+fs-extra@^9.1.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==
+ dependencies:
+ at-least-node "^1.0.0"
+ graceful-fs "^4.2.0"
+ jsonfile "^6.0.1"
+ universalify "^2.0.0"
+
fs-minipass@^1.2.7:
version "1.2.7"
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
@@ -5295,15 +6665,45 @@ fs-minipass@^1.2.7:
dependencies:
minipass "^2.6.0"
+fs-minipass@^2.0.0, fs-minipass@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+ integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
+ dependencies:
+ minipass "^3.0.0"
+
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=
-fsevents@~2.1.1:
- version "2.1.3"
- resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
- integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
+fsevents@~2.1.1:
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
+ integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
+
+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==
+
+fstream@^1.0.12:
+ version "1.0.12"
+ resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+ integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
+ dependencies:
+ graceful-fs "^4.1.2"
+ inherits "~2.0.0"
+ mkdirp ">=0.5 0"
+ rimraf "2"
+
+ftp@^0.3.10:
+ version "0.3.10"
+ resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
+ integrity sha512-faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ==
+ dependencies:
+ readable-stream "1.1.x"
+ xregexp "2.0.0"
function-bind@^1.1.1:
version "1.1.1"
@@ -5320,6 +6720,20 @@ fuzzy@^0.1.3:
resolved "https://registry.yarnpkg.com/fuzzy/-/fuzzy-0.1.3.tgz#4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"
integrity sha1-THbsL/CsGjap3M+aAN+GIweNTtg=
+gauge@^4.0.3:
+ version "4.0.4"
+ resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
+ integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+ dependencies:
+ aproba "^1.0.3 || ^2.0.0"
+ color-support "^1.1.3"
+ console-control-strings "^1.1.0"
+ has-unicode "^2.0.1"
+ signal-exit "^3.0.7"
+ string-width "^4.2.3"
+ strip-ansi "^6.0.1"
+ wide-align "^1.1.5"
+
gauge@~2.7.3:
version "2.7.4"
resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -5339,12 +6753,7 @@ gensync@^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-caller-file@^1.0.1:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
- integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
-
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -5363,26 +6772,20 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
has "^1.0.3"
has-symbols "^1.0.1"
-get-pkg-repo@^1.0.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
- integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0=
+get-pkg-repo@^4.0.0:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz#75973e1c8050c73f48190c52047c4cee3acbf385"
+ integrity sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==
dependencies:
- hosted-git-info "^2.1.4"
- meow "^3.3.0"
- normalize-package-data "^2.3.0"
- parse-github-repo-url "^1.3.0"
+ "@hutson/parse-repository-url" "^3.0.0"
+ hosted-git-info "^4.0.0"
through2 "^2.0.0"
+ yargs "^16.2.0"
-get-port@^3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
- integrity sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=
-
-get-stdin@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
- integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
+get-port@^5.1.1:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
+ integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
get-stream@^2.2.0:
version "2.3.1"
@@ -5392,10 +6795,19 @@ get-stream@^2.2.0:
object-assign "^4.0.1"
pinkie-promise "^2.0.0"
-get-stream@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
- integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+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==
+ dependencies:
+ 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==
+ dependencies:
+ pump "^3.0.0"
get-stream@^6.0.0:
version "6.0.1"
@@ -5410,6 +6822,18 @@ get-symbol-description@^1.0.0:
call-bind "^1.0.2"
get-intrinsic "^1.1.1"
+get-uri@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-3.0.2.tgz#f0ef1356faabc70e1f9404fa3b66b2ba9bfc725c"
+ integrity sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==
+ dependencies:
+ "@tootallnate/once" "1"
+ data-uri-to-buffer "3"
+ debug "4"
+ file-uri-to-path "2"
+ fs-extra "^8.1.0"
+ ftp "^0.3.10"
+
getpass@^0.1.1:
version "0.1.7"
resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -5417,16 +6841,16 @@ getpass@^0.1.1:
dependencies:
assert-plus "^1.0.0"
-git-raw-commits@^1.3.0, git-raw-commits@^1.3.6:
- version "1.3.6"
- resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.6.tgz#27c35a32a67777c1ecd412a239a6c19d71b95aff"
- integrity sha512-svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==
+git-raw-commits@^2.0.8:
+ version "2.0.11"
+ resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.11.tgz#bc3576638071d18655e1cc60d7f524920008d723"
+ integrity sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==
dependencies:
- dargs "^4.0.1"
- lodash.template "^4.0.2"
- meow "^4.0.0"
- split2 "^2.0.0"
- through2 "^2.0.0"
+ dargs "^7.0.0"
+ lodash "^4.17.15"
+ meow "^8.0.0"
+ split2 "^3.0.0"
+ through2 "^4.0.0"
git-remote-origin-url@^2.0.0:
version "2.0.0"
@@ -5436,13 +6860,28 @@ git-remote-origin-url@^2.0.0:
gitconfiglocal "^1.0.0"
pify "^2.3.0"
-git-semver-tags@^1.3.0, git-semver-tags@^1.3.6:
- version "1.3.6"
- resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.6.tgz#357ea01f7280794fe0927f2806bee6414d2caba5"
- integrity sha512-2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig==
+git-semver-tags@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-4.1.1.tgz#63191bcd809b0ec3e151ba4751c16c444e5b5780"
+ integrity sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==
dependencies:
- meow "^4.0.0"
- semver "^5.5.0"
+ meow "^8.0.0"
+ semver "^6.0.0"
+
+git-up@^4.0.0:
+ version "4.0.5"
+ resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.5.tgz#e7bb70981a37ea2fb8fe049669800a1f9a01d759"
+ integrity sha512-YUvVDg/vX3d0syBsk/CKUTib0srcQME0JyHkL5BaYdwLsiCslPWmDSi8PUMo9pXYjrryMcmsCoCgsTpSCJEQaA==
+ dependencies:
+ is-ssh "^1.3.0"
+ parse-url "^6.0.0"
+
+git-url-parse@^11.4.4:
+ version "11.6.0"
+ resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.6.0.tgz#c634b8de7faa66498a2b88932df31702c67df605"
+ integrity sha512-WWUxvJs5HsyHL6L08wOusa/IXYtMuCAhrMmnTjQPpBU0TTHyDhnOATNH3xNQz7YOQUsqIIPTGr4xiVti1Hsk5g==
+ dependencies:
+ git-up "^4.0.0"
gitconfiglocal@^1.0.0:
version "1.0.0"
@@ -5456,21 +6895,20 @@ github-from-package@0.0.0:
resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
-glob-parent@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
- integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
- dependencies:
- is-glob "^3.1.0"
- path-dirname "^1.0.0"
-
-glob-parent@^5.0.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.0:
+glob-parent@^5.0.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.0, 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==
dependencies:
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==
+ dependencies:
+ 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"
@@ -5500,7 +6938,7 @@ glob@7.1.4:
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
+glob@7.2.0, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -5512,6 +6950,51 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, gl
once "^1.3.0"
path-is-absolute "^1.0.0"
+glob@^7.1.1, glob@^7.1.6:
+ version "7.2.3"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+ integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+ dependencies:
+ fs.realpath "^1.0.0"
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "^3.1.1"
+ once "^1.3.0"
+ path-is-absolute "^1.0.0"
+
+glob@^8.0.1:
+ version "8.0.3"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
+ integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
+ dependencies:
+ fs.realpath "^1.0.0"
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "^5.0.1"
+ once "^1.3.0"
+
+global-agent@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
+ integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==
+ dependencies:
+ boolean "^3.0.1"
+ es6-error "^4.1.1"
+ matcher "^3.0.0"
+ roarr "^2.15.3"
+ semver "^7.3.2"
+ serialize-error "^7.0.1"
+
+global-tunnel-ng@^2.7.1:
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
+ integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==
+ dependencies:
+ encodeurl "^1.0.2"
+ lodash "^4.17.10"
+ npm-conf "^1.1.3"
+ tunnel "^0.0.6"
+
globals@^11.1.0:
version "11.12.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -5524,14 +7007,21 @@ globals@^12.1.0:
dependencies:
type-fest "^0.8.1"
-globals@^13.6.0, globals@^13.9.0:
- version "13.13.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b"
- integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==
+globals@^13.15.0:
+ version "13.17.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.17.0.tgz#902eb1e680a41da93945adbdcb5a9f361ba69bd4"
+ integrity sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==
dependencies:
type-fest "^0.20.2"
-globby@^11.0.3:
+globalthis@^1.0.1:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
+ integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
+ dependencies:
+ define-properties "^1.1.3"
+
+globby@^11.0.2, globby@^11.0.3, globby@^11.1.0:
version "11.1.0"
resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -5543,17 +7033,6 @@ globby@^11.0.3:
merge2 "^1.4.1"
slash "^3.0.0"
-globby@^6.1.0:
- version "6.1.0"
- resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
- integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
- dependencies:
- array-union "^1.0.1"
- glob "^7.0.3"
- object-assign "^4.0.1"
- pify "^2.0.0"
- pinkie-promise "^2.0.0"
-
globby@^7.1.1:
version "7.1.1"
resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
@@ -5566,34 +7045,61 @@ globby@^7.1.1:
pify "^3.0.0"
slash "^1.0.0"
-got@^6.7.1:
- version "6.7.1"
- resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
- integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
+got@^11.7.0:
+ version "11.8.5"
+ resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
+ integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==
+ dependencies:
+ "@sindresorhus/is" "^4.0.0"
+ "@szmarczak/http-timer" "^4.0.5"
+ "@types/cacheable-request" "^6.0.1"
+ "@types/responselike" "^1.0.0"
+ cacheable-lookup "^5.0.3"
+ cacheable-request "^7.0.2"
+ decompress-response "^6.0.0"
+ http2-wrapper "^1.0.0-beta.5.2"
+ lowercase-keys "^2.0.0"
+ p-cancelable "^2.0.0"
+ responselike "^2.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==
dependencies:
- create-error-class "^3.0.0"
+ "@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 "^3.0.0"
- is-redirect "^1.0.0"
- is-retry-allowed "^1.0.0"
- is-stream "^1.0.0"
- lowercase-keys "^1.0.0"
- safe-buffer "^5.0.1"
- timed-out "^4.0.0"
- unzip-response "^2.0.1"
- url-parse-lax "^1.0.0"
+ 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.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, 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.15, graceful-fs@^4.2.3, graceful-fs@^4.2.6:
+ version "4.2.10"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+ integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+
+grapheme-splitter@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+ integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
growl@1.10.5:
version "1.10.5"
resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
-handlebars@^4.0.2:
+handlebars@^4.7.7:
version "4.7.7"
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
@@ -5618,11 +7124,21 @@ har-validator@~5.1.3:
ajv "^6.12.3"
har-schema "^2.0.0"
+hard-rejection@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
+ integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
+
has-bigints@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+has-cors@1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+ integrity sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==
+
has-flag@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -5645,10 +7161,10 @@ has-tostringtag@^1.0.0:
dependencies:
has-symbols "^1.0.2"
-has-unicode@^2.0.0:
+has-unicode@^2.0.0, has-unicode@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
- integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+ integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
has@^1.0.3:
version "1.0.3"
@@ -5669,20 +7185,32 @@ hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
dependencies:
react-is "^16.7.0"
-hosted-git-info@^2.1.4, hosted-git-info@^2.5.0:
+hosted-git-info@^2.1.4:
version "2.8.9"
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-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==
+hosted-git-info@^4.0.0, hosted-git-info@^4.0.1:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+ integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
+ dependencies:
+ lru-cache "^6.0.0"
+
+htmlparser2@^8.0.1:
+ version "8.0.1"
+ resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010"
+ integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==
dependencies:
- domelementtype "^2.0.1"
- domhandler "^4.0.0"
- domutils "^2.5.2"
- entities "^2.0.0"
+ domelementtype "^2.3.0"
+ domhandler "^5.0.2"
+ domutils "^3.0.1"
+ entities "^4.3.0"
+
+http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
+ integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
http-errors@1.7.2:
version "1.7.2"
@@ -5717,10 +7245,23 @@ http-errors@~1.7.2:
statuses ">= 1.5.0 < 2"
toidentifier "1.0.0"
-http-https@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/http-https/-/http-https-1.0.0.tgz#2f908dd5f1db4068c058cd6e6d4ce392c913389b"
- integrity sha1-L5CN1fHbQGjAWM1ubUzjkskTOJs=
+http-proxy-agent@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
+ integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
+ dependencies:
+ "@tootallnate/once" "1"
+ agent-base "6"
+ debug "4"
+
+http-proxy-agent@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+ integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+ dependencies:
+ "@tootallnate/once" "2"
+ agent-base "6"
+ debug "4"
http-signature@~1.2.0:
version "1.2.0"
@@ -5736,6 +7277,14 @@ http-status-codes@^1.3.0:
resolved "https://registry.yarnpkg.com/http-status-codes/-/http-status-codes-1.4.0.tgz#6e4c15d16ff3a9e2df03b89f3a55e1aae05fb477"
integrity sha512-JrT3ua+WgH8zBD3HEJYbeEgnuQaAnUeRRko/YojPAJjGmIfGD3KPU/asLdsLwKjfxOmQe5nXMQ0pt/7MyapVbQ==
+http2-wrapper@^1.0.0-beta.5.2:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
+ integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
+ dependencies:
+ quick-lru "^5.1.1"
+ resolve-alpn "^1.0.0"
+
https-proxy-agent@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b"
@@ -5757,7 +7306,14 @@ human-signals@^2.1.0:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
-iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24:
+humanize-ms@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+ integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
+ dependencies:
+ ms "^2.0.0"
+
+iconv-lite@0.4.24, 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==
@@ -5791,6 +7347,18 @@ ignore-loader@^0.1.2:
resolved "https://registry.yarnpkg.com/ignore-loader/-/ignore-loader-0.1.2.tgz#d81f240376d0ba4f0d778972c3ad25874117a463"
integrity sha1-2B8kA3bQuk8Nd4lyw60lh0EXpGM=
+ignore-styles@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/ignore-styles/-/ignore-styles-5.0.1.tgz#b49ef2274bdafcd8a4880a966bfe38d1a0bf4671"
+ integrity sha512-gQQmIznCETPLEzfg1UH4Cs2oRq+HBPl8quroEUNXT8oybEG7/0lqI3dGgDSRry6B9HcCXw3PVkFFS0FF3CMddg==
+
+ignore-walk@^3.0.3:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
+ integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
+ dependencies:
+ minimatch "^3.0.4"
+
ignore@^3.3.5:
version "3.3.10"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
@@ -5801,7 +7369,7 @@ ignore@^4.0.6:
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-ignore@^5.1.8, ignore@^5.2.0:
+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==
@@ -5832,23 +7400,16 @@ imurmurhash@^0.1.4:
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
-indent-string@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
- integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
- dependencies:
- repeating "^2.0.0"
-
-indent-string@^3.0.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
- integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
-
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==
+infer-owner@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+ integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
inflight@^1.0.4:
version "1.0.6"
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -5857,7 +7418,7 @@ inflight@^1.0.4:
once "^1.3.0"
wrappy "1"
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, 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==
@@ -5867,32 +7428,25 @@ inherits@2.0.3:
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-ini@^1.3.2, ini@~1.3.0:
+ini@^1.3.2, ini@^1.3.4, 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==
-inquirer@^3.2.2:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
- integrity sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==
+init-package-json@^2.0.2:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-2.0.5.tgz#78b85f3c36014db42d8f32117252504f68022646"
+ integrity sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==
dependencies:
- ansi-escapes "^3.0.0"
- chalk "^2.0.0"
- cli-cursor "^2.1.0"
- cli-width "^2.0.0"
- external-editor "^2.0.4"
- figures "^2.0.0"
- lodash "^4.3.0"
- mute-stream "0.0.7"
- run-async "^2.2.0"
- rx-lite "^4.0.8"
- rx-lite-aggregates "^4.0.8"
- string-width "^2.1.0"
- strip-ansi "^4.0.0"
- through "^2.3.6"
+ npm-package-arg "^8.1.5"
+ promzard "^0.3.0"
+ read "~1.0.1"
+ read-package-json "^4.1.1"
+ semver "^7.3.5"
+ validate-npm-package-license "^3.0.4"
+ validate-npm-package-name "^3.0.0"
-inquirer@^7.0.0:
+inquirer@^7.0.0, inquirer@^7.3.3:
version "7.3.3"
resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
@@ -5925,15 +7479,15 @@ interpret@^2.2.0:
resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
-inversify@5.1.1, inversify@^5.0.1, inversify@^5.1.1:
+inversify@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/inversify/-/inversify-5.1.1.tgz#6fbd668c591337404e005a1946bfe0d802c08730"
integrity sha512-j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ==
-invert-kv@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
- integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
+ip@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
+ integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
ipaddr.js@1.9.1:
version "1.9.1"
@@ -5977,14 +7531,21 @@ is-callable@^1.1.4, is-callable@^1.2.4:
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
-is-ci@^1.0.10:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
- integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
+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==
+ dependencies:
+ ci-info "^2.0.0"
+
+is-core-module@^2.5.0, is-core-module@^2.9.0:
+ version "2.10.0"
+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
+ integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
dependencies:
- ci-info "^1.5.0"
+ has "^1.0.3"
-is-core-module@^2.2.0, is-core-module@^2.8.0, is-core-module@^2.8.1:
+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==
@@ -6003,16 +7564,11 @@ is-electron@^2.1.0, is-electron@^2.2.0:
resolved "https://registry.yarnpkg.com/is-electron/-/is-electron-2.2.1.tgz#751b1dd8a74907422faa5c35aaa0cf66d98086e9"
integrity sha512-r8EEQQsqT+Gn0aXFx7lTFygYQhILLCB+wn0WCDL5LZRINeLH/Rvw1j2oKodELLXYNImQ3CRlVsY8wW4cGOsyuw==
-is-extglob@^2.1.0, is-extglob@^2.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-finite@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
- integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
-
is-fullwidth-code-point@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
@@ -6030,13 +7586,6 @@ is-fullwidth-code-point@^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-glob@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
- integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
- dependencies:
- is-extglob "^2.1.0"
-
is-glob@^4.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"
@@ -6044,6 +7593,16 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
dependencies:
is-extglob "^2.1.1"
+is-interactive@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+ integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
+
+is-lambda@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
+ integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
+
is-natural-number@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
@@ -6066,10 +7625,10 @@ is-number@^7.0.0:
resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-is-obj@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
- integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+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-path-inside@^3.0.2:
version "3.0.3"
@@ -6081,6 +7640,11 @@ is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+is-plain-obj@^2.0.0, is-plain-obj@^2.1.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-object@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -6088,6 +7652,11 @@ is-plain-object@^2.0.4:
dependencies:
isobject "^3.0.1"
+is-plain-object@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+ integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
is-redirect@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
@@ -6101,17 +7670,19 @@ is-regex@^1.1.4:
call-bind "^1.0.2"
has-tostringtag "^1.0.0"
-is-retry-allowed@^1.0.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
- integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
-
is-shared-array-buffer@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
-is-stream@^1.0.0, is-stream@^1.1.0:
+is-ssh@^1.3.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.4.0.tgz#4f8220601d2839d8fa624b3106f8e8884f01b8b2"
+ integrity sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==
+ dependencies:
+ protocols "^2.0.1"
+
+is-stream@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
@@ -6128,11 +7699,6 @@ is-string@^1.0.5, is-string@^1.0.7:
dependencies:
has-tostringtag "^1.0.0"
-is-subset@^0.1.1:
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
- integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
-
is-symbol@^1.0.2, is-symbol@^1.0.3:
version "1.0.4"
resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
@@ -6140,22 +7706,22 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
dependencies:
has-symbols "^1.0.2"
-is-text-path@^1.0.0:
+is-text-path@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
- integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=
+ integrity sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==
dependencies:
text-extensions "^1.0.0"
-is-typedarray@~1.0.0:
+is-typedarray@^1.0.0, 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-utf8@^0.2.0:
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
- integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
+is-unicode-supported@^0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+ integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
is-weakref@^1.0.1:
version "1.0.2"
@@ -6189,6 +7755,11 @@ isobject@^3.0.1:
resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+isomorphic-ws@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc"
+ integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==
+
isstream@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -6216,6 +7787,13 @@ js-yaml@3.13.1:
argparse "^1.0.7"
esprima "^4.0.0"
+js-yaml@4.1.0, js-yaml@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+ integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+ dependencies:
+ argparse "^2.0.1"
+
js-yaml@^3.13.1:
version "3.14.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
@@ -6244,11 +7822,26 @@ jsesc@~0.5.0:
resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+json-buffer@3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+ integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==
+
+json-buffer@3.0.1, json-buffer@~3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+ integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
json-parse-better-errors@^1.0.1, 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-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-schema-ref-parser@7.1.3:
version "7.1.3"
resolved "https://registry.yarnpkg.com/json-schema-ref-parser/-/json-schema-ref-parser-7.1.3.tgz#21468cd180b2f1939ce93fe291f743b441e97d49"
@@ -6309,7 +7902,16 @@ jsonfile@^4.0.0:
optionalDependencies:
graceful-fs "^4.1.6"
-jsonparse@^1.2.0:
+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==
+ dependencies:
+ universalify "^2.0.0"
+ optionalDependencies:
+ graceful-fs "^4.1.6"
+
+jsonparse@^1.2.0, jsonparse@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
@@ -6324,13 +7926,10 @@ jsprim@^1.2.2:
json-schema "0.4.0"
verror "1.10.0"
-"jsx-ast-utils@^2.4.1 || ^3.0.0":
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
- integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==
- dependencies:
- array-includes "^3.1.3"
- object.assign "^4.1.2"
+just-extend@^4.0.2:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744"
+ integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==
keytar@7.2.0:
version "7.2.0"
@@ -6340,62 +7939,49 @@ keytar@7.2.0:
node-addon-api "^3.0.0"
prebuild-install "^6.0.0"
-kind-of@^6.0.2:
+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==
+ dependencies:
+ json-buffer "3.0.0"
+
+keyv@^4.0.0:
+ version "4.4.1"
+ resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.4.1.tgz#5d97bae8dfbb6788ebc9330daf5eb6582e2d3d1c"
+ integrity sha512-PzByhNxfBLnSBW2MZi1DF+W5+qB/7BMpOokewqIvqS8GFtP7xHm2oeGU72Y1fhtfOv/FiEnI4+nyViYDmUChnw==
+ dependencies:
+ compress-brotli "^1.3.8"
+ json-buffer "3.0.1"
+
+kind-of@^6.0.2, kind-of@^6.0.3:
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==
-lcid@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
- integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
- dependencies:
- invert-kv "^1.0.0"
-
-lerna@^2.11.0:
- version "2.11.0"
- resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.11.0.tgz#89b5681e286d388dda5bbbdbbf6b84c8094eff65"
- integrity sha512-kgM6zwe2P2tR30MYvgiLLW+9buFCm6E7o8HnRlhTgm70WVBvXVhydqv+q/MF2HrVZkCawfVtCfetyQmtd4oHhQ==
- dependencies:
- async "^1.5.0"
- chalk "^2.1.0"
- cmd-shim "^2.0.2"
- columnify "^1.5.4"
- command-join "^2.0.0"
- conventional-changelog-cli "^1.3.13"
- conventional-recommended-bump "^1.2.1"
- dedent "^0.7.0"
- execa "^0.8.0"
- find-up "^2.1.0"
- fs-extra "^4.0.1"
- get-port "^3.2.0"
- glob "^7.1.2"
- glob-parent "^3.1.0"
- globby "^6.1.0"
- graceful-fs "^4.1.11"
- hosted-git-info "^2.5.0"
- inquirer "^3.2.2"
- is-ci "^1.0.10"
- load-json-file "^4.0.0"
- lodash "^4.17.4"
- minimatch "^3.0.4"
+lerna@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/lerna/-/lerna-4.0.0.tgz#b139d685d50ea0ca1be87713a7c2f44a5b678e9e"
+ integrity sha512-DD/i1znurfOmNJb0OBw66NmNqiM8kF6uIrzrJ0wGE3VNdzeOhz9ziWLYiRaZDGGwgbcjOo6eIfcx9O5Qynz+kg==
+ dependencies:
+ "@lerna/add" "4.0.0"
+ "@lerna/bootstrap" "4.0.0"
+ "@lerna/changed" "4.0.0"
+ "@lerna/clean" "4.0.0"
+ "@lerna/cli" "4.0.0"
+ "@lerna/create" "4.0.0"
+ "@lerna/diff" "4.0.0"
+ "@lerna/exec" "4.0.0"
+ "@lerna/import" "4.0.0"
+ "@lerna/info" "4.0.0"
+ "@lerna/init" "4.0.0"
+ "@lerna/link" "4.0.0"
+ "@lerna/list" "4.0.0"
+ "@lerna/publish" "4.0.0"
+ "@lerna/run" "4.0.0"
+ "@lerna/version" "4.0.0"
+ import-local "^3.0.2"
npmlog "^4.1.2"
- p-finally "^1.0.0"
- package-json "^4.0.1"
- path-exists "^3.0.0"
- read-cmd-shim "^1.0.1"
- read-pkg "^3.0.0"
- rimraf "^2.6.1"
- safe-buffer "^5.1.1"
- semver "^5.4.1"
- signal-exit "^3.0.2"
- slash "^1.0.0"
- strong-log-transformer "^1.0.6"
- temp-write "^3.3.0"
- write-file-atomic "^2.3.0"
- write-json-file "^2.2.0"
- write-pkg "^3.1.0"
- yargs "^8.0.2"
less@^3.0.3:
version "3.13.1"
@@ -6434,6 +8020,27 @@ levn@^0.4.1:
prelude-ls "^1.2.1"
type-check "~0.4.0"
+libnpmaccess@^4.0.1:
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-4.0.3.tgz#dfb0e5b0a53c315a2610d300e46b4ddeb66e7eec"
+ integrity sha512-sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ==
+ dependencies:
+ aproba "^2.0.0"
+ minipass "^3.1.1"
+ npm-package-arg "^8.1.2"
+ npm-registry-fetch "^11.0.0"
+
+libnpmpublish@^4.0.0:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-4.0.2.tgz#be77e8bf5956131bcb45e3caa6b96a842dec0794"
+ integrity sha512-+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw==
+ dependencies:
+ normalize-package-data "^3.0.2"
+ npm-package-arg "^8.1.2"
+ npm-registry-fetch "^11.0.0"
+ semver "^7.1.3"
+ ssri "^8.0.1"
+
line-height@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/line-height/-/line-height-0.3.1.tgz#4b1205edde182872a5efa3c8f620b3187a9c54c9"
@@ -6441,6 +8048,11 @@ line-height@^0.3.1:
dependencies:
computed-style "~0.1.3"
+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==
+
linkify-it@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
@@ -6448,26 +8060,17 @@ linkify-it@^2.0.0:
dependencies:
uc.micro "^1.0.1"
-load-json-file@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
- integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
+linkify-it@^3.0.1:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
+ integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
dependencies:
- graceful-fs "^4.1.2"
- parse-json "^2.2.0"
- pify "^2.0.0"
- pinkie-promise "^2.0.0"
- strip-bom "^2.0.0"
+ uc.micro "^1.0.1"
-load-json-file@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
- integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
- dependencies:
- graceful-fs "^4.1.2"
- parse-json "^2.2.0"
- pify "^2.0.0"
- strip-bom "^3.0.0"
+listenercount@~1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937"
+ integrity sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==
load-json-file@^4.0.0:
version "4.0.0"
@@ -6479,12 +8082,22 @@ load-json-file@^4.0.0:
pify "^3.0.0"
strip-bom "^3.0.0"
+load-json-file@^6.2.0:
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-6.2.0.tgz#5c7770b42cafa97074ca2848707c61662f4251a1"
+ integrity sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==
+ dependencies:
+ graceful-fs "^4.1.15"
+ parse-json "^5.0.0"
+ strip-bom "^4.0.0"
+ type-fest "^0.6.0"
+
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-utils@^1.0.2, loader-utils@^1.0.3, loader-utils@^1.4.0:
+loader-utils@^1.0.3, loader-utils@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
@@ -6525,16 +8138,18 @@ locate-path@^5.0.0:
dependencies:
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==
+ dependencies:
+ p-locate "^5.0.0"
+
lodash._reinterpolate@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
-lodash.assign@^4.2.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
- integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
-
lodash.clonedeep@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
@@ -6545,12 +8160,22 @@ lodash.debounce@^4.0.8:
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+lodash.get@^4.4.2:
+ version "4.4.2"
+ resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+ integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
+
+lodash.ismatch@^4.4.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
+ integrity sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==
+
lodash.merge@^4.6.2:
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.template@^4.0.2:
+lodash.template@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
@@ -6570,12 +8195,7 @@ lodash.throttle@^4.1.1:
resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
-lodash.truncate@^4.4.2:
- version "4.4.2"
- resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
- integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
-
-lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0:
+lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.7.0:
version "4.17.21"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -6587,27 +8207,20 @@ log-symbols@3.0.0:
dependencies:
chalk "^2.4.2"
-log-symbols@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
- integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+log-symbols@4.1.0, log-symbols@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+ integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
dependencies:
- chalk "^2.0.1"
+ chalk "^4.1.0"
+ is-unicode-supported "^0.1.0"
loose-envify@^1.1.0, 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==
dependencies:
- js-tokens "^3.0.0 || ^4.0.0"
-
-loud-rejection@^1.0.0:
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
- integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
- dependencies:
- currently-unhandled "^0.4.1"
- signal-exit "^3.0.0"
+ js-tokens "^3.0.0 || ^4.0.0"
loupe@^2.3.1:
version "2.3.4"
@@ -6616,12 +8229,17 @@ loupe@^2.3.1:
dependencies:
get-func-name "^2.0.0"
-lowercase-keys@^1.0.0:
+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==
-lru-cache@^4.0.0, lru-cache@^4.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==
+
+lru-cache@^4.0.0:
version "4.1.5"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -6643,6 +8261,25 @@ lru-cache@^6.0.0:
dependencies:
yallist "^4.0.0"
+lru-cache@^7.7.1:
+ version "7.14.0"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f"
+ integrity sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ==
+
+luxon@^2.4.0:
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/luxon/-/luxon-2.5.0.tgz#098090f67d690b247e83c090267a60b1aa8ea96c"
+ integrity sha512-IDkEPB80Rb6gCAU+FEib0t4FeJ4uVOuX1CQ9GsvU3O+JAGIgu0J7sf1OarXKaKDygTZIoJyU6YdZzTFRu+YR0A==
+
+lzma-native@^8.0.5:
+ version "8.0.6"
+ resolved "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.6.tgz#3ea456209d643bafd9b5d911781bdf0b396b2665"
+ integrity sha512-09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA==
+ dependencies:
+ node-addon-api "^3.1.0"
+ node-gyp-build "^4.2.1"
+ readable-stream "^3.6.0"
+
macaddress@^0.2.9:
version "0.2.9"
resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.9.tgz#3579b8b9acd5b96b4553abf0f394185a86813cb3"
@@ -6670,15 +8307,85 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
dependencies:
semver "^6.0.0"
-map-obj@^1.0.0, map-obj@^1.0.1:
+make-error@^1.1.1:
+ version "1.3.6"
+ resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+ integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
+make-fetch-happen@^10.0.3:
+ version "10.2.1"
+ resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
+ integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
+ dependencies:
+ agentkeepalive "^4.2.1"
+ cacache "^16.1.0"
+ http-cache-semantics "^4.1.0"
+ http-proxy-agent "^5.0.0"
+ https-proxy-agent "^5.0.0"
+ is-lambda "^1.0.1"
+ lru-cache "^7.7.1"
+ minipass "^3.1.6"
+ minipass-collect "^1.0.2"
+ minipass-fetch "^2.0.3"
+ minipass-flush "^1.0.5"
+ minipass-pipeline "^1.2.4"
+ negotiator "^0.6.3"
+ promise-retry "^2.0.1"
+ socks-proxy-agent "^7.0.0"
+ ssri "^9.0.0"
+
+make-fetch-happen@^8.0.9:
+ version "8.0.14"
+ resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz#aaba73ae0ab5586ad8eaa68bd83332669393e222"
+ integrity sha512-EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ==
+ dependencies:
+ agentkeepalive "^4.1.3"
+ cacache "^15.0.5"
+ http-cache-semantics "^4.1.0"
+ http-proxy-agent "^4.0.1"
+ https-proxy-agent "^5.0.0"
+ is-lambda "^1.0.1"
+ lru-cache "^6.0.0"
+ minipass "^3.1.3"
+ minipass-collect "^1.0.2"
+ minipass-fetch "^1.3.2"
+ minipass-flush "^1.0.5"
+ minipass-pipeline "^1.2.4"
+ promise-retry "^2.0.1"
+ socks-proxy-agent "^5.0.0"
+ ssri "^8.0.0"
+
+make-fetch-happen@^9.0.1:
+ version "9.1.0"
+ resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
+ integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
+ dependencies:
+ agentkeepalive "^4.1.3"
+ cacache "^15.2.0"
+ http-cache-semantics "^4.1.0"
+ http-proxy-agent "^4.0.1"
+ https-proxy-agent "^5.0.0"
+ is-lambda "^1.0.1"
+ lru-cache "^6.0.0"
+ minipass "^3.1.3"
+ minipass-collect "^1.0.2"
+ minipass-fetch "^1.3.2"
+ minipass-flush "^1.0.5"
+ minipass-pipeline "^1.2.4"
+ negotiator "^0.6.2"
+ promise-retry "^2.0.1"
+ socks-proxy-agent "^6.0.0"
+ ssri "^8.0.0"
+
+map-obj@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
-map-obj@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
- integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
+map-obj@^4.0.0:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
+ integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
map-stream@~0.1.0:
version "0.1.0"
@@ -6696,17 +8403,24 @@ markdown-it@^10.0.0:
mdurl "^1.0.1"
uc.micro "^1.0.5"
-markdown-it@^8.4.0:
- version "8.4.2"
- resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
- integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==
+markdown-it@^12.3.2:
+ version "12.3.2"
+ resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
+ integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
dependencies:
- argparse "^1.0.7"
- entities "~1.1.1"
- linkify-it "^2.0.0"
+ argparse "^2.0.1"
+ entities "~2.1.0"
+ linkify-it "^3.0.1"
mdurl "^1.0.1"
uc.micro "^1.0.5"
+matcher@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
+ integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==
+ dependencies:
+ escape-string-regexp "^4.0.0"
+
mdurl@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
@@ -6717,43 +8431,22 @@ media-typer@0.3.0:
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-mem@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
- integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
- dependencies:
- mimic-fn "^1.0.0"
-
-meow@^3.3.0:
- version "3.7.0"
- resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
- integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
- dependencies:
- camelcase-keys "^2.0.0"
- decamelize "^1.1.2"
- loud-rejection "^1.0.0"
- map-obj "^1.0.1"
- minimist "^1.1.3"
- normalize-package-data "^2.3.4"
- object-assign "^4.0.1"
- read-pkg-up "^1.0.1"
- redent "^1.0.0"
- trim-newlines "^1.0.0"
-
-meow@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975"
- integrity sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==
- dependencies:
- camelcase-keys "^4.0.0"
- decamelize-keys "^1.0.0"
- loud-rejection "^1.0.0"
- minimist "^1.1.3"
- minimist-options "^3.0.1"
- normalize-package-data "^2.3.4"
- read-pkg-up "^3.0.0"
- redent "^2.0.0"
- trim-newlines "^2.0.0"
+meow@^8.0.0:
+ version "8.1.2"
+ resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897"
+ integrity sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==
+ dependencies:
+ "@types/minimist" "^1.2.0"
+ camelcase-keys "^6.2.2"
+ decamelize-keys "^1.1.0"
+ hard-rejection "^2.1.0"
+ minimist-options "4.1.0"
+ normalize-package-data "^3.0.0"
+ read-pkg-up "^7.0.1"
+ redent "^3.0.0"
+ trim-newlines "^3.0.0"
+ type-fest "^0.18.0"
+ yargs-parser "^20.2.3"
merge-descriptors@1.0.1:
version "1.0.1"
@@ -6805,21 +8498,31 @@ mime@^2.0.3, mime@^2.4.4:
resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
-mimic-fn@^1.0.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
- integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
-
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-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@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43"
integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==
+mimic-response@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
+ integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
+
+min-indent@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+ integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
+
minimatch@3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -6827,31 +8530,104 @@ minimatch@3.0.4:
dependencies:
brace-expansion "^1.1.7"
-minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.1.2:
+minimatch@4.2.1:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.1.tgz#40d9d511a46bdc4e563c22c3080cde9c0d8299b4"
+ integrity sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==
+ dependencies:
+ brace-expansion "^1.1.7"
+
+minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
dependencies:
brace-expansion "^1.1.7"
-minimist-options@^3.0.1:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
- integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==
+minimatch@^5.0.1:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
+ integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
+ dependencies:
+ brace-expansion "^2.0.1"
+
+minimist-options@4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
+ integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
dependencies:
arrify "^1.0.1"
is-plain-obj "^1.1.0"
+ kind-of "^6.0.3"
-minimist@^0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
- integrity sha1-md9lelJXTCHJBXSX33QnkLK0wN4=
-
-minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
+minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+minimist@^1.2.6:
+ version "1.2.6"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+ integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+
+minipass-collect@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+ integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
+ dependencies:
+ minipass "^3.0.0"
+
+minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
+ integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
+ dependencies:
+ minipass "^3.1.0"
+ minipass-sized "^1.0.3"
+ minizlib "^2.0.0"
+ optionalDependencies:
+ encoding "^0.1.12"
+
+minipass-fetch@^2.0.3:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
+ integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==
+ dependencies:
+ minipass "^3.1.6"
+ minipass-sized "^1.0.3"
+ minizlib "^2.1.2"
+ optionalDependencies:
+ encoding "^0.1.13"
+
+minipass-flush@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+ integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+ dependencies:
+ minipass "^3.0.0"
+
+minipass-json-stream@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7"
+ integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==
+ dependencies:
+ jsonparse "^1.3.1"
+ minipass "^3.0.0"
+
+minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+ integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
+ dependencies:
+ minipass "^3.0.0"
+
+minipass-sized@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
+ integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
+ dependencies:
+ minipass "^3.0.0"
+
minipass@^2.6.0, minipass@^2.9.0:
version "2.9.0"
resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
@@ -6860,6 +8636,13 @@ minipass@^2.6.0, minipass@^2.9.0:
safe-buffer "^5.1.2"
yallist "^3.0.0"
+minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6:
+ version "3.3.4"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
+ integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
+ dependencies:
+ yallist "^4.0.0"
+
minizlib@^1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
@@ -6867,23 +8650,56 @@ minizlib@^1.3.3:
dependencies:
minipass "^2.9.0"
+minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+ integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+ dependencies:
+ minipass "^3.0.0"
+ yallist "^4.0.0"
+
mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
version "0.5.3"
resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
-mkdirp@0.5.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.0:
+mkdirp-infer-owner@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
+ integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==
+ dependencies:
+ chownr "^2.0.0"
+ infer-owner "^1.0.4"
+ mkdirp "^1.0.3"
+
+mkdirp@0.5.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.4, 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==
dependencies:
minimist "^1.2.5"
-mkdirp@^1.0.4:
+"mkdirp@>=0.5 0":
+ version "0.5.6"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+ integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
+ dependencies:
+ minimist "^1.2.6"
+
+mkdirp@^1.0.3, mkdirp@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+mocha-jenkins-reporter@^0.4.7:
+ version "0.4.7"
+ resolved "https://registry.yarnpkg.com/mocha-jenkins-reporter/-/mocha-jenkins-reporter-0.4.7.tgz#59505d59a9fdeb64ee8270f13d8ca6c48c1dfad7"
+ integrity sha512-ek05WBoGX9G5B29QmFw67H92ZcvZcp62RASaHWqiZOWjc/G2YlKBeu7t60J5wpaQP1rFS8T9S85ed/3iDdf/2A==
+ dependencies:
+ diff "4.0.1"
+ mkdirp "^0.5.4"
+ xml "^1.0.1"
+
mocha@^7.0.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.2.0.tgz#01cc227b00d875ab1eed03a75106689cfed5a604"
@@ -6914,21 +8730,41 @@ mocha@^7.0.0:
yargs-parser "13.1.2"
yargs-unparser "1.6.0"
+mocha@^9.1.3:
+ version "9.2.2"
+ resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.2.tgz#d70db46bdb93ca57402c809333e5a84977a88fb9"
+ integrity sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==
+ dependencies:
+ "@ungap/promise-all-settled" "1.1.2"
+ ansi-colors "4.1.1"
+ browser-stdout "1.3.1"
+ chokidar "3.5.3"
+ debug "4.3.3"
+ diff "5.0.0"
+ escape-string-regexp "4.0.0"
+ find-up "5.0.0"
+ glob "7.2.0"
+ growl "1.10.5"
+ he "1.2.0"
+ js-yaml "4.1.0"
+ log-symbols "4.1.0"
+ minimatch "4.2.1"
+ ms "2.1.3"
+ nanoid "3.3.1"
+ serialize-javascript "6.0.0"
+ strip-json-comments "3.1.1"
+ supports-color "8.1.1"
+ which "2.0.2"
+ workerpool "6.2.0"
+ yargs "16.2.0"
+ yargs-parser "20.2.4"
+ yargs-unparser "2.0.0"
+
modify-values@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
-moment@2.24.0:
- version "2.24.0"
- resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
- integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
-
-moment@^2.6.0:
- version "2.29.1"
- resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
- integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
-
mount-point@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/mount-point/-/mount-point-3.0.0.tgz#665cb9edebe80d110e658db56c31d0aef51a8f97"
@@ -6962,29 +8798,34 @@ ms@2.1.2:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-ms@2.1.3, ms@^2.1.1:
+ms@2.1.3, ms@^2.0.0, 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==
-multer@^1.4.2:
- version "1.4.4"
- resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.4.tgz#e2bc6cac0df57a8832b858d7418ccaa8ebaf7d8c"
- integrity sha512-2wY2+xD4udX612aMqMcB8Ws2Voq6NIUPEtD1be6m411T4uDH/VtL9i//xvcyFlTVfRdaBsk7hV5tgrGQqhuBiw==
+multer@1.4.4-lts.1:
+ version "1.4.4-lts.1"
+ resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.4-lts.1.tgz#24100f701a4611211cfae94ae16ea39bb314e04d"
+ integrity sha512-WeSGziVj6+Z2/MwQo3GvqzgR+9Uc+qt8SwHKh3gvNPiISKfsMfG4SvCOFYlxxgkXt7yIV2i1yczehm0EOKIxIg==
dependencies:
append-field "^1.0.0"
- busboy "^0.2.11"
+ busboy "^1.0.0"
concat-stream "^1.5.2"
mkdirp "^0.5.4"
object-assign "^4.1.1"
- on-finished "^2.3.0"
type-is "^1.6.4"
xtend "^4.0.0"
-mute-stream@0.0.7:
- version "0.0.7"
- resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
- integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+multimatch@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-5.0.0.tgz#932b800963cea7a31a033328fa1e0c3a1874dbe6"
+ integrity sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==
+ dependencies:
+ "@types/minimatch" "^3.0.3"
+ array-differ "^3.0.0"
+ array-union "^2.1.0"
+ arrify "^2.0.1"
+ minimatch "^3.0.4"
mute-stream@0.0.8, mute-stream@~0.0.4:
version "0.0.8"
@@ -6996,7 +8837,18 @@ nan@^2.14.0:
resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
-nanoid@^3.3.1:
+nano@^9.0.5:
+ version "9.0.5"
+ resolved "https://registry.yarnpkg.com/nano/-/nano-9.0.5.tgz#2b767819f612907a3ac09b21f2929d4097407262"
+ integrity sha512-fEAhwAdXh4hDDnC8cYJtW6D8ivOmpvFAqT90+zEuQREpRkzA/mJPcI4EKv15JUdajaqiLTXNoKK6PaRF+/06DQ==
+ dependencies:
+ "@types/tough-cookie" "^4.0.0"
+ axios "^0.21.1"
+ axios-cookiejar-support "^1.0.1"
+ qs "^6.9.4"
+ tough-cookie "^4.0.0"
+
+nanoid@3.3.1, nanoid@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35"
integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==
@@ -7016,7 +8868,7 @@ natural-compare@^1.4.0:
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
-negotiator@0.6.3:
+negotiator@0.6.3, negotiator@^0.6.2, 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==
@@ -7036,7 +8888,25 @@ nice-try@^1.0.4:
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-node-abi@^2.11.0, node-abi@^2.21.0, node-abi@^2.7.0:
+nise@^5.1.0:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/nise/-/nise-5.1.1.tgz#ac4237e0d785ecfcb83e20f389185975da5c31f3"
+ integrity sha512-yr5kW2THW1AkxVmCnKEh4nbYkJdB3I7LUkiUgOvEkOp414mc2UMaHMA7pjq1nYowhdoJZGwEKGaQVbxfpWj10A==
+ dependencies:
+ "@sinonjs/commons" "^1.8.3"
+ "@sinonjs/fake-timers" ">=5"
+ "@sinonjs/text-encoding" "^0.7.1"
+ just-extend "^4.0.2"
+ path-to-regexp "^1.7.0"
+
+node-abi@*, node-abi@^3.0.0:
+ version "3.24.0"
+ resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.24.0.tgz#b9d03393a49f2c7e147d0c99f180e680c27c1599"
+ integrity sha512-YPG3Co0luSu6GwOBsmIdGW6Wx0NyNDLg/hriIyDllVsNwnI6UeqaWShxC3lbH4LtEQUgoLP3XR1ndXiDAWvmRw==
+ dependencies:
+ semver "^7.3.5"
+
+node-abi@^2.21.0, node-abi@^2.7.0:
version "2.30.1"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf"
integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==
@@ -7048,11 +8918,18 @@ node-addon-api@*:
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
-node-addon-api@^3.0.0:
+node-addon-api@^3.0.0, node-addon-api@^3.0.2, node-addon-api@^3.1.0:
version "3.2.1"
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
+node-api-version@^0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz#1ed46a485e462d55d66b5aa1fe2821720dedf080"
+ integrity sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g==
+ dependencies:
+ semver "^7.3.5"
+
node-environment-flags@1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
@@ -7061,22 +8938,22 @@ node-environment-flags@1.0.6:
object.getownpropertydescriptors "^2.0.3"
semver "^5.7.0"
-node-fetch@2.6.1:
- version "2.6.1"
- resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
- integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
-
-node-fetch@^2.6.0:
+node-fetch@^2.6.1, 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==
dependencies:
whatwg-url "^5.0.0"
-node-gyp@^6.0.1:
- version "6.1.0"
- resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-6.1.0.tgz#64e31c61a4695ad304c1d5b82cf6b7c79cc79f3f"
- integrity sha512-h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw==
+node-gyp-build@^4.2.1:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40"
+ integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==
+
+node-gyp@^5.0.2:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.1.tgz#eb915f7b631c937d282e33aed44cb7a025f62a3e"
+ integrity sha512-WH0WKGi+a4i4DUt2mHnvocex/xPLp9pYt5R6M2JdFB7pJ7Z34hveZ4nDTGTiLXCkitA9T8HFZjhinBCiVHYcWw==
dependencies:
env-paths "^2.2.0"
glob "^7.1.4"
@@ -7090,6 +8967,45 @@ node-gyp@^6.0.1:
tar "^4.4.12"
which "^1.3.1"
+node-gyp@^7.1.0:
+ version "7.1.2"
+ resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
+ integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
+ dependencies:
+ env-paths "^2.2.0"
+ glob "^7.1.4"
+ graceful-fs "^4.2.3"
+ nopt "^5.0.0"
+ npmlog "^4.1.2"
+ request "^2.88.2"
+ rimraf "^3.0.2"
+ semver "^7.3.2"
+ tar "^6.0.2"
+ which "^2.0.2"
+
+node-gyp@^9.0.0:
+ version "9.1.0"
+ resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz#c8d8e590678ea1f7b8097511dedf41fc126648f8"
+ integrity sha512-HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g==
+ dependencies:
+ env-paths "^2.2.0"
+ glob "^7.1.4"
+ graceful-fs "^4.2.6"
+ make-fetch-happen "^10.0.3"
+ nopt "^5.0.0"
+ npmlog "^6.0.0"
+ rimraf "^3.0.2"
+ semver "^7.3.5"
+ tar "^6.1.2"
+ which "^2.0.2"
+
+node-pty@0.11.0-beta17:
+ version "0.11.0-beta17"
+ resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.11.0-beta17.tgz#7df6a60dced6bf7a3a282b65cf51980c68954af6"
+ integrity sha512-JALo4LgYKmzmmXI23CIfS6DpCuno647YJpNg3RT6jCKTHWrt+RHeB6JAlb/pJG9dFNSeaiIAWD+0waEg2AzlfA==
+ dependencies:
+ nan "^2.14.0"
+
node-releases@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
@@ -7116,7 +9032,14 @@ nopt@^4.0.1:
abbrev "1"
osenv "^0.1.4"
-normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
+nopt@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
+ integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
+ dependencies:
+ abbrev "1"
+
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -7126,11 +9049,127 @@ normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-
semver "2 || 3 || 4 || 5"
validate-npm-package-license "^3.0.1"
+normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+ integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
+ dependencies:
+ hosted-git-info "^4.0.1"
+ is-core-module "^2.5.0"
+ semver "^7.3.4"
+ validate-npm-package-license "^3.0.1"
+
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-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@^6.0.1, normalize-url@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
+ integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
+
+npm-bundled@^1.1.1:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
+ integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
+ dependencies:
+ npm-normalize-package-bin "^1.0.1"
+
+npm-conf@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
+ integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==
+ dependencies:
+ config-chain "^1.1.11"
+ pify "^3.0.0"
+
+npm-install-checks@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
+ integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
+ dependencies:
+ semver "^7.1.1"
+
+npm-lifecycle@^3.1.5:
+ version "3.1.5"
+ resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-3.1.5.tgz#9882d3642b8c82c815782a12e6a1bfeed0026309"
+ integrity sha512-lDLVkjfZmvmfvpvBzA4vzee9cn+Me4orq0QF8glbswJVEbIcSNWib7qGOffolysc3teCqbbPZZkzbr3GQZTL1g==
+ dependencies:
+ byline "^5.0.0"
+ graceful-fs "^4.1.15"
+ node-gyp "^5.0.2"
+ resolve-from "^4.0.0"
+ slide "^1.1.6"
+ uid-number "0.0.6"
+ umask "^1.1.0"
+ which "^1.3.1"
+
+npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+ integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+
+npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5:
+ version "8.1.5"
+ resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
+ integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
+ dependencies:
+ hosted-git-info "^4.0.1"
+ semver "^7.3.4"
+ validate-npm-package-name "^3.0.0"
+
+npm-packlist@^2.1.4:
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8"
+ integrity sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==
+ dependencies:
+ glob "^7.1.6"
+ ignore-walk "^3.0.3"
+ npm-bundled "^1.1.1"
+ npm-normalize-package-bin "^1.0.1"
+
+npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.1:
+ version "6.1.1"
+ resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
+ integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
+ dependencies:
+ npm-install-checks "^4.0.0"
+ npm-normalize-package-bin "^1.0.1"
+ npm-package-arg "^8.1.2"
+ semver "^7.3.4"
+
+npm-registry-fetch@^11.0.0:
+ version "11.0.0"
+ resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76"
+ integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==
+ dependencies:
+ make-fetch-happen "^9.0.1"
+ minipass "^3.1.3"
+ minipass-fetch "^1.3.0"
+ minipass-json-stream "^1.0.1"
+ minizlib "^2.0.0"
+ npm-package-arg "^8.0.0"
+
+npm-registry-fetch@^9.0.0:
+ version "9.0.0"
+ resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz#86f3feb4ce00313bc0b8f1f8f69daae6face1661"
+ integrity sha512-PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA==
+ dependencies:
+ "@npmcli/ci-detect" "^1.0.0"
+ lru-cache "^6.0.0"
+ make-fetch-happen "^8.0.9"
+ minipass "^3.1.3"
+ minipass-fetch "^1.3.0"
+ minipass-json-stream "^1.0.1"
+ minizlib "^2.0.0"
+ npm-package-arg "^8.0.0"
+
npm-run-path@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f"
@@ -7138,13 +9177,6 @@ npm-run-path@^1.0.0:
dependencies:
path-key "^1.0.0"
-npm-run-path@^2.0.0:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
- integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
- dependencies:
- path-key "^2.0.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"
@@ -7162,6 +9194,16 @@ npmlog@^4.0.1, npmlog@^4.1.2:
gauge "~2.7.3"
set-blocking "~2.0.0"
+npmlog@^6.0.0:
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
+ integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
+ dependencies:
+ are-we-there-yet "^3.0.0"
+ console-control-strings "^1.1.0"
+ gauge "^4.0.3"
+ set-blocking "^2.0.0"
+
nsfw@^2.1.2:
version "2.2.0"
resolved "https://registry.yarnpkg.com/nsfw/-/nsfw-2.2.0.tgz#83e2f5b965424b1bc0610da6c40ecd3afb37a8f7"
@@ -7186,7 +9228,7 @@ oauth-sign@~0.9.0:
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4, object-assign@^4.0.1, 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=
@@ -7226,24 +9268,6 @@ object.assign@^4.1.0, object.assign@^4.1.2:
has-symbols "^1.0.1"
object-keys "^1.1.1"
-object.entries@^1.1.5:
- version "1.1.5"
- resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
- integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
- dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.3"
- es-abstract "^1.19.1"
-
-object.fromentries@^2.0.5:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251"
- integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==
- dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.3"
- es-abstract "^1.19.1"
-
object.getownpropertydescriptors@^2.0.3:
version "2.1.3"
resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e"
@@ -7253,14 +9277,6 @@ object.getownpropertydescriptors@^2.0.3:
define-properties "^1.1.3"
es-abstract "^1.19.1"
-object.hasown@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5"
- integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==
- dependencies:
- define-properties "^1.1.3"
- es-abstract "^1.19.1"
-
object.values@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
@@ -7277,13 +9293,6 @@ octicons@^7.1.0:
dependencies:
object-assign "^4.1.1"
-on-finished@^2.3.0:
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
- integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
- dependencies:
- ee-first "1.1.1"
-
on-finished@~2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -7298,13 +9307,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
dependencies:
wrappy "1"
-onetime@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
- integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
- dependencies:
- mimic-fn "^1.0.0"
-
onetime@^5.1.0, onetime@^5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
@@ -7362,16 +9364,19 @@ optionator@^0.9.1:
type-check "^0.4.0"
word-wrap "^1.2.3"
-ora@^3.4.0:
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318"
- integrity sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==
+ora@^5.1.0:
+ version "5.4.1"
+ resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
+ integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
dependencies:
- chalk "^2.4.2"
- cli-cursor "^2.1.0"
- cli-spinners "^2.0.0"
- log-symbols "^2.2.0"
- strip-ansi "^5.2.0"
+ bl "^4.1.0"
+ chalk "^4.1.0"
+ cli-cursor "^3.1.0"
+ cli-spinners "^2.5.0"
+ is-interactive "^1.0.0"
+ is-unicode-supported "^0.1.0"
+ log-symbols "^4.1.0"
+ strip-ansi "^6.0.0"
wcwidth "^1.0.1"
os-homedir@^1.0.0:
@@ -7379,25 +9384,11 @@ os-homedir@^1.0.0:
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-os-locale@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
- integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
- dependencies:
- execa "^0.7.0"
- lcid "^1.0.0"
- mem "^1.1.0"
-
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-os@0.1.1:
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/os/-/os-0.1.1.tgz#208845e89e193ad4d971474b93947736a56d13f3"
- integrity sha1-IIhF6J4ZOtTZcUdLk5R3NqVtE/M=
-
osenv@^0.1.3, osenv@^0.1.4:
version "0.1.5"
resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
@@ -7406,6 +9397,16 @@ osenv@^0.1.3, osenv@^0.1.4:
os-homedir "^1.0.0"
os-tmpdir "^1.0.0"
+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@^2.0.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
+ integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
+
p-debounce@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/p-debounce/-/p-debounce-2.1.0.tgz#e79f70c6e325cbb9bddbcbec0b81025084671ad3"
@@ -7430,7 +9431,7 @@ p-limit@^2.0.0, p-limit@^2.2.0:
dependencies:
p-try "^2.0.0"
-p-limit@^3.1.0:
+p-limit@^3.0.2, p-limit@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
@@ -7458,6 +9459,18 @@ p-locate@^4.1.0:
dependencies:
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==
+ dependencies:
+ p-limit "^3.0.2"
+
+p-map-series@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-2.1.0.tgz#7560d4c452d9da0c07e692fdbfe6e2c81a2a91f2"
+ integrity sha512-RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q==
+
p-map@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
@@ -7465,11 +9478,43 @@ p-map@^3.0.0:
dependencies:
aggregate-error "^3.0.0"
+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==
+ dependencies:
+ aggregate-error "^3.0.0"
+
+p-pipe@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-3.1.0.tgz#48b57c922aa2e1af6a6404cb7c6bf0eb9cc8e60e"
+ integrity sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==
+
p-queue@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-2.4.2.tgz#03609826682b743be9a22dba25051bd46724fc34"
integrity sha512-n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng==
+p-queue@^6.6.2:
+ version "6.6.2"
+ resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426"
+ integrity sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==
+ dependencies:
+ eventemitter3 "^4.0.4"
+ p-timeout "^3.2.0"
+
+p-reduce@^2.0.0, p-reduce@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-2.1.0.tgz#09408da49507c6c274faa31f28df334bc712b64a"
+ integrity sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==
+
+p-timeout@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+ integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+ dependencies:
+ p-finally "^1.0.0"
+
p-try@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -7480,15 +9525,37 @@ p-try@^2.0.0, p-try@^2.2.0:
resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-package-json@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
- integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=
- dependencies:
- got "^6.7.1"
- registry-auth-token "^3.0.1"
- registry-url "^3.0.3"
- semver "^5.1.0"
+p-waterfall@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/p-waterfall/-/p-waterfall-2.1.1.tgz#63153a774f472ccdc4eb281cdb2967fcf158b2ee"
+ integrity sha512-RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw==
+ dependencies:
+ p-reduce "^2.0.0"
+
+pacote@^11.2.6:
+ version "11.3.5"
+ resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2"
+ integrity sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==
+ dependencies:
+ "@npmcli/git" "^2.1.0"
+ "@npmcli/installed-package-contents" "^1.0.6"
+ "@npmcli/promise-spawn" "^1.2.0"
+ "@npmcli/run-script" "^1.8.2"
+ cacache "^15.0.5"
+ chownr "^2.0.0"
+ fs-minipass "^2.1.0"
+ infer-owner "^1.0.4"
+ minipass "^3.1.3"
+ mkdirp "^1.0.3"
+ npm-package-arg "^8.0.1"
+ npm-packlist "^2.1.4"
+ npm-pick-manifest "^6.0.0"
+ npm-registry-fetch "^11.0.0"
+ promise-retry "^2.0.1"
+ read-package-json-fast "^2.0.1"
+ rimraf "^3.0.2"
+ ssri "^8.0.1"
+ tar "^6.1.0"
parent-module@^1.0.0:
version "1.0.1"
@@ -7497,18 +9564,6 @@ parent-module@^1.0.0:
dependencies:
callsites "^3.0.0"
-parse-github-repo-url@^1.3.0:
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
- integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A=
-
-parse-json@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
- integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
- dependencies:
- error-ex "^1.2.0"
-
parse-json@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -7517,41 +9572,77 @@ parse-json@^4.0.0:
error-ex "^1.3.1"
json-parse-better-errors "^1.0.1"
+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==
+ 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"
+
+parse-path@^4.0.0:
+ version "4.0.4"
+ resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.4.tgz#4bf424e6b743fb080831f03b536af9fc43f0ffea"
+ integrity sha512-Z2lWUis7jlmXC1jeOG9giRO2+FsuyNipeQ43HAjqAZjwSe3SEf+q/84FGPHoso3kyntbxa4c4i77t3m6fGf8cw==
+ dependencies:
+ is-ssh "^1.3.0"
+ protocols "^1.4.0"
+ qs "^6.9.4"
+ query-string "^6.13.8"
+
parse-semver@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/parse-semver/-/parse-semver-1.1.1.tgz#9a4afd6df063dc4826f93fba4a99cf223f666cb8"
integrity sha1-mkr9bfBj3Egm+T+6SpnPIj9mbLg=
dependencies:
- semver "^5.1.0"
+ semver "^5.1.0"
+
+parse-url@^6.0.0:
+ version "6.0.5"
+ resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-6.0.5.tgz#4acab8982cef1846a0f8675fa686cef24b2f6f9b"
+ integrity sha512-e35AeLTSIlkw/5GFq70IN7po8fmDUjpDPY1rIK+VubRfsUvBonjQ+PBZG+vWMACnQSmNlvl524IucoDmcioMxA==
+ dependencies:
+ is-ssh "^1.3.0"
+ normalize-url "^6.1.0"
+ parse-path "^4.0.0"
+ protocols "^1.4.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@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz#23c2cc233bcf09bb7beba8b8a69d46b08c62c2f1"
+ integrity sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==
dependencies:
- parse5 "^6.0.1"
+ domhandler "^5.0.2"
+ parse5 "^7.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@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.0.0.tgz#51f74a5257f5fcc536389e8c2d0b3802e1bfa91a"
+ integrity sha512-y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g==
+ dependencies:
+ entities "^4.3.0"
+
+parseqs@0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
+ integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
+
+parseuri@0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
+ integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
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==
-path-dirname@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
- integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-exists@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
- integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
- dependencies:
- pinkie-promise "^2.0.0"
+path-browserify@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
+ integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
path-exists@^3.0.0:
version "3.0.0"
@@ -7573,7 +9664,7 @@ path-key@^1.0.0:
resolved "https://registry.yarnpkg.com/path-key/-/path-key-1.0.0.tgz#5d53d578019646c0d68800db4e146e6bdc2ac7af"
integrity sha1-XVPVeAGWRsDWiADbThRua9wqx68=
-path-key@^2.0.0, path-key@^2.0.1:
+path-key@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
@@ -7583,7 +9674,7 @@ path-key@^3.0.0, path-key@^3.1.0:
resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-path-parse@^1.0.6, path-parse@^1.0.7:
+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==
@@ -7593,21 +9684,12 @@ path-to-regexp@0.1.7:
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
-path-type@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
- integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
- dependencies:
- graceful-fs "^4.1.2"
- pify "^2.0.0"
- pinkie-promise "^2.0.0"
-
-path-type@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
- integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
+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==
dependencies:
- pify "^2.0.0"
+ isarray "0.0.1"
path-type@^3.0.0:
version "3.0.0"
@@ -7658,12 +9740,12 @@ picocolors@^1.0.0:
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
-picomatch@^2.0.4, picomatch@^2.2.3:
+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==
-pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
+pify@^2.2.0, pify@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
@@ -7678,6 +9760,11 @@ pify@^4.0.1:
resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+pify@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f"
+ integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==
+
pinkie-promise@^2.0.0, pinkie-promise@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -7690,13 +9777,6 @@ pinkie@^2.0.0:
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-pkg-dir@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
- integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
- dependencies:
- find-up "^3.0.0"
-
pkg-dir@^4.1.0, pkg-dir@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
@@ -7804,17 +9884,15 @@ prelude-ls@~1.1.2:
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-prepend-http@^1.0.1:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
- integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
+prepend-http@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+ integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==
-prettier-linter-helpers@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
- integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
- dependencies:
- fast-diff "^1.1.2"
+prettier@^2.4.1:
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
+ integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
private@~0.1.5:
version "0.1.8"
@@ -7826,7 +9904,7 @@ process-nextick-args@~2.0.0:
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-progress@^2.0.0, progress@^2.0.1:
+progress@^2.0.0, progress@^2.0.1, progress@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
@@ -7838,7 +9916,27 @@ prom-client@^10.2.0:
dependencies:
tdigest "^0.1.1"
-prop-types@^15.5.6, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
+promise-inflight@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+ integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
+
+promise-retry@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
+ integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
+ dependencies:
+ err-code "^2.0.2"
+ retry "^0.12.0"
+
+promzard@^0.3.0:
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
+ integrity sha512-JZeYqd7UAcHCwI+sTOeUDYkvEU+1bQ7iE0UT1MgB/tERkAPkesW46MrpIySzODi+owTjZtiF8Ay5j9m60KmMBw==
+ dependencies:
+ read "1"
+
+prop-types@^15.5.6, prop-types@^15.6.1, 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==
@@ -7847,6 +9945,21 @@ prop-types@^15.5.6, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2,
object-assign "^4.1.1"
react-is "^16.13.1"
+proto-list@~1.2.1:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+ integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
+
+protocols@^1.4.0:
+ version "1.4.8"
+ resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.8.tgz#48eea2d8f58d9644a4a32caae5d5db290a075ce8"
+ integrity sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg==
+
+protocols@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86"
+ integrity sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==
+
proxy-addr@~2.0.5, proxy-addr@~2.0.7:
version "2.0.7"
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -7882,6 +9995,11 @@ psl@^1.1.28:
resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+psl@^1.1.33:
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+ integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
+
pump@^1.0.0:
version "1.0.3"
resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
@@ -7929,7 +10047,7 @@ puppeteer@^2.0.0:
rimraf "^2.6.1"
ws "^6.1.0"
-q@^1.4.1, q@^1.5.1:
+q@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
@@ -7944,20 +10062,47 @@ qs@6.9.7:
resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
+qs@^6.9.1, qs@^6.9.4:
+ version "6.11.0"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
+ integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
+ dependencies:
+ side-channel "^1.0.4"
+
qs@~6.5.2:
version "6.5.3"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
+query-string@^6.13.8:
+ version "6.14.1"
+ resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a"
+ integrity sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==
+ dependencies:
+ decode-uri-component "^0.2.0"
+ filter-obj "^1.1.0"
+ split-on-first "^1.0.0"
+ strict-uri-encode "^2.0.0"
+
+querystringify@^2.1.1:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+ integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+
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==
-quick-lru@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
- integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
+quick-lru@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
+ integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
+
+quick-lru@^5.1.1:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+ integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
randombytes@^2.1.0:
version "2.1.0"
@@ -7991,7 +10136,7 @@ raw-body@2.4.3:
iconv-lite "0.4.24"
unpipe "1.0.0"
-rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
+rc@^1.2.7:
version "1.2.8"
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -8084,28 +10229,57 @@ react@^16.8.0, react@^16.9.13:
object-assign "^4.1.1"
prop-types "^15.6.2"
-read-cmd-shim@^1.0.1:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16"
- integrity sha512-v5yCqQ/7okKoZZkBQUAfTsQ3sVJtXdNfbPnI5cceppoxEVLYA3k+VtV2omkeo8MS94JCy4fSiUwlRBAwCVRPUA==
+read-cmd-shim@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
+ integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==
+
+read-package-json-fast@^2.0.1:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
+ integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
dependencies:
- graceful-fs "^4.1.2"
+ json-parse-even-better-errors "^2.3.0"
+ npm-normalize-package-bin "^1.0.1"
-read-pkg-up@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
- integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
+read-package-json@^2.0.0:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a"
+ integrity sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==
dependencies:
- find-up "^1.0.0"
- read-pkg "^1.0.0"
+ glob "^7.1.1"
+ json-parse-even-better-errors "^2.3.0"
+ normalize-package-data "^2.0.0"
+ npm-normalize-package-bin "^1.0.0"
-read-pkg-up@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
- integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
+read-package-json@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-3.0.1.tgz#c7108f0b9390257b08c21e3004d2404c806744b9"
+ integrity sha512-aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng==
dependencies:
- find-up "^2.0.0"
- read-pkg "^2.0.0"
+ glob "^7.1.1"
+ json-parse-even-better-errors "^2.3.0"
+ normalize-package-data "^3.0.0"
+ npm-normalize-package-bin "^1.0.0"
+
+read-package-json@^4.1.1:
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-4.1.2.tgz#b444d047de7c75d4a160cb056d00c0693c1df703"
+ integrity sha512-Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ==
+ dependencies:
+ glob "^7.1.1"
+ json-parse-even-better-errors "^2.3.0"
+ normalize-package-data "^3.0.0"
+ npm-normalize-package-bin "^1.0.0"
+
+read-package-tree@^5.3.1:
+ version "5.3.1"
+ resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"
+ integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==
+ dependencies:
+ read-package-json "^2.0.0"
+ readdir-scoped-modules "^1.0.0"
+ util-promisify "^2.1.0"
read-pkg-up@^3.0.0:
version "3.0.0"
@@ -8115,23 +10289,14 @@ read-pkg-up@^3.0.0:
find-up "^2.0.0"
read-pkg "^3.0.0"
-read-pkg@^1.0.0, read-pkg@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
- integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
- dependencies:
- load-json-file "^1.0.0"
- normalize-package-data "^2.3.2"
- path-type "^1.0.0"
-
-read-pkg@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
- integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
+read-pkg-up@^7.0.1:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+ integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
dependencies:
- load-json-file "^2.0.0"
- normalize-package-data "^2.3.2"
- path-type "^2.0.0"
+ find-up "^4.1.0"
+ read-pkg "^5.2.0"
+ type-fest "^0.8.1"
read-pkg@^3.0.0:
version "3.0.0"
@@ -8142,23 +10307,23 @@ read-pkg@^3.0.0:
normalize-package-data "^2.3.2"
path-type "^3.0.0"
-read@^1.0.7:
+read-pkg@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+ integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+ dependencies:
+ "@types/normalize-package-data" "^2.4.0"
+ normalize-package-data "^2.5.0"
+ parse-json "^5.0.0"
+ type-fest "^0.6.0"
+
+read@1, read@^1.0.7, read@~1.0.1:
version "1.0.7"
resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
- integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=
+ integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
dependencies:
mute-stream "~0.0.4"
-readable-stream@1.0.x, readable-stream@~1.0.31:
- version "1.0.34"
- resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
- integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
- dependencies:
- core-util-is "~1.0.0"
- inherits "~2.0.1"
- isarray "0.0.1"
- string_decoder "~0.10.x"
-
readable-stream@1.1.x:
version "1.1.14"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
@@ -8169,7 +10334,16 @@ readable-stream@1.1.x:
isarray "0.0.1"
string_decoder "~0.10.x"
-readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.6:
+readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
+ version "3.6.0"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+ integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+ dependencies:
+ inherits "^2.0.3"
+ string_decoder "^1.1.1"
+ util-deprecate "^1.0.1"
+
+readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.6:
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==
@@ -8182,14 +10356,25 @@ readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.0, readable
string_decoder "~1.1.1"
util-deprecate "~1.0.1"
-readable-stream@^3.1.1, readable-stream@^3.4.0:
- 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@~1.0.31:
+ version "1.0.34"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+ integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
dependencies:
- inherits "^2.0.3"
- string_decoder "^1.1.1"
- util-deprecate "^1.0.1"
+ core-util-is "~1.0.0"
+ inherits "~2.0.1"
+ isarray "0.0.1"
+ string_decoder "~0.10.x"
+
+readdir-scoped-modules@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
+ integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
+ dependencies:
+ debuglog "^1.0.1"
+ dezalgo "^1.0.0"
+ graceful-fs "^4.1.2"
+ once "^1.3.0"
readdirp@~3.2.0:
version "3.2.0"
@@ -8198,6 +10383,13 @@ readdirp@~3.2.0:
dependencies:
picomatch "^2.0.4"
+readdirp@~3.6.0:
+ version "3.6.0"
+ resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+ integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+ dependencies:
+ picomatch "^2.2.1"
+
recast@^0.11.17:
version "0.11.23"
resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
@@ -8215,26 +10407,13 @@ rechoir@^0.7.0:
dependencies:
resolve "^1.9.0"
-reconnecting-websocket@^4.2.0:
- version "4.4.0"
- resolved "https://registry.yarnpkg.com/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz#3b0e5b96ef119e78a03135865b8bb0af1b948783"
- integrity sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==
-
-redent@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
- integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
- dependencies:
- indent-string "^2.1.0"
- strip-indent "^1.0.1"
-
-redent@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
- integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=
+redent@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
+ integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
dependencies:
- indent-string "^3.0.0"
- strip-indent "^2.0.0"
+ indent-string "^4.0.0"
+ strip-indent "^3.0.0"
redux@^4.0.0, redux@^4.0.4:
version "4.1.2"
@@ -8272,20 +10451,12 @@ regenerator-transform@^0.14.2:
dependencies:
"@babel/runtime" "^7.8.4"
-regexp.prototype.flags@^1.3.1:
- 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==
- dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.3"
-
regexpp@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
-regexpp@^3.1.0:
+regexpp@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
@@ -8302,21 +10473,6 @@ regexpu-core@^5.0.1:
unicode-match-property-ecmascript "^2.0.0"
unicode-match-property-value-ecmascript "^2.0.0"
-registry-auth-token@^3.0.1:
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
- integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==
- dependencies:
- rc "^1.1.6"
- safe-buffer "^5.0.1"
-
-registry-url@^3.0.3:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
- integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI=
- dependencies:
- rc "^1.0.1"
-
regjsgen@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d"
@@ -8329,14 +10485,7 @@ regjsparser@^0.8.2:
dependencies:
jsesc "~0.5.0"
-repeating@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
- integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
- dependencies:
- is-finite "^1.0.0"
-
-request@^2.82.0, request@^2.86.0, request@^2.88.0:
+request@^2.82.0, request@^2.86.0, request@^2.88.0, request@^2.88.2:
version "2.88.2"
resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -8362,14 +10511,13 @@ request@^2.82.0, request@^2.86.0, request@^2.88.0:
tunnel-agent "^0.6.0"
uuid "^3.3.2"
-requestretry@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/requestretry/-/requestretry-3.1.0.tgz#c8e1976bb946f14889d3604bbad56a01d191c10d"
- integrity sha512-DkvCPK6qvwxIuVA5TRCvi626WHC2rWjF/n7SCQvVHAr2JX9i1/cmIpSEZlmHAo+c1bj9rjaKoZ9IsKwCpTkoXA==
+requestretry@^7.0.0:
+ version "7.1.0"
+ resolved "https://registry.yarnpkg.com/requestretry/-/requestretry-7.1.0.tgz#d16a1a57a95295211147841550603f3dc527541e"
+ integrity sha512-TqVDgp251BW4b8ddQ2ptaj/57Z3LZHLscAUT7v6qs70buqF2/IoOVjYbpjJ6HiW7j5+waqegGI8xKJ/+uzgDmw==
dependencies:
extend "^3.0.2"
- lodash "^4.17.10"
- when "^3.7.7"
+ lodash "^4.17.15"
require-directory@^2.1.1:
version "2.1.1"
@@ -8381,16 +10529,21 @@ require-from-string@^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-main-filename@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
- integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
-
require-main-filename@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+requires-port@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+ integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
+
+resolve-alpn@^1.0.0:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
+ integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
+
resolve-cwd@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -8417,21 +10570,28 @@ resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.9.0:
path-parse "^1.0.7"
supports-preserve-symlinks-flag "^1.0.0"
-resolve@^2.0.0-next.3:
- version "2.0.0-next.3"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46"
- integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==
+resolve@^1.22.0:
+ version "1.22.1"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
+ integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
dependencies:
- is-core-module "^2.2.0"
- path-parse "^1.0.6"
+ is-core-module "^2.9.0"
+ path-parse "^1.0.7"
+ supports-preserve-symlinks-flag "^1.0.0"
-restore-cursor@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
- integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+responselike@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+ integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==
dependencies:
- onetime "^2.0.0"
- signal-exit "^3.0.2"
+ lowercase-keys "^1.0.0"
+
+responselike@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
+ integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==
+ dependencies:
+ lowercase-keys "^2.0.0"
restore-cursor@^3.1.0:
version "3.1.0"
@@ -8441,11 +10601,23 @@ restore-cursor@^3.1.0:
onetime "^5.1.0"
signal-exit "^3.0.2"
+retry@^0.12.0:
+ version "0.12.0"
+ resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+ integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
+
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==
+rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+ integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+ dependencies:
+ glob "^7.1.3"
+
rimraf@2.6.3, rimraf@~2.6.2:
version "2.6.3"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -8453,26 +10625,31 @@ rimraf@2.6.3, rimraf@~2.6.2:
dependencies:
glob "^7.1.3"
-rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
- version "2.7.1"
- resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
- integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
- dependencies:
- glob "^7.1.3"
-
-rimraf@^3.0.2:
+rimraf@^3.0.0, 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==
dependencies:
glob "^7.1.3"
+roarr@^2.15.3:
+ version "2.15.4"
+ resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"
+ integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==
+ dependencies:
+ boolean "^3.0.1"
+ detect-node "^2.0.4"
+ globalthis "^1.0.1"
+ json-stringify-safe "^5.0.1"
+ semver-compare "^1.0.0"
+ sprintf-js "^1.1.2"
+
route-parser@^0.0.5:
version "0.0.5"
resolved "https://registry.yarnpkg.com/route-parser/-/route-parser-0.0.5.tgz#7d1d09d335e49094031ea16991a4a79b01bbe1f4"
integrity sha1-fR0J0zXkkJQDHqFpkaSnmwG74fQ=
-run-async@^2.2.0, run-async@^2.4.0:
+run-async@^2.4.0:
version "2.4.1"
resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
@@ -8484,19 +10661,7 @@ run-parallel@^1.1.9:
dependencies:
queue-microtask "^1.2.2"
-rx-lite-aggregates@^4.0.8:
- version "4.0.8"
- resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
- integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=
- dependencies:
- rx-lite "*"
-
-rx-lite@*, rx-lite@^4.0.8:
- version "4.0.8"
- resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
- integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
-
-rxjs@^6.3.1, rxjs@^6.6.0:
+rxjs@^6.6.0:
version "6.6.7"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
@@ -8561,6 +10726,11 @@ seek-bzip@^1.0.5:
dependencies:
commander "^2.8.1"
+semver-compare@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+ integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
+
"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
version "5.7.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -8571,12 +10741,19 @@ semver@7.0.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
+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.2.1, semver@^7.3.5:
+semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.7:
+ version "7.3.7"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+ integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+ dependencies:
+ lru-cache "^6.0.0"
+
+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==
@@ -8621,20 +10798,27 @@ send@0.17.2:
range-parser "~1.2.1"
statuses "~1.5.0"
-serialize-javascript@^5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
- integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
+serialize-error@^7.0.1:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18"
+ integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==
dependencies:
- randombytes "^2.1.0"
+ type-fest "^0.13.1"
-serialize-javascript@^6.0.0:
+serialize-javascript@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==
dependencies:
randombytes "^2.1.0"
+serialize-javascript@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
+ integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
+ dependencies:
+ randombytes "^2.1.0"
+
serve-static@1.14.1:
version "1.14.1"
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
@@ -8660,7 +10844,7 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-setimmediate@^1.0.5:
+setimmediate@^1.0.5, setimmediate@~1.0.4:
version "1.0.5"
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
@@ -8706,13 +10890,6 @@ shebang-regex@^3.0.0:
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-showdown@^1.9.1:
- version "1.9.1"
- resolved "https://registry.yarnpkg.com/showdown/-/showdown-1.9.1.tgz#134e148e75cd4623e09c21b0511977d79b5ad0ef"
- integrity sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA==
- dependencies:
- yargs "^14.2"
-
side-channel@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -8722,7 +10899,7 @@ side-channel@^1.0.4:
get-intrinsic "^1.0.2"
object-inspect "^1.9.0"
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
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==
@@ -8741,6 +10918,18 @@ simple-get@^3.0.3:
once "^1.3.1"
simple-concat "^1.0.0"
+sinon@^12.0.1:
+ version "12.0.1"
+ resolved "https://registry.yarnpkg.com/sinon/-/sinon-12.0.1.tgz#331eef87298752e1b88a662b699f98e403c859e9"
+ integrity sha512-iGu29Xhym33ydkAT+aNQFBINakjq69kKO6ByPvTsm3yyIACfyQttRTP03aBP/I8GfhFmLzrnKwNNkr0ORb1udg==
+ dependencies:
+ "@sinonjs/commons" "^1.8.3"
+ "@sinonjs/fake-timers" "^8.1.0"
+ "@sinonjs/samsam" "^6.0.2"
+ diff "^5.0.0"
+ nise "^5.1.0"
+ supports-color "^7.2.0"
+
slash@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -8760,20 +10949,102 @@ slice-ansi@^2.1.0:
astral-regex "^1.0.0"
is-fullwidth-code-point "^2.0.0"
-slice-ansi@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
- integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
- dependencies:
- ansi-styles "^4.0.0"
- astral-regex "^2.0.0"
- is-fullwidth-code-point "^3.0.0"
+slide@^1.1.6:
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+ integrity sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==
+
+smart-buffer@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
+ integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
snabbdom@^3.0.3:
version "3.3.1"
resolved "https://registry.yarnpkg.com/snabbdom/-/snabbdom-3.3.1.tgz#a2fb9a1c85cc19d6dc11c4c5e4c78cbbbaafff1f"
integrity sha512-FR9u20dCkktPd+qbedqwYNjMXzYhizhqlKTQzYZimLNeCJY0/5qgs0DtLVSmzIEL1bN3Dyb9sQpiHGCxUjyLnQ==
+socket.io-adapter@~2.3.3:
+ version "2.3.3"
+ resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz#4d6111e4d42e9f7646e365b4f578269821f13486"
+ integrity sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==
+
+socket.io-client@4.4.1:
+ version "4.4.1"
+ resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.4.1.tgz#b6aa9448149d09b8d0b2bbf3d2fac310631fdec9"
+ integrity sha512-N5C/L5fLNha5Ojd7Yeb/puKcPWWcoB/A09fEjjNsg91EDVr5twk/OEyO6VT9dlLSUNY85NpW6KBhVMvaLKQ3vQ==
+ dependencies:
+ "@socket.io/component-emitter" "~3.0.0"
+ backo2 "~1.0.2"
+ debug "~4.3.2"
+ engine.io-client "~6.1.1"
+ parseuri "0.0.6"
+ socket.io-parser "~4.1.1"
+
+socket.io-parser@~4.0.4:
+ version "4.0.5"
+ resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.5.tgz#cb404382c32324cc962f27f3a44058cf6e0552df"
+ integrity sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==
+ dependencies:
+ "@types/component-emitter" "^1.2.10"
+ component-emitter "~1.3.0"
+ debug "~4.3.1"
+
+socket.io-parser@~4.1.1:
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.1.2.tgz#0a97d4fb8e67022158a568450a6e41887e42035e"
+ integrity sha512-j3kk71QLJuyQ/hh5F/L2t1goqzdTL0gvDzuhTuNSwihfuFUrcSji0qFZmJJPtG6Rmug153eOPsUizeirf1IIog==
+ dependencies:
+ "@socket.io/component-emitter" "~3.0.0"
+ debug "~4.3.1"
+
+socket.io@4.4.1:
+ version "4.4.1"
+ resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.4.1.tgz#cd6de29e277a161d176832bb24f64ee045c56ab8"
+ integrity sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==
+ dependencies:
+ accepts "~1.3.4"
+ base64id "~2.0.0"
+ debug "~4.3.2"
+ engine.io "~6.1.0"
+ socket.io-adapter "~2.3.3"
+ socket.io-parser "~4.0.4"
+
+socks-proxy-agent@^5.0.0:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz#032fb583048a29ebffec2e6a73fca0761f48177e"
+ integrity sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==
+ dependencies:
+ agent-base "^6.0.2"
+ debug "4"
+ socks "^2.3.3"
+
+socks-proxy-agent@^6.0.0:
+ version "6.2.1"
+ resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
+ integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
+ dependencies:
+ agent-base "^6.0.2"
+ debug "^4.3.3"
+ socks "^2.6.2"
+
+socks-proxy-agent@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
+ integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
+ dependencies:
+ agent-base "^6.0.2"
+ debug "^4.3.3"
+ socks "^2.6.2"
+
+socks@^2.3.3, socks@^2.6.2:
+ version "2.7.0"
+ resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz#f9225acdb841e874dca25f870e9130990f3913d0"
+ integrity sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA==
+ dependencies:
+ ip "^2.0.0"
+ smart-buffer "^4.2.0"
+
sort-keys@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
@@ -8781,6 +11052,13 @@ sort-keys@^2.0.0:
dependencies:
is-plain-obj "^1.0.0"
+sort-keys@^4.0.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-4.2.0.tgz#6b7638cee42c506fff8c1cecde7376d21315be18"
+ integrity sha512-aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg==
+ dependencies:
+ is-plain-obj "^2.0.0"
+
source-map-js@^0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"
@@ -8820,17 +11098,8 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0:
source-map@~0.7.2:
version "0.7.3"
- resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
- integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
-spawn-rx@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/spawn-rx/-/spawn-rx-3.0.0.tgz#1d33511e13ec26337da51d78630e08beb57a6767"
- integrity sha512-dw4Ryg/KMNfkKa5ezAR5aZe9wNwPdKlnHEXtHOjVnyEDSPQyOpIPPRtcIiu7127SmtHhaCjw21yC43HliW0iIg==
- dependencies:
- debug "^2.5.1"
- lodash.assign "^4.2.0"
- rxjs "^6.3.1"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+ integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
spdx-correct@^3.0.0:
version "3.1.1"
@@ -8858,12 +11127,17 @@ spdx-license-ids@^3.0.0:
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
-split2@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
- integrity sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==
+split-on-first@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
+ integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
+
+split2@^3.0.0:
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f"
+ integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==
dependencies:
- through2 "^2.0.2"
+ readable-stream "^3.0.0"
split@0.3:
version "0.3.3"
@@ -8879,32 +11153,44 @@ split@^1.0.0:
dependencies:
through "2"
+sprintf-js@^1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+ integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
+
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=
-sprotty-theia@0.10.0:
- version "0.10.0"
- resolved "https://registry.yarnpkg.com/sprotty-theia/-/sprotty-theia-0.10.0.tgz#cbd31a9973e0c00c9598e7b854a925764211a755"
- integrity sha512-Ne4wolxjnf18cgJ6PhEon9NHU1mHPTSxfys1tBUroKk+XDl40XZ16Kla5+6/f9m4gLSPCBytSVQSs8OAhhgoeg==
+sprotty-protocol@0.12.0, sprotty-protocol@^0.12.0, sprotty-protocol@~0.12.0:
+ version "0.12.0"
+ resolved "https://registry.yarnpkg.com/sprotty-protocol/-/sprotty-protocol-0.12.0.tgz#542eb6396a645f85f8cfc2e7ef1d9b90c7b1980b"
+ integrity sha512-vbov+XfbmSeMYb46vm6dJvK3q7YKUvg0q7JnM6H7Ca5qY8TaZCEZ5Vc8zHKFZGWchcwnQYKqLTzwDItsMikD0A==
+
+sprotty-theia@0.12.0:
+ version "0.12.0"
+ resolved "https://registry.yarnpkg.com/sprotty-theia/-/sprotty-theia-0.12.0.tgz#e2fa82f9e56a9df54ae1856acbbd68bdb491e5a9"
+ integrity sha512-insqidQuWqLr9N6q1mcaNyk+xBYjVGJidHlgkSKF3zPkni5WO3w8ihnz6Yza0wQAg2lySzCHt99cT1c9F4VPhg==
dependencies:
- "@theia/core" "^1.0.0"
- "@theia/editor" "^1.0.0"
- "@theia/filesystem" "^1.0.0"
- "@theia/monaco" "^1.0.0"
- sprotty "^0.10.0"
+ "@theia/core" "^1.18.0"
+ "@theia/editor" "^1.18.0"
+ "@theia/filesystem" "^1.18.0"
+ "@theia/monaco" "^1.18.0"
+ sprotty "^0.12.0"
+ sprotty-protocol "^0.12.0"
-sprotty@0.10.0, sprotty@^0.10.0:
- version "0.10.0"
- resolved "https://registry.yarnpkg.com/sprotty/-/sprotty-0.10.0.tgz#1c1d4fbce76127945d3bf5fb1e0f4995731a1271"
- integrity sha512-Aicu0PEYulIFcI+FcFIydvwZu67+R0DqL60ZDIhkbre344uIlijwtOSoEyAwaihtODZAb4M9mFcrHb8qweRRwA==
+sprotty@0.12.0, sprotty@^0.12.0:
+ version "0.12.0"
+ resolved "https://registry.yarnpkg.com/sprotty/-/sprotty-0.12.0.tgz#693432346d9321bb19f368c6806641539962db99"
+ integrity sha512-0RjRn3iR9McDt+LZ+cyySfdBdWyzR4kPbg4xESumvoSPziHphs6TdM7CvJ9ywTMmG131nKUF6GgbzhQZ+L6cGg==
dependencies:
"@vscode/codicons" "^0.0.25"
- autocompleter "5.1.0"
- file-saver "2.0.2"
- inversify "^5.0.1"
+ autocompleter "^5.1.0"
+ file-saver "^2.0.2"
+ inversify "^5.1.1"
snabbdom "^3.0.3"
+ sprotty-protocol "~0.12.0"
tinyqueue "^2.0.3"
sshpk@^1.7.0:
@@ -8922,6 +11208,20 @@ sshpk@^1.7.0:
safer-buffer "^2.0.2"
tweetnacl "~0.14.0"
+ssri@^8.0.0, ssri@^8.0.1:
+ version "8.0.1"
+ resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
+ integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
+ dependencies:
+ minipass "^3.1.1"
+
+ssri@^9.0.0:
+ version "9.0.1"
+ resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
+ integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
+ dependencies:
+ minipass "^3.1.1"
+
"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"
@@ -8934,10 +11234,15 @@ stream-combiner@~0.0.4:
dependencies:
duplexer "~0.1.1"
-streamsearch@0.1.2:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
- integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=
+streamsearch@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
+ integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
+
+strict-uri-encode@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
+ integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==
string-argv@^0.1.1:
version "0.1.2"
@@ -8953,7 +11258,7 @@ string-width@^1.0.1:
is-fullwidth-code-point "^1.0.0"
strip-ansi "^3.0.0"
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0:
+"string-width@^1.0.2 || 2":
version "2.1.1"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -8979,20 +11284,6 @@ string-width@^3.0.0, string-width@^3.1.0:
is-fullwidth-code-point "^2.0.0"
strip-ansi "^5.1.0"
-string.prototype.matchall@^4.0.6:
- version "4.0.6"
- resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"
- integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==
- dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.3"
- es-abstract "^1.19.1"
- get-intrinsic "^1.1.1"
- has-symbols "^1.0.2"
- internal-slot "^1.0.3"
- regexp.prototype.flags "^1.3.1"
- side-channel "^1.0.4"
-
string.prototype.trimend@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
@@ -9056,18 +11347,16 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
dependencies:
ansi-regex "^5.0.1"
-strip-bom@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
- integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
- dependencies:
- is-utf8 "^0.2.0"
-
strip-bom@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+strip-bom@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+ integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
+
strip-dirs@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5"
@@ -9085,24 +11374,19 @@ strip-final-newline@^2.0.0:
resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-strip-indent@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
- integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
+strip-indent@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
+ integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
dependencies:
- get-stdin "^4.0.1"
-
-strip-indent@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
- integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
+ min-indent "^1.0.0"
strip-json-comments@2.0.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@^3.0.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@3.1.1, strip-json-comments@^3.0.1, strip-json-comments@^3.1.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==
@@ -9114,15 +11398,13 @@ strip-outer@^1.0.1:
dependencies:
escape-string-regexp "^1.0.2"
-strong-log-transformer@^1.0.6:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz#f7fb93758a69a571140181277eea0c2eb1301fa3"
- integrity sha1-9/uTdYpppXEUAYEnfuoMLrEwH6M=
+strong-log-transformer@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
+ integrity sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==
dependencies:
- byline "^5.0.0"
duplexer "^0.1.1"
- minimist "^0.1.0"
- moment "^2.6.0"
+ minimist "^1.2.0"
through "^2.3.4"
style-loader@^2.0.0:
@@ -9133,6 +11415,13 @@ style-loader@^2.0.0:
loader-utils "^2.0.0"
schema-utils "^3.0.0"
+sumchecker@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42"
+ integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==
+ dependencies:
+ debug "^4.1.0"
+
supports-color@6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
@@ -9140,6 +11429,13 @@ supports-color@6.0.0:
dependencies:
has-flag "^3.0.0"
+supports-color@8.1.1, 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==
+ dependencies:
+ has-flag "^4.0.0"
+
supports-color@^5.3.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -9147,20 +11443,13 @@ supports-color@^5.3.0:
dependencies:
has-flag "^3.0.0"
-supports-color@^7.1.0:
+supports-color@^7.1.0, supports-color@^7.2.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==
dependencies:
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==
- dependencies:
- 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"
@@ -9176,17 +11465,6 @@ table@^5.2.3:
slice-ansi "^2.1.0"
string-width "^3.0.0"
-table@^6.0.9:
- version "6.8.0"
- resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca"
- integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==
- dependencies:
- ajv "^8.0.1"
- lodash.truncate "^4.4.2"
- slice-ansi "^4.0.0"
- string-width "^4.2.3"
- strip-ansi "^6.0.1"
-
tapable@^2.1.1, tapable@^2.2.0:
version "2.2.1"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
@@ -9249,6 +11527,18 @@ tar@^4.0.0, tar@^4.0.2, tar@^4.4.12:
safe-buffer "^5.2.1"
yallist "^3.1.1"
+tar@^6.0.2, tar@^6.0.5, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
+ version "6.1.11"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+ integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
+ dependencies:
+ chownr "^2.0.0"
+ fs-minipass "^2.0.0"
+ minipass "^3.0.0"
+ minizlib "^2.1.1"
+ mkdirp "^1.0.3"
+ yallist "^4.0.0"
+
tdigest@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.1.tgz#2e3cb2c39ea449e55d1e6cd91117accca4588021"
@@ -9261,17 +11551,16 @@ temp-dir@^1.0.0:
resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
-temp-write@^3.3.0:
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-3.4.0.tgz#8cff630fb7e9da05f047c74ce4ce4d685457d492"
- integrity sha1-jP9jD7fp2gXwR8dM5M5NaFRX1JI=
+temp-write@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-4.0.0.tgz#cd2e0825fc826ae72d201dc26eef3bf7e6fc9320"
+ integrity sha512-HIeWmj77uOOHb0QX7siN3OtwV3CTntquin6TNVg6SHOqCP3hYKmox90eeFOGaY1MqJ9WYDDjkyZrW6qS5AWpbw==
dependencies:
- graceful-fs "^4.1.2"
- is-stream "^1.1.0"
- make-dir "^1.0.0"
- pify "^3.0.0"
+ graceful-fs "^4.1.15"
+ is-stream "^2.0.0"
+ make-dir "^3.0.0"
temp-dir "^1.0.0"
- uuid "^3.0.1"
+ uuid "^3.3.2"
temp@^0.9.1:
version "0.9.4"
@@ -9281,14 +11570,6 @@ temp@^0.9.1:
mkdirp "^0.5.1"
rimraf "~2.6.2"
-tempfile@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
- integrity sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=
- dependencies:
- os-tmpdir "^1.0.0"
- uuid "^2.0.1"
-
terser-webpack-plugin@^5.1.3:
version "5.3.1"
resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54"
@@ -9320,7 +11601,7 @@ text-table@^0.2.0:
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
-through2@^2.0.0, through2@^2.0.1, through2@^2.0.2:
+through2@^2.0.0, through2@^2.0.1:
version "2.0.5"
resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -9328,28 +11609,23 @@ through2@^2.0.0, through2@^2.0.1, through2@^2.0.2:
readable-stream "~2.3.6"
xtend "~4.0.1"
+through2@^4.0.0:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
+ integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==
+ dependencies:
+ readable-stream "3"
+
through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1:
version "2.3.8"
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-timed-out@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
- integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
-
tinyqueue@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-2.0.3.tgz#64d8492ebf39e7801d7bd34062e29b45b2035f08"
integrity sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==
-tmp@0.0.29:
- version "0.0.29"
- resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz#f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"
- integrity sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=
- dependencies:
- os-tmpdir "~1.0.1"
-
tmp@^0.0.33:
version "0.0.33"
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -9357,6 +11633,13 @@ tmp@^0.0.33:
dependencies:
os-tmpdir "~1.0.2"
+tmp@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+ integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+ dependencies:
+ rimraf "^3.0.0"
+
to-buffer@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
@@ -9367,6 +11650,11 @@ to-fast-properties@^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-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-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"
@@ -9384,6 +11672,16 @@ toidentifier@1.0.1:
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
+tough-cookie@^4.0.0:
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
+ integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
+ dependencies:
+ psl "^1.1.33"
+ punycode "^2.1.1"
+ universalify "^0.2.0"
+ url-parse "^1.5.3"
+
tough-cookie@~2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
@@ -9392,6 +11690,13 @@ tough-cookie@~2.5.0:
psl "^1.1.28"
punycode "^2.1.1"
+tr46@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
+ integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
+ dependencies:
+ punycode "^2.1.1"
+
tr46@~0.0.3:
version "0.0.3"
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -9417,20 +11722,10 @@ trash@^6.1.1:
resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=
-trim-newlines@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
- integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
-
-trim-newlines@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
- integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
-
-trim-off-newlines@^1.0.0:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.3.tgz#8df24847fcb821b0ab27d58ab6efec9f2fe961a1"
- integrity sha512-kh6Tu6GbeSNMGfrrZh6Bb/4ZEHV1QlB4xNDBeog8Y9/QwFlKTRyWvY3Fs9tRDAMZliVUwieMgEdIeL/FtqjkJg==
+trim-newlines@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
+ integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
trim-repeated@^1.0.0:
version "1.0.0"
@@ -9444,14 +11739,33 @@ ts-md5@^1.2.2:
resolved "https://registry.yarnpkg.com/ts-md5/-/ts-md5-1.2.11.tgz#0bbdf884eecf7da3952fe8671a109d7e55d322c6"
integrity sha512-vAwy9rEuRE6a8xa1MavIVkLFyyU0ydk4CLMFA5vOVccmQKLOuGb/BHm3oEN7XHf2FoqS+z0pSvhaad/ombd1Vg==
-tsconfig-paths@^3.12.0:
- version "3.14.0"
- resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.0.tgz#4fcc48f9ccea8826c41b9ca093479de7f5018976"
- integrity sha512-cg/1jAZoL57R39+wiw4u/SCC6Ic9Q5NqjBOb+9xISedOYurfog9ZNmKJSxAnb2m/5Bq4lE9lhUcau33Ml8DM0g==
+ts-node@^10.4.0, ts-node@^10.8.1:
+ version "10.9.1"
+ resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
+ integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
+ dependencies:
+ "@cspotcode/source-map-support" "^0.8.0"
+ "@tsconfig/node10" "^1.0.7"
+ "@tsconfig/node12" "^1.0.7"
+ "@tsconfig/node14" "^1.0.0"
+ "@tsconfig/node16" "^1.0.2"
+ acorn "^8.4.1"
+ acorn-walk "^8.1.1"
+ arg "^4.1.0"
+ create-require "^1.1.0"
+ diff "^4.0.1"
+ make-error "^1.1.1"
+ v8-compile-cache-lib "^3.0.1"
+ yn "3.1.1"
+
+tsconfig-paths@^3.14.1:
+ version "3.14.1"
+ resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
+ integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
dependencies:
"@types/json5" "^0.0.29"
json5 "^1.0.1"
- minimist "^1.2.0"
+ minimist "^1.2.6"
strip-bom "^3.0.0"
tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
@@ -9459,7 +11773,7 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-tslib@^2.2.0, tslib@^2.3.1:
+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==
@@ -9478,10 +11792,10 @@ tunnel-agent@^0.6.0:
dependencies:
safe-buffer "^5.0.1"
-tunnel@0.0.4:
- version "0.0.4"
- resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.4.tgz#2d3785a158c174c9a16dc2c046ec5fc5f1742213"
- integrity sha1-LTeFoVjBdMmhbcLARuxfxfF0IhM=
+tunnel@0.0.6, tunnel@^0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+ integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
tweetnacl@^0.14.3, tweetnacl@~0.14.0:
version "0.14.5"
@@ -9502,11 +11816,21 @@ type-check@~0.3.2:
dependencies:
prelude-ls "~1.1.2"
-type-detect@^4.0.0, type-detect@^4.0.5:
+type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5, type-detect@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+type-fest@^0.13.1:
+ version "0.13.1"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
+ integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
+
+type-fest@^0.18.0:
+ version "0.18.1"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
+ integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
+
type-fest@^0.20.2:
version "0.20.2"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
@@ -9517,6 +11841,16 @@ type-fest@^0.21.3:
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+type-fest@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
+ integrity sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==
+
+type-fest@^0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+ integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
type-fest@^0.8.1:
version "0.8.1"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
@@ -9530,28 +11864,31 @@ type-is@^1.6.4, type-is@~1.6.17, type-is@~1.6.18:
media-typer "0.3.0"
mime-types "~2.1.24"
-typed-rest-client@1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/typed-rest-client/-/typed-rest-client-1.2.0.tgz#723085d203f38d7d147271e5ed3a75488eb44a02"
- integrity sha512-FrUshzZ1yxH8YwGR29PWWnfksLEILbWJydU7zfIRkyH7kAEzB62uMAl2WY6EyolWpLpVHeJGgQm45/MaruaHpw==
+typed-rest-client@^1.8.4:
+ version "1.8.9"
+ resolved "https://registry.yarnpkg.com/typed-rest-client/-/typed-rest-client-1.8.9.tgz#e560226bcadfe71b0fb5c416b587f8da3b8f92d8"
+ integrity sha512-uSmjE38B80wjL85UFX3sTYEUlvZ1JgCRhsWj/fJ4rZ0FqDUFoIuodtiVeE+cUqiVTOKPdKrp/sdftD15MDek6g==
+ dependencies:
+ qs "^6.9.1"
+ tunnel "0.0.6"
+ underscore "^1.12.1"
+
+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==
dependencies:
- tunnel "0.0.4"
- underscore "1.8.3"
+ is-typedarray "^1.0.0"
typedarray@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-typescript@^3.9.2:
- version "3.9.10"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8"
- integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==
-
-typescript@^4.2.3, typescript@^4.4.3:
- version "4.6.2"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
- integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==
+typescript@~4.5.5:
+ version "4.5.5"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
+ integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
uc.micro@^1.0.1, uc.micro@^1.0.5:
version "1.0.6"
@@ -9563,6 +11900,16 @@ uglify-js@^3.1.4:
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.3.tgz#9aa82ca22419ba4c0137642ba0df800cb06e0471"
integrity sha512-6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg==
+uid-number@0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+ integrity sha512-c461FXIljswCuscZn67xq9PpszkPT6RjheWFQTgCyabJrTUozElanb0YEqv2UGgk247YpcJkFBuSGNvBlpXM9w==
+
+umask@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
+ integrity sha512-lE/rxOhmiScJu9L6RTNVgB/zZbF+vGC0/p6D3xnkAePI2o0sMyFG966iR5Ki50OI/0mNi2yaRnxfLsPmEZF/JA==
+
umd-compat-loader@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/umd-compat-loader/-/umd-compat-loader-2.1.2.tgz#abf89be1591940a236cf8fa87f88d6d6f5a8da35"
@@ -9590,10 +11937,10 @@ unbzip2-stream@^1.0.9:
buffer "^5.2.1"
through "^2.3.8"
-underscore@1.8.3:
- version "1.8.3"
- resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
- integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=
+underscore@^1.12.1:
+ version "1.13.4"
+ resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.4.tgz#7886b46bbdf07f768e0052f1828e1dcab40c0dee"
+ integrity sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ==
unicode-canonical-property-names-ecmascript@^2.0.0:
version "2.0.0"
@@ -9618,21 +11965,59 @@ unicode-property-aliases-ecmascript@^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==
+unique-filename@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+ integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+ dependencies:
+ unique-slug "^2.0.0"
+
+unique-filename@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
+ integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
+ dependencies:
+ unique-slug "^3.0.0"
+
+unique-slug@^2.0.0:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+ integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
+ dependencies:
+ imurmurhash "^0.1.4"
+
+unique-slug@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9"
+ integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==
+ dependencies:
+ imurmurhash "^0.1.4"
+
+universal-user-agent@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
+ integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
+
universalify@^0.1.0:
version "0.1.2"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+universalify@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
+ integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
+
+universalify@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+ integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
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=
-unzip-response@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
- integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
-
unzip-stream@^0.3.0:
version "0.3.1"
resolved "https://registry.yarnpkg.com/unzip-stream/-/unzip-stream-0.3.1.tgz#2333b5cd035d29db86fb701ca212cf8517400083"
@@ -9641,10 +12026,25 @@ unzip-stream@^0.3.0:
binary "^0.3.0"
mkdirp "^0.5.1"
-upath@^1.0.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
- integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
+unzipper@^0.9.11:
+ version "0.9.15"
+ resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.9.15.tgz#97d99203dad17698ee39882483c14e4845c7549c"
+ integrity sha512-2aaUvO4RAeHDvOCuEtth7jrHFaCKTSXPqUkXwADaLBzGbgZGzUDccoEdJ5lW+3RmfpOZYNx0Rw6F6PUzM6caIA==
+ dependencies:
+ big-integer "^1.6.17"
+ binary "~0.3.0"
+ bluebird "~3.4.1"
+ buffer-indexof-polyfill "~1.0.0"
+ duplexer2 "~0.1.4"
+ fstream "^1.0.12"
+ listenercount "~1.0.1"
+ readable-stream "~2.3.6"
+ setimmediate "~1.0.4"
+
+upath@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
+ integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
uri-js@^4.2.2:
version "4.4.1"
@@ -9658,12 +12058,20 @@ url-join@^1.1.0:
resolved "https://registry.yarnpkg.com/url-join/-/url-join-1.1.0.tgz#741c6c2f4596c4830d6718460920d0c92202dc78"
integrity sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg=
-url-parse-lax@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
- integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
+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 sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==
dependencies:
- prepend-http "^1.0.1"
+ prepend-http "^2.0.0"
+
+url-parse@^1.5.3:
+ version "1.5.10"
+ resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+ integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
+ dependencies:
+ querystringify "^2.1.1"
+ requires-port "^1.0.0"
user-home@^2.0.0:
version "2.0.0"
@@ -9677,6 +12085,13 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+util-promisify@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53"
+ integrity sha512-K+5eQPYs14b3+E+hmE2J6gCZ4JmMl9DbYS6BeP2CHq6WMuNxErxf5B/n0fz85L8zUuoO6rIzNNmIQDu/j+1OcA==
+ dependencies:
+ object.getownpropertydescriptors "^2.0.3"
+
utils-merge@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
@@ -9687,12 +12102,7 @@ uuid@7.0.3, uuid@^7.0.3:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
-uuid@^2.0.1:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
- integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=
-
-uuid@^3.0.1, uuid@^3.3.2, uuid@^3.3.3:
+uuid@^3.3.2, uuid@^3.3.3:
version "3.4.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
@@ -9702,6 +12112,11 @@ uuid@^8.0.0, uuid@^8.3.2:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+v8-compile-cache-lib@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+ integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
+
v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
@@ -9719,7 +12134,7 @@ valid-filename@^2.0.1:
dependencies:
filename-reserved-regex "^2.0.0"
-validate-npm-package-license@^3.0.1:
+validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
@@ -9727,7 +12142,14 @@ validate-npm-package-license@^3.0.1:
spdx-correct "^3.0.0"
spdx-expression-parse "^3.0.0"
-vary@~1.1.2:
+validate-npm-package-name@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+ integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==
+ dependencies:
+ builtins "^1.0.3"
+
+vary@^1, vary@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
@@ -9746,15 +12168,15 @@ vhost@^3.0.2:
resolved "https://registry.yarnpkg.com/vhost/-/vhost-3.0.2.tgz#2fb1decd4c466aa88b0f9341af33dc1aff2478d5"
integrity sha1-L7HezUxGaqiLD5NBrzPcGv8keNU=
-vsce@1.79.5:
- version "1.79.5"
- resolved "https://registry.yarnpkg.com/vsce/-/vsce-1.79.5.tgz#622d947aed97632d460e68ec774eac41f550102d"
- integrity sha512-KZFOthGwxWFwoGqwrkzfTfyCZGuniTofnJ1a/dCzQ2HP93u1UuCKrTQyGT+SuGHu8sNqdBYNe0hb9GC3qCN7fg==
+vsce@1.97.0:
+ version "1.97.0"
+ resolved "https://registry.yarnpkg.com/vsce/-/vsce-1.97.0.tgz#78490745c3ce4f18c390fc1319c0b1250095a153"
+ integrity sha512-5Rxj6qO0dN4FnzVS9G94osstx8R3r1OQP39G7WYERpoO9X+OSodVVkRhFDapPNjekfUNo+d5Qn7W1EtNQVoLCg==
dependencies:
- azure-devops-node-api "^7.2.0"
+ azure-devops-node-api "^11.0.1"
chalk "^2.4.2"
- cheerio "^1.0.0-rc.1"
- commander "^2.8.1"
+ cheerio "^1.0.0-rc.9"
+ commander "^6.1.0"
denodeify "^1.2.1"
glob "^7.0.6"
leven "^3.1.0"
@@ -9766,8 +12188,8 @@ vsce@1.79.5:
parse-semver "^1.1.1"
read "^1.0.7"
semver "^5.1.0"
- tmp "0.0.29"
- typed-rest-client "1.2.0"
+ tmp "^0.2.1"
+ typed-rest-client "^1.8.4"
url-join "^1.1.0"
yauzl "^2.3.1"
yazl "^2.2.2"
@@ -9808,10 +12230,20 @@ vscode-languageserver-types@3.15.1:
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz#17be71d78d2f6236d414f0001ce1ef4d23e6b6de"
integrity sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==
-vscode-languageserver-types@^3.15.1:
- version "3.16.0"
- resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247"
- integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==
+vscode-proxy-agent@^0.11.0:
+ version "0.11.0"
+ resolved "https://registry.yarnpkg.com/vscode-proxy-agent/-/vscode-proxy-agent-0.11.0.tgz#9dc8d2bb9d448f1e33bb1caef97a741289660f2f"
+ integrity sha512-Y5mHjDGq/OKOvKG0IwCYfj25cvQ2cLEil8ce8n55IZHRAP9RF3e1sKU4ZUNDB8X2NIpKwyltrWpK9tFFE/kc3g==
+ dependencies:
+ "@tootallnate/once" "^1.1.2"
+ agent-base "^6.0.2"
+ debug "^4.3.1"
+ get-uri "^3.0.2"
+ http-proxy-agent "^4.0.1"
+ https-proxy-agent "^5.0.0"
+ socks-proxy-agent "^5.0.0"
+ optionalDependencies:
+ vscode-windows-ca-certs "^0.3.0"
vscode-ripgrep@^1.2.4:
version "1.13.2"
@@ -9833,7 +12265,14 @@ vscode-uri@^2.1.1:
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz#c8d40de93eb57af31f3c715dd650e2ca2c096f1c"
integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==
-vscode-ws-jsonrpc@0.2.0, vscode-ws-jsonrpc@^0.2.0:
+vscode-windows-ca-certs@^0.3.0:
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/vscode-windows-ca-certs/-/vscode-windows-ca-certs-0.3.0.tgz#324e1f8ba842bbf048a39e7c0ee8fe655e9adfcc"
+ integrity sha512-CYrpCEKmAFQJoZNReOrelNL+VKyebOVRCqL9evrBlVcpWQDliliJgU5RggGS8FPGtQ3jAKLQt9frF0qlxYYPKA==
+ dependencies:
+ node-addon-api "^3.0.2"
+
+vscode-ws-jsonrpc@0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/vscode-ws-jsonrpc/-/vscode-ws-jsonrpc-0.2.0.tgz#5e9c26e10da54a1a235da7d59e74508bbcb8edd9"
integrity sha512-NE9HNRgPjCaPyTJvIudcpyIWPImxwRDtuTX16yks7SAiZgSXigxAiZOvSvVBGmD1G/OMfrFo6BblOtjVR9DdVA==
@@ -9860,6 +12299,11 @@ webidl-conversions@^3.0.0:
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+webidl-conversions@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
+ integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
+
webpack-cli@4.7.0:
version "4.7.0"
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz#3195a777f1f802ecda732f6c95d24c0004bc5a35"
@@ -9930,10 +12374,14 @@ whatwg-url@^5.0.0:
tr46 "~0.0.3"
webidl-conversions "^3.0.0"
-when@^3.7.7:
- version "3.7.8"
- resolved "https://registry.yarnpkg.com/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"
- integrity sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I=
+whatwg-url@^8.4.0:
+ version "8.7.0"
+ resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
+ integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
+ dependencies:
+ lodash "^4.7.0"
+ tr46 "^2.1.0"
+ webidl-conversions "^6.1.0"
which-boxed-primitive@^1.0.2:
version "1.0.2"
@@ -9963,7 +12411,7 @@ which@1.3.1, which@^1.2.8, which@^1.2.9, which@^1.3.1:
dependencies:
isexe "^2.0.0"
-which@^2.0.1:
+which@2.0.2, which@^2.0.1, which@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
@@ -9977,7 +12425,7 @@ wide-align@1.1.3:
dependencies:
string-width "^1.0.2 || 2"
-wide-align@^1.1.0:
+wide-align@^1.1.0, wide-align@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -10012,13 +12460,10 @@ worker-loader@^3.0.8:
loader-utils "^2.0.0"
schema-utils "^3.0.0"
-wrap-ansi@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
- integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
- dependencies:
- string-width "^1.0.1"
- strip-ansi "^3.0.1"
+workerpool@6.2.0:
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b"
+ integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==
wrap-ansi@^5.1.0:
version "5.1.0"
@@ -10038,12 +12483,21 @@ wrap-ansi@^6.2.0:
string-width "^4.1.0"
strip-ansi "^6.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==
+ dependencies:
+ 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=
-write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
+write-file-atomic@^2.0.0, write-file-atomic@^2.4.2:
version "2.4.3"
resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
@@ -10052,6 +12506,16 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
imurmurhash "^0.1.4"
signal-exit "^3.0.2"
+write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
+ 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==
+ dependencies:
+ imurmurhash "^0.1.4"
+ is-typedarray "^1.0.0"
+ signal-exit "^3.0.2"
+ typedarray-to-buffer "^3.1.5"
+
write-json-file@^2.2.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f"
@@ -10064,13 +12528,38 @@ write-json-file@^2.2.0:
sort-keys "^2.0.0"
write-file-atomic "^2.0.0"
-write-pkg@^3.1.0:
+write-json-file@^3.2.0:
version "3.2.0"
- resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.2.0.tgz#0e178fe97820d389a8928bc79535dbe68c2cff21"
- integrity sha512-tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw==
+ resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-3.2.0.tgz#65bbdc9ecd8a1458e15952770ccbadfcff5fe62a"
+ integrity sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==
dependencies:
+ detect-indent "^5.0.0"
+ graceful-fs "^4.1.15"
+ make-dir "^2.1.0"
+ pify "^4.0.1"
sort-keys "^2.0.0"
- write-json-file "^2.2.0"
+ write-file-atomic "^2.4.2"
+
+write-json-file@^4.3.0:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-4.3.0.tgz#908493d6fd23225344af324016e4ca8f702dd12d"
+ integrity sha512-PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ==
+ dependencies:
+ detect-indent "^6.0.0"
+ graceful-fs "^4.1.15"
+ is-plain-obj "^2.0.0"
+ make-dir "^3.0.0"
+ sort-keys "^4.0.0"
+ write-file-atomic "^3.0.0"
+
+write-pkg@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-4.0.0.tgz#675cc04ef6c11faacbbc7771b24c0abbf2a20039"
+ integrity sha512-v2UQ+50TNf2rNHJ8NyWttfm/EJUBWMJcx6ZTYZr6Qp52uuegWw/lBkCtCbnYZEmPRNL61m+u67dAmGxo+HTULA==
+ dependencies:
+ sort-keys "^2.0.0"
+ type-fest "^0.4.1"
+ write-json-file "^3.2.0"
write@1.0.3:
version "1.0.3"
@@ -10079,10 +12568,10 @@ write@1.0.3:
dependencies:
mkdirp "^0.5.1"
-ws@7.4.6:
- version "7.4.6"
- resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
- integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
+ws@8.5.0:
+ version "8.5.0"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
+ integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
ws@^6.1.0:
version "6.2.2"
@@ -10096,6 +12585,16 @@ ws@^7.1.2:
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
+ws@^7.4.6:
+ version "7.5.9"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
+ integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+
+ws@~8.2.3:
+ version "8.2.3"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
+ integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==
+
xdg-basedir@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-2.0.0.tgz#edbc903cc385fc04523d966a335504b5504d1bd2"
@@ -10114,36 +12613,51 @@ xdg-trashdir@^2.1.1:
user-home "^2.0.0"
xdg-basedir "^2.0.0"
+xml@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+ integrity sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==
+
+xmlhttprequest-ssl@~2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67"
+ integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
+
+xregexp@2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
+ integrity sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA==
+
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==
-xterm-addon-fit@~0.5.0:
+xterm-addon-fit@^0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596"
integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ==
-xterm-addon-search@~0.8.0:
+xterm-addon-search@^0.8.2:
version "0.8.2"
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.8.2.tgz#be7aa74d5ff12c901707c6ff674229f214318032"
integrity sha512-I1863mjn8P6uVrqm/X+btalVsqjAKLhnhpbP7SavAOpEkI1jJhbHU2UTp7NjeRtcKTks6UWk/ycgds5snDSejg==
-xterm@~4.11.0:
- version "4.11.0"
- resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.11.0.tgz#d7dabc7af5299579e4663fedf2b3a179af9aaff9"
- integrity sha512-NeJH909WTO2vth/ZlC0gkP3AGzupbvVHVlmtrpBw56/sGFXaF9bNdKgqKa3tf8qbGvXMzL2JhCcHVklqFztIRw==
-
-y18n@^3.2.1:
- version "3.2.2"
- resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
- integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
+xterm@^4.16.0:
+ version "4.19.0"
+ resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0.tgz#c0f9d09cd61de1d658f43ca75f992197add9ef6d"
+ integrity sha512-c3Cp4eOVsYY5Q839dR5IejghRPpxciGmLWWaP9g+ppfMeBChMeLa1DCA+pmX/jyDZ+zxFOmlJL/82qVdayVoGQ==
y18n@^4.0.0:
version "4.0.3"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+y18n@^5.0.5:
+ version "5.0.8"
+ resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+ integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
yallist@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
@@ -10159,6 +12673,11 @@ yallist@^4.0.0:
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+yaml@^1.10.0:
+ version "1.10.2"
+ resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+ integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
+
yargs-parser@13.1.2, yargs-parser@^13.1.2:
version "13.1.2"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
@@ -10167,13 +12686,10 @@ yargs-parser@13.1.2, yargs-parser@^13.1.2:
camelcase "^5.0.0"
decamelize "^1.2.0"
-yargs-parser@^15.0.1:
- version "15.0.3"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.3.tgz#316e263d5febe8b38eef61ac092b33dfcc9b1115"
- integrity sha512-/MVEVjTXy/cGAjdtQf8dW3V9b97bPN7rNn8ETj6BmAQL7ibC7O1Q9SPJbGjgh3SlwoBNXMzj/ZGIj8mBgl12YA==
- dependencies:
- camelcase "^5.0.0"
- decamelize "^1.2.0"
+yargs-parser@20.2.4:
+ version "20.2.4"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
+ integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
yargs-parser@^18.1.2:
version "18.1.3"
@@ -10183,12 +12699,15 @@ yargs-parser@^18.1.2:
camelcase "^5.0.0"
decamelize "^1.2.0"
-yargs-parser@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
- integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
- dependencies:
- camelcase "^4.1.0"
+yargs-parser@^20.2.2, yargs-parser@^20.2.3:
+ version "20.2.9"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+ integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
+yargs-parser@^21.0.0:
+ version "21.1.1"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+ integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
yargs-unparser@1.6.0:
version "1.6.0"
@@ -10199,6 +12718,16 @@ yargs-unparser@1.6.0:
lodash "^4.17.15"
yargs "^13.3.0"
+yargs-unparser@2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
+ integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==
+ dependencies:
+ camelcase "^6.0.0"
+ decamelize "^4.0.0"
+ flat "^5.0.2"
+ is-plain-obj "^2.1.0"
+
yargs@13.3.2, yargs@^13.3.0:
version "13.3.2"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
@@ -10215,22 +12744,18 @@ yargs@13.3.2, yargs@^13.3.0:
y18n "^4.0.0"
yargs-parser "^13.1.2"
-yargs@^14.2, yargs@^14.2.0:
- version "14.2.3"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.3.tgz#1a1c3edced1afb2a2fea33604bc6d1d8d688a414"
- integrity sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==
+yargs@16.2.0, yargs@^16.2.0:
+ version "16.2.0"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+ integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
dependencies:
- cliui "^5.0.0"
- decamelize "^1.2.0"
- find-up "^3.0.0"
- get-caller-file "^2.0.1"
+ cliui "^7.0.2"
+ escalade "^3.1.1"
+ get-caller-file "^2.0.5"
require-directory "^2.1.1"
- require-main-filename "^2.0.0"
- set-blocking "^2.0.0"
- string-width "^3.0.0"
- which-module "^2.0.0"
- y18n "^4.0.0"
- yargs-parser "^15.0.1"
+ string-width "^4.2.0"
+ y18n "^5.0.5"
+ yargs-parser "^20.2.2"
yargs@^15.3.1:
version "15.4.1"
@@ -10249,24 +12774,18 @@ yargs@^15.3.1:
y18n "^4.0.0"
yargs-parser "^18.1.2"
-yargs@^8.0.2:
- version "8.0.2"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
- integrity sha1-YpmpBVsc78lp/355wdkY3Osiw2A=
- dependencies:
- camelcase "^4.1.0"
- cliui "^3.2.0"
- decamelize "^1.1.1"
- get-caller-file "^1.0.1"
- os-locale "^2.0.0"
- read-pkg-up "^2.0.0"
+yargs@^17.0.1:
+ version "17.5.1"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e"
+ integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==
+ dependencies:
+ cliui "^7.0.2"
+ escalade "^3.1.1"
+ get-caller-file "^2.0.5"
require-directory "^2.1.1"
- require-main-filename "^1.0.1"
- set-blocking "^2.0.0"
- string-width "^2.0.0"
- which-module "^2.0.0"
- y18n "^3.2.1"
- yargs-parser "^7.0.0"
+ string-width "^4.2.3"
+ y18n "^5.0.5"
+ yargs-parser "^21.0.0"
yauzl@^2.10.0, yauzl@^2.3.1, yauzl@^2.4.2:
version "2.10.0"
@@ -10283,6 +12802,16 @@ yazl@^2.2.2:
dependencies:
buffer-crc32 "~0.2.3"
+yeast@0.1.2:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+ integrity sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==
+
+yn@3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+ integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
yocto-queue@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..a60b01c1
--- /dev/null
+++ b/package.json
@@ -0,0 +1,30 @@
+{
+ "private": true,
+ "description": "Eclipse EMF.cloud Coffee Editor Parent",
+ "version": "0.1.0",
+ "engines": {
+ "yarn": ">=1.7.0",
+ "node": ">=16"
+ },
+ "license": "(EPL-2.0 OR MIT)",
+ "contributors": [
+ {
+ "name": "Eclipse EMF.cloud Project",
+ "email": "emfcloud-dev@eclipse.org",
+ "url": "https://projects.eclipse.org/projects/ecd.emfcloud"
+ }
+ ],
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/eclipse-emfcloud/coffee-editor.git"
+ },
+ "homepage": "https://www.eclipse.org/emfcloud/",
+ "bugs": "https://github.com/eclipse-emfcloud/coffee-editor/issues",
+ "scripts": {
+ "build": "yarn build:backend && yarn build:client",
+ "build:client": "yarn --cwd client --ignore-engines",
+ "build:backend": "cd backend/releng/org.eclipse.emfcloud.coffee.parent && mvn clean install",
+ "start": "yarn --cwd client start",
+ "start:debug": "yarn --cwd client start:debug"
+ }
+}
\ No newline at end of file
diff --git a/run.sh b/run.sh
deleted file mode 100755
index a92586cf..00000000
--- a/run.sh
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/bash
-set -e
-
-echo "$(date +"[%T.%3N]") Evaluate Options... "
-buildBackend='false'
-copyBackend='false'
-buildFrontend='false'
-forceFrontend='false'
-runFrontend='false'
-
-if [[ "$1" == "" ]]; then
- buildBackend='true'
- copyBackend='true'
- buildFrontend='true'
- runFrontend='true'
-fi
-
-if [[ ${#1} -gt 2 ]]; then
- if [[ "$1" == -*"b"* ]]; then
- buildBackend='true'
- fi
- if [[ "$1" == -*"c"* ]]; then
- copyBackend='true'
- fi
-
- if [[ "$1" == -*"f"* ]]; then
- buildFrontend='true'
- fi
- if [[ "$1" == -*"r"* ]]; then
- runFrontend='true'
- fi
- if [[ "$1" == -*"ff"* ]]; then
- forceFrontend='true'
- fi
-fi
-
-while [ "$1" != "" ]; do
- case $1 in
- -b | --backend ) buildBackend='true'
- ;;
- -c | --copy ) copyBackend='true'
- ;;
- -f | --frontend ) buildFrontend='true'
- ;;
- -ff | --forcefrontend ) forceFrontend='true'
- ;;
- -r | --run ) runFrontend='true'
- ;;
- esac
- shift
-done
-
-[[ "$buildBackend" == "true" ]] && echo " Build Backend (-b)" || echo " Do not build Backend (-b)"
-[[ "$copyBackend" == "true" ]] && echo " Copy Backend (-c)" || echo " Do not copy Backend (-c)"
-[[ "$forceFrontend" == "true" ]] && echo " Remove yarn.lock (-ff)" || echo " Do not remove yarn.lock (-ff)"
-[[ "$buildFrontend" == "true" ]] && echo " Build Frontend (-f)" || echo " Do not build Frontend (-f)"
-[[ "$runFrontend" == "true" ]] && echo " Run Frontend (-r)" || echo " Do not run Frontend (-r)"
-
-if [ "$buildBackend" == "true" ]; then
- echo "$(date +"[%T.%3N]") Build backend products"
- cd backend/releng/org.eclipse.emfcloud.coffee.parent/
- mvn clean install
- cd ../../../
-fi
-
-if [ "$copyBackend" == "true" ]; then
- productPath=''
- if [[ "$OSTYPE" == "linux-gnu" ]]; then
- productPath='linux/gtk'
- echo "Running on Linux"
- elif [[ "$OSTYPE" == "darwin"* ]]; then
- # Mac OSX
- productPath='macosx/cocoa'
- echo "Running on Mac"
- elif [[ "$OSTYPE" == "cygwin" ]]; then
- # POSIX compatibility layer and Linux environment emulation for Windows
- productPath='win32\win32'
- echo "Running on Windows with Cygwin"
- elif [[ "$OSTYPE" == "msys" ]]; then
- # Lightweight shell and GNU utilities compiled for Windows (part of MinGW)
- productPath='win32\win32'
- echo "Running on Windows with Msys"
- fi
- echo "$productPath"
- echo "$(date +"[%T.%3N]") Copy built products..."
-
- # Java Generation
- inputCodeGen=backend/releng/org.eclipse.emfcloud.coffee.product/target/products/org.eclipse.emfcloud.coffee.product.codegen/$productPath/x86_64
- outputCodeGen=web/coffee-java-extension/server
- echo " $(date +"[%T.%3N]") Copy CodeGen to '$outputCodeGen'."
- rm -rf $outputCodeGen && mkdir -p $outputCodeGen && cp -rf $inputCodeGen $outputCodeGen
-
- # C++ Generation
- inputCppCodeGen=backend/releng/org.eclipse.emfcloud.coffee.product/target/products/org.eclipse.emfcloud.coffee.product.codegen.cpp/$productPath/x86_64
- outputCppCodeGen=web/coffee-cpp-extension/server
- echo " $(date +"[%T.%3N]") Copy CPP CodeGen to '$outputCppCodeGen'."
- rm -rf $outputCppCodeGen && mkdir -p $outputCppCodeGen && cp -rf $inputCppCodeGen $outputCppCodeGen
-
- inputWorkflowAnalyzer=backend/releng/org.eclipse.emfcloud.coffee.product/target/products/org.eclipse.emfcloud.coffee.product.workflow.analyzer/$productPath/x86_64
- outputWorkflowAnalyzer=web/coffee-workflow-analyzer/server
- echo " $(date +"[%T.%3N]") Copy WorkflowAnalyzer to '$outputWorkflowAnalyzer'."
- rm -rf $outputWorkflowAnalyzer && mkdir -p $outputWorkflowAnalyzer && cp -rf $inputWorkflowAnalyzer $outputWorkflowAnalyzer
-
- inputWorkflowDSL=backend/releng/org.eclipse.emfcloud.coffee.product/target/products/org.eclipse.emfcloud.coffee.product.workflow.dsl/$productPath/x86_64
- outputWorkflowDSL=web/coffee-server/server/lsp
- echo " $(date +"[%T.%3N]") Copy WorkflowDSL to '$outputWorkflowDSL'."
- rm -rf $outputWorkflowDSL && mkdir -p $outputWorkflowDSL && cp -rf $inputWorkflowDSL $outputWorkflowDSL
-
- inputWorkflowGLSP=backend/releng/org.eclipse.emfcloud.coffee.product/target/products/org.eclipse.emfcloud.coffee.product.workflow.glsp.server/$productPath/x86_64
- outputWorkflowGLSP=web/coffee-server/server/glsp
- echo " $(date +"[%T.%3N]") Copy WorkflowGLSPServer to '$outputWorkflowGLSP'."
- rm -rf $outputWorkflowGLSP && mkdir -p $outputWorkflowGLSP && cp -rf $inputWorkflowGLSP $outputWorkflowGLSP
-
- inputCoffeeMS=backend/releng/org.eclipse.emfcloud.coffee.product/target/products/org.eclipse.emfcloud.coffee.product.modelserver/$productPath/x86_64
- outputCoffeeMS=web/coffee-server/server/model
- echo " $(date +"[%T.%3N]") Copy CoffeeModelServer to '$outputCoffeeMS'."
- rm -rf $outputCoffeeMS && mkdir -p $outputCoffeeMS && cp -rf $inputCoffeeMS $outputCoffeeMS
-
-
- echo "$(date +"[%T.%3N]") Copy finished."
-fi
-
-if [ "$downloadServers" == "true" ]; then
- cd ./web/coffee-server/scripts/
- ./download-server.sh
- cd ../../../
-fi
-
-if [ "$forceFrontend" == "true" ]; then
- cd web/
- rm -f ./yarn.lock
- cd ..
-fi
-
-if [ "$buildFrontend" == "true" ]; then
- cd web/
- yarn cache clean
- yarn --ignore-engines --unsafe-perm
- cd ..
-fi
-
-if [ "$runFrontend" == "true" ]; then
- workspace=$(pwd)
- (sleep 5 && x-www-browser http://127.1:3000/#/${workspace:1}/backend/examples/SuperBrewer3000)&
- cd web/
- yarn start
-fi
diff --git a/web/.eslintrc.js b/web/.eslintrc.js
deleted file mode 100644
index 319aa7e7..00000000
--- a/web/.eslintrc.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/** @type {import('eslint').Linter.Config} */
-module.exports = {
- root: true,
- extends: ['prettier', './configs/base.eslintrc.json', './configs/warnings.eslintrc.json', './configs/errors.eslintrc.json'],
- ignorePatterns: ['**/{node_modules,lib}', 'plugins'],
- parserOptions: {
- tsconfigRootDir: __dirname,
- project: 'tsconfig.json'
- }
-};
diff --git a/web/.prettierrc.json b/web/.prettierrc.json
deleted file mode 100644
index f6a0a09d..00000000
--- a/web/.prettierrc.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "$schema": "http://json.schemastore.org/prettierrc",
- "singleQuote": true,
- "jsxSingleQuote": true,
- "arrowParens": "avoid",
- "trailingComma": "none",
- "endOfLine": "lf",
- "printWidth": 140,
- "tabWidth": 4,
- "overrides": [
- {
- "files": [
- "*.json",
- "*.yml"
- ],
- "options": {
- "printWidth": 100,
- "tabWidth": 2
- }
- }
- ]
-}
diff --git a/web/browser-app/package.json b/web/browser-app/package.json
deleted file mode 100644
index 73da5814..00000000
--- a/web/browser-app/package.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
- "private": true,
- "license": "(EPL-2.0 OR MIT)",
- "name": "browser-app",
- "version": "0.7.0",
- "contributors": [
- {
- "name": "Eclipse EMF.cloud Project",
- "email": "emfcloud-dev@eclipse.org",
- "url": "https://projects.eclipse.org/projects/ecd.emfcloud"
- }
- ],
- "repository": {
- "type": "git",
- "url": "https://github.com/eclipse-emfcloud/coffee-editor.git"
- },
- "homepage": "https://www.eclipse.org/emfcloud/",
- "bugs": "https://github.com/eclipse-emfcloud/coffee-editor/issues",
- "dependencies": {
- "@theia/callhierarchy": "^1.0.0",
- "@theia/console": "^1.0.0",
- "@theia/core": "^1.0.0",
- "@theia/debug": "^1.0.0",
- "@theia/editor": "^1.0.0",
- "@theia/file-search": "^1.0.0",
- "@theia/filesystem": "^1.0.0",
- "@theia/keymaps": "^1.0.0",
- "@theia/markers": "^1.0.0",
- "@theia/messages": "^1.0.0",
- "@theia/mini-browser": "^1.0.0",
- "@theia/monaco": "^1.0.0",
- "@theia/navigator": "^1.0.0",
- "@theia/outline-view": "^1.0.0",
- "@theia/output": "^1.0.0",
- "@theia/plugin-dev": "^1.0.0",
- "@theia/plugin-ext": "^1.0.0",
- "@theia/plugin-ext-vscode": "^1.0.0",
- "@theia/plugin-metrics": "^1.0.0",
- "@theia/preferences": "^1.0.0",
- "@theia/process": "^1.0.0",
- "@theia/scm": "^1.0.0",
- "@theia/scm-extra": "^1.0.0",
- "@theia/search-in-workspace": "^1.0.0",
- "@theia/task": "^1.0.0",
- "@theia/terminal": "^1.0.0",
- "@theia/typehierarchy": "^1.0.0",
- "@theia/userstorage": "^1.0.0",
- "@theia/variable-resolver": "^1.0.0",
- "@theia/vsx-registry": "^1.0.0",
- "@theia/workspace": "^1.0.0",
- "coffee-cpp-extension": "0.7.0",
- "coffee-comparison": "0.7.0",
- "coffee-editor-extension": "0.7.0",
- "coffee-java-extension": "0.7.0",
- "coffee-server": "0.7.0",
- "coffee-welcome-page": "0.7.0",
- "coffee-workflow-glsp-editor": "0.7.0",
- "coffee-workflow-analyzer": "0.7.0"
- },
- "devDependencies": {
- "@theia/cli": "^1.0.0"
- },
- "scripts": {
- "prepare": "yarn run download:plugins && theia build --mode development",
- "start": "export WF_CONFIG_LSP=localhost:5017 && theia start --WORKFLOW_NOTATION_LSP=5008 --hostname=0.0.0.0 --port=3000 --root-dir=../../backend/examples/SuperBrewer3000 --plugins=local-dir:./plugins",
- "debug": "export WF_CONFIG_LSP=localhost:5017 && theia start --WORKFLOW_NOTATION_LSP=5008 --port=3000 --root-dir=../../backend/examples/SuperBrewer3000 --loglevel=debug --plugins=local-dir:./plugins --debug",
- "watch": "theia build --watch --mode development",
- "download:plugins": "theia download:plugins"
- },
- "theia": {
- "target": "browser"
- },
- "theiaPluginsDir": "plugins",
- "theiaPlugins": {
- "java-debug": "https://github.com/microsoft/vscode-java-debug/releases/download/0.22.0/vscode-java-debug-0.22.0.vsix",
- "java-lsp": "https://download.jboss.org/jbosstools/static/jdt.ls/stable/java-0.50.0-1825.vsix",
- "vscode-builtin-java": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/java-1.39.1-prel.vsix",
- "cdt-gdb-vscode": "https://open-vsx.org/api/eclipse-cdt/cdt-gdb-vscode/0.0.91/file/eclipse-cdt.cdt-gdb-vscode-0.0.91.vsix",
- "vscode-builtin-cpp": "https://open-vsx.org/api/vscode/cpp/1.45.1/file/vscode.cpp-1.45.1.vsix",
- "vscode-clangd": "https://open-vsx.org/api/llvm-vs-code-extensions/vscode-clangd/0.1.6/file/llvm-vs-code-extensions.vscode-clangd-0.1.6.vsix",
- "vscode-cmake": "https://open-vsx.org/api/ms-vscode/cmake-tools/1.7.0/file/ms-vscode.cmake-tools-1.7.0.vsix"
- }
-}
\ No newline at end of file
diff --git a/web/coffee-comparison/package.json b/web/coffee-comparison/package.json
deleted file mode 100644
index efdefde3..00000000
--- a/web/coffee-comparison/package.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "name": "coffee-comparison",
- "keywords": [
- "theia-extension"
- ],
- "version": "0.7.0",
- "files": [
- "lib",
- "src"
- ],
- "dependencies": {
- "@eclipsesource/comparison-extension": "0.0.1-next.20220414-105416",
- "coffee-workflow-glsp-editor": "0.7.0",
- "@theia/core": "latest",
- "@theia/git": "latest",
- "@theia/filesystem": "latest"
- },
- "devDependencies": {
- "rimraf": "^2.6.1",
- "typescript": "^4.2.3"
- },
- "scripts": {
- "prepare": "yarn run clean && yarn run build",
- "clean": "rimraf lib",
- "build": "tsc && yarn run lint",
- "lint": "eslint -c ../.eslintrc.js --ext .ts,.tsx ./src",
- "watch": "tsc -w"
- },
- "theiaExtensions": [
- {
- "frontend": "lib/browser/coffee-comparison-frontend-module",
- "backend": "lib/node/coffee-comparison-backend-module"
- }
- ]
-}
diff --git a/web/coffee-cpp-extension/src/node/backend-extension.ts b/web/coffee-cpp-extension/src/node/backend-extension.ts
deleted file mode 100644
index 0badc0ab..00000000
--- a/web/coffee-cpp-extension/src/node/backend-extension.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2021 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- */
-import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core';
-import { BackendApplicationContribution } from '@theia/core/lib/node';
-import { ContainerModule } from 'inversify';
-
-import { CODEGEN_SERVICE_PATH, CodeGenCppServer } from '../common/generate-protocol';
-import { CoffeeCodeGenCppServer } from './coffee-codegen-server';
-
-export default new ContainerModule(bind => {
- bind(CoffeeCodeGenCppServer).toSelf().inSingletonScope();
- bind(BackendApplicationContribution).toService(CoffeeCodeGenCppServer);
- bind(ConnectionHandler)
- .toDynamicValue(
- ctx => new JsonRpcConnectionHandler(CODEGEN_SERVICE_PATH, () => ctx.container.get(CoffeeCodeGenCppServer))
- )
- .inSingletonScope();
-});
diff --git a/web/coffee-cpp-extension/src/node/coffee-codegen-server.ts b/web/coffee-cpp-extension/src/node/coffee-codegen-server.ts
deleted file mode 100644
index 7eea929e..00000000
--- a/web/coffee-cpp-extension/src/node/coffee-codegen-server.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2021 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- */
-import { ILogger } from '@theia/core';
-import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';
-import { RawProcess, RawProcessFactory } from '@theia/process/lib/node/raw-process';
-import { Application } from 'express';
-import * as glob from 'glob';
-import { inject, injectable } from 'inversify';
-import * as path from 'path';
-
-import { CodeGenCppServer } from '../common/generate-protocol';
-
-@injectable()
-export class CoffeeCodeGenCppServer implements CodeGenCppServer, BackendApplicationContribution {
- constructor(
- @inject(RawProcessFactory) protected readonly processFactory: RawProcessFactory,
- @inject(ILogger) private readonly logger: ILogger
- ) {}
-
- generateCode(sourceFile: string, targetFolder: string, packageName: string): Promise {
- const serverPath = path.resolve(__dirname, '..', '..', 'server');
- const jarPaths = glob.sync('**/plugins/org.eclipse.equinox.launcher_*.jar', { cwd: serverPath });
- if (jarPaths.length === 0) {
- throw new Error('The Java server launcher is not found.');
- }
-
- const jarPath = path.resolve(serverPath, jarPaths[0]);
-
- const command = 'java';
- const args: string[] = [];
-
- args.push('-jar', jarPath, '-targetFolder', targetFolder, '-source', sourceFile, '-packageName', packageName);
-
- return new Promise(resolve => {
- const process = this.spawnProcess(command, args);
- if (process === undefined || process.process === undefined) {
- resolve('Process not spawned');
- return;
- }
- process.process.on('exit', code => {
- switch (code) {
- case 0:
- resolve('OK');
- break;
- case -10:
- resolve('Target Folder Parameter missing');
- break;
- case -11:
- resolve('Source File Parameter missing');
- break;
- case -12:
- resolve('Package Name Parameter missing');
- break;
- case -20:
- resolve('Encoding not found, check Server Log!');
- break;
- case -30:
- resolve('IO Exception occurred, check Server Log!');
- break;
- default:
- resolve('UNKNOWN ERROR');
- break;
- }
- });
- });
- }
-
- onStop(app?: Application): void {
- this.dispose();
- }
-
- dispose(): void {
- // do nothing
- }
-
- setClient(): void {
- // do nothing
- }
-
- private spawnProcess(command: string, args?: string[]): RawProcess | undefined {
- const rawProcess = this.processFactory({ command, args });
- if (rawProcess.process === undefined) {
- return undefined;
- }
- rawProcess.process.on('error', this.onDidFailSpawnProcess.bind(this));
- const stderr = rawProcess.process.stderr;
- if (stderr) {
- stderr.on('data', this.logError.bind(this));
- }
- return rawProcess;
- }
-
- protected onDidFailSpawnProcess(error: Error): void {
- this.logger.error(error);
- }
-
- protected logError(data: string | Buffer): void {
- if (data) {
- this.logger.error(`Code Gen: ${data}`);
- }
- }
-}
diff --git a/web/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-editor-widget.tsx b/web/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-editor-widget.tsx
deleted file mode 100644
index 960bc74b..00000000
--- a/web/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-editor-widget.tsx
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- * Copyright (c) 2019-2022 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- */
-import {
- AddCommand,
- CommandExecutionResult,
- CommandExecutionType,
- ModelServerClient,
- ModelServerCommand,
- ModelServerMessage,
- ModelServerReferenceDescription,
- ModelServerSubscriptionService,
- RemoveCommand,
- SetCommand
-} from '@eclipse-emfcloud/modelserver-theia/lib/common';
-import {
- AddCommandProperty,
- BaseTreeEditorWidget,
- DetailFormWidget,
- MasterTreeWidget,
- NavigatableTreeEditorOptions,
- NavigatableTreeEditorWidget,
- TreeEditor
-} from '@eclipse-emfcloud/theia-tree-editor';
-import { Title, TreeNode, Widget } from '@theia/core/lib/browser';
-import { ILogger } from '@theia/core/lib/common';
-import URI from '@theia/core/lib/common/uri';
-import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
-import { inject, injectable } from 'inversify';
-import { get, isEqual, isObject, reduce } from 'lodash';
-
-import { CoffeeModel } from './coffee-model';
-import { AddAutomatedTaskCommand, AddDecisionNodeCommand, AddManualTaskCommand, AddMergeNodeCommand, ID_PROP } from './model-server';
-
-interface PathSegment {
- property: string;
- index?: string;
-}
-
-@injectable()
-export class CoffeeTreeEditorWidget extends NavigatableTreeEditorWidget {
- private delayedRefresh = false;
- private idToPath: Map = new Map();
-
- constructor(
- @inject(MasterTreeWidget) readonly treeWidget: MasterTreeWidget,
- @inject(DetailFormWidget) readonly formWidget: DetailFormWidget,
- @inject(WorkspaceService) readonly workspaceService: WorkspaceService,
- @inject(ILogger) readonly logger: ILogger,
- @inject(NavigatableTreeEditorOptions)
- protected readonly options: NavigatableTreeEditorOptions,
- @inject(ModelServerClient)
- private readonly modelServerApi: ModelServerClient,
- @inject(ModelServerSubscriptionService)
- private readonly subscriptionService: ModelServerSubscriptionService
- ) {
- super(treeWidget, formWidget, workspaceService, logger, CoffeeTreeEditorConstants.WIDGET_ID, options);
-
- this.subscriptionService.onDirtyStateListener(modelServerMessage => {
- this.dirty = modelServerMessage.data as boolean;
- this.onDirtyChangedEmitter.fire();
- });
-
- this.subscriptionService.onFullUpdateListener(modelServerMessage => {
- this.instanceData = undefined;
- this.instanceData = modelServerMessage.data;
-
- this.treeWidget
- .setData({ error: false, data: this.instanceData })
- .then(() => this.treeWidget.select(this.getOldSelectedPath()));
-
- if (!this.isVisible) {
- this.delayedRefresh = true;
- }
- });
-
- this.subscriptionService.onIncrementalUpdateListener((modelServerMessage: ModelServerMessage) => {
- if (CommandExecutionResult.is(modelServerMessage.data)) {
- this.updateViaCommand(modelServerMessage.data);
- }
- });
-
- this.loadModel();
-
- this.modelServerApi.subscribe(this.getModelIDToRequest());
-
- // see https://developer.mozilla.org/en-US/docs/Web/API/WindowEventHandlers/onbeforeunload
- window.onbeforeunload = () => this.dispose();
- }
-
- private loadModel(initialLoad = true): void {
- this.modelServerApi.get(this.getModelIDToRequest(), 'json').then(response => {
- if (response.statusCode === 200) {
- if (isEqual(this.instanceData, response.body)) {
- return;
- }
- this.instanceData = undefined;
- this.instanceData = response.body;
- this.treeWidget
- .setData({ error: false, data: this.instanceData })
- .then(() => this.initIdMap())
- .then(() => (initialLoad ? this.treeWidget.selectFirst() : this.treeWidget.select(this.getOldSelectedPath())));
- this.update();
- return;
- }
- this.treeWidget.setData({ error: !!response.statusMessage });
- this.renderError(
- `An error occurred when requesting '
- ${this.getModelIDToRequest()}' - Status ${response.statusCode} ${response.statusMessage}`
- );
- this.instanceData = undefined;
- return;
- });
- }
-
- private getOldSelectedPath(): string[] {
- const paths: string[] = [];
- if (!this.selectedNode) {
- return paths;
- }
- paths.push(this.selectedNode.name);
- let parent = this.selectedNode.parent;
- while (parent) {
- parent.name && paths.push(parent.name);
- parent = parent.parent;
- }
- paths.splice(paths.length - 1, 1);
- return paths;
- }
-
- /** Initializes the map from element ids to their path segments */
- private initIdMap(): void {
- this.idToPath.clear();
- const machineNode = (this.treeWidget.model.root as TreeEditor.RootNode).children[0] as TreeEditor.Node;
- this.idToPath.set(machineNode.jsonforms.data[ID_PROP], []);
- const recursion = (node: TreeEditor.Node, path: PathSegment[]): void => {
- const nodePath = [
- ...path,
- {
- property: node.jsonforms.property,
- index: node.jsonforms.index
- }
- ];
- this.idToPath.set(node.jsonforms.data[ID_PROP], nodePath);
- node.children.forEach(child => recursion(child as TreeEditor.Node, nodePath));
- };
- machineNode.children.forEach(node => recursion(node as TreeEditor.Node, []));
- }
-
- protected async updateViaCommand(commandResult: CommandExecutionResult): Promise {
- switch (commandResult.type) {
- case CommandExecutionType.EXECCUTE:
- case CommandExecutionType.UNDO:
- case CommandExecutionType.REDO: {
- if (commandResult.changeDescription.objectChanges && commandResult.changeDescription.objectChanges.length > 0) {
- const changedObject = commandResult.changeDescription.objectChanges[0];
- const relativeRefURI = new URI(this.getRelativeModelUri(changedObject.key.$ref.replace('file:', '')));
- if (this.isCurrentModelUri(relativeRefURI)) {
- await new Promise(f => setTimeout(f, 250));
- this.loadModel(false);
- }
- }
- this.update();
- break;
- }
- }
- }
-
- protected getRelativeModelUri(sourceUri: string): string {
- const workspaceUri = this.workspaceService.getWorkspaceRootUri(new URI(sourceUri));
- if (workspaceUri) {
- const workspaceString = workspaceUri.toString().replace('file://', '');
- const rootUriLength = workspaceString.length;
- return sourceUri.substring(rootUriLength + 1);
- }
- return '';
- }
-
- protected isCurrentModelUri(uri: URI): boolean {
- return uri.path.toString() === '/' + this.getModelIDToRequest();
- }
-
- public save(): void {
- this.logger.info('Save data to server');
- this.modelServerApi.save(this.getModelIDToRequest());
- }
-
- protected async deleteNode(node: Readonly): Promise {
- const removeCommand = new RemoveCommand(
- this.getNodeDescription(node.parent as TreeEditor.Node),
- node.jsonforms.property,
- node.jsonforms.index ? [Number(node.jsonforms.index)] : []
- );
- this.modelServerApi.edit(this.getModelIDToRequest(), removeCommand);
- }
-
- protected async addNode({ node, type, property }: AddCommandProperty): Promise {
- let addCommand;
- if (type === CoffeeModel.Type.AutomaticTask) {
- addCommand = new AddAutomatedTaskCommand();
- } else if (type === CoffeeModel.Type.ManualTask) {
- addCommand = new AddManualTaskCommand();
- } else if (type === CoffeeModel.Type.Decision) {
- addCommand = new AddDecisionNodeCommand();
- } else if (type === CoffeeModel.Type.Merge) {
- addCommand = new AddMergeNodeCommand();
- } else {
- addCommand = new AddCommand(this.getNodeDescription(node), property, [{ eClass: type }]);
- }
- this.modelServerApi.edit(this.getModelIDToRequest(), addCommand);
- }
-
- dispose(): void {
- this.modelServerApi.unsubscribe(this.getModelIDToRequest());
- super.dispose();
- }
-
- protected async handleFormUpdate(jsonFormsData: any, node: TreeEditor.Node): Promise {
- if (
- jsonFormsData[ID_PROP] === this.selectedNode.jsonforms.data[ID_PROP] &&
- !isEqual(jsonFormsData, this.selectedNode.jsonforms.data)
- ) {
- const changedFeatures = this.getObjectDiff(jsonFormsData, this.selectedNode.jsonforms.data);
- if (changedFeatures.length > 0) {
- const editCommand = this.createSetCommand(changedFeatures[0], jsonFormsData);
- this.modelServerApi.edit(this.getModelIDToRequest(), editCommand);
- } else {
- // TODO temporary workaround to add and remove ram objects from the ram array
- // it is not really stable yet, please re-evaluate if deepDiff does return the actual added/removed objects
- // removing objects is currently disabled via CSS, but the remove command is already working if the correct index can be determined
- const addedRamElement = this.deepDiff(this.selectedNode.jsonforms.data, jsonFormsData);
- if (addedRamElement['ram'] && addedRamElement['ram'].length > 0) {
- const addRamCommand = this.createAddRamCommand(jsonFormsData);
- this.modelServerApi.edit(this.getModelIDToRequest(), addRamCommand);
- } else {
- const removedRamElement = this.deepDiff(jsonFormsData, this.selectedNode.jsonforms.data);
- if (removedRamElement) {
- // TODO ensure that ram object and not array is handed over to createRemoveRamCommand
- const removeRamCommand = this.createRemoveRamCommand(jsonFormsData);
- this.modelServerApi.edit(this.getModelIDToRequest(), removeRamCommand);
- }
- }
- }
- }
- }
-
- protected deepDiff(o1: any, o2: any): any {
- return Object.keys(o2).reduce((diff, key) => {
- if (o1[key] === o2[key]) {
- return diff;
- }
- return {
- ...diff,
- [key]: o2[key]
- };
- }, {});
- }
-
- private getObjectDiff(object: Record, base: Record): string[] {
- function difference(obj1: any, obj2: any, path: string): any {
- obj1 = obj1 || {};
- obj2 = obj2 || {};
-
- return reduce(
- obj1,
- (result, value, key) => {
- const p = path ? path + '.' + key : key;
- if (isObject(value)) {
- const d = difference(value, obj2[key], p);
- return d.length ? result.concat(d) : result;
- }
- return isEqual(value, obj2[key]) ? result : result.concat(p);
- },
- []
- );
- }
- return difference(object, base, '');
- }
-
- protected createSetCommand(changedFeature: string, jsonFormsData: any): ModelServerCommand {
- const nestedFeatures = changedFeature.split('.');
- if (nestedFeatures.length > 1) {
- // TODO check why change of dimension (width/height/length) values is not working properly
- const ownerFeatureName = nestedFeatures[0];
- const featureName = nestedFeatures[nestedFeatures.length - 1];
- const changedValue = get(jsonFormsData, nestedFeatures);
- const setCommand = new SetCommand(this.getOwner(jsonFormsData[ownerFeatureName], ownerFeatureName), featureName, [
- changedValue
- ]);
- return setCommand;
- } else {
- return new SetCommand(this.getOwner(jsonFormsData), changedFeature, [jsonFormsData[changedFeature]]);
- }
- }
-
- protected createAddRamCommand(jsonFormsData: any): ModelServerCommand {
- const addCommand = new AddCommand(this.getOwner(jsonFormsData), 'ram', []);
- const toAdd = { eClass: CoffeeModel.Type.RAM };
- addCommand.objectsToAdd = [toAdd];
- const ref = { $ref: '//@objectsToAdd.0', eClass: CoffeeModel.Type.RAM };
- addCommand.objectValues = [ref];
- addCommand.indices = [-1];
- return addCommand;
- }
-
- protected createRemoveRamCommand(jsonFormsData: any): ModelServerCommand {
- // TODO fix index
- return new RemoveCommand(this.getOwner(jsonFormsData), 'ram', [0]);
- }
-
- protected getOwner(jsonFormsData: any, ownerFeatureName?: string): ModelServerReferenceDescription {
- let eClass = jsonFormsData.eClass;
- if (!eClass && ownerFeatureName) {
- switch (ownerFeatureName) {
- case 'processor':
- eClass = CoffeeModel.Type.Processor;
- break;
- case 'dimension':
- eClass = CoffeeModel.Type.Dimension;
- break;
- case 'ram':
- eClass = CoffeeModel.Type.RAM;
- break;
- case 'display':
- eClass = CoffeeModel.Type.Display;
- break;
- }
- }
- return {
- $ref: this.getOwnerRef(jsonFormsData[ID_PROP]),
- eClass: eClass
- };
- }
-
- protected getOwnerRef(elementId: string): string {
- return `${this.workspaceService.workspace!.resource}/${this.getModelIDToRequest()}#${elementId}`.replace('file:///', 'file:/');
- }
-
- /**
- * Create the corresponding ModelServerReferenceDescription for the given tree node.
- * @param node The tree node to convert
- */
- protected getNodeDescription(node: TreeEditor.Node): ModelServerReferenceDescription {
- const getRefSegment = (n: TreeEditor.Node): string =>
- n.jsonforms.property ? `@${n.jsonforms.property}` + (n.jsonforms.index ? `.${n.jsonforms.index}` : '') : '';
- let refToNode = '';
- let toCheck: TreeNode | undefined = node;
- while (toCheck && TreeEditor.Node.is(toCheck)) {
- const parentRefSeg = getRefSegment(toCheck);
- refToNode = parentRefSeg === '' ? refToNode : '/' + parentRefSeg + refToNode;
- toCheck = toCheck.parent;
- }
- const ownerRef = `${this.workspaceService.workspace?.resource}/${this.getModelIDToRequest()}#/${refToNode}`;
- return {
- eClass: node.jsonforms.type,
- $ref: ownerRef.replace('file:///', 'file:/')
- };
- }
-
- private getModelIDToRequest(): string {
- const rootUriLength = this.workspaceService.getWorkspaceRootUri(this.options.uri)?.toString().length ?? 0;
- return this.options.uri.toString().substring(rootUriLength + 1);
- }
-
- protected configureTitle(title: Title): void {
- title.label = this.options.uri.path.base;
- title.caption = BaseTreeEditorWidget.WIDGET_LABEL;
- title.closable = true;
- title.iconClass = 'codicon coffee-icon dark-purple';
- }
-
- show(): void {
- super.show();
- if (this.delayedRefresh) {
- this.delayedRefresh = false;
- this.treeWidget.model.refresh();
- }
- }
-}
-export namespace CoffeeTreeEditorConstants {
- export const WIDGET_ID = 'json-forms-tree-editor';
- export const EDITOR_ID = 'org.eclipse.emfcloud.coffee.editor';
-}
diff --git a/web/coffee-java-extension/src/node/backend-extension.ts b/web/coffee-java-extension/src/node/backend-extension.ts
deleted file mode 100644
index ded6e773..00000000
--- a/web/coffee-java-extension/src/node/backend-extension.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2019-2020 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- */
-import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core';
-import { BackendApplicationContribution } from '@theia/core/lib/node';
-import { ContainerModule } from 'inversify';
-
-import { CODEGEN_SERVICE_PATH, CodeGenServer } from '../common/generate-protocol';
-import { CoffeeCodeGenServer } from './coffee-codegen-server';
-
-export default new ContainerModule(bind => {
- bind(CoffeeCodeGenServer).toSelf().inSingletonScope();
- bind(BackendApplicationContribution).toService(CoffeeCodeGenServer);
- bind(ConnectionHandler)
- .toDynamicValue(
- ctx => new JsonRpcConnectionHandler(CODEGEN_SERVICE_PATH, () => ctx.container.get(CoffeeCodeGenServer))
- )
- .inSingletonScope();
-});
diff --git a/web/coffee-java-extension/src/node/coffee-codegen-server.ts b/web/coffee-java-extension/src/node/coffee-codegen-server.ts
deleted file mode 100644
index 33a43a66..00000000
--- a/web/coffee-java-extension/src/node/coffee-codegen-server.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2019-2020 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- */
-import { ILogger } from '@theia/core';
-import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';
-import { RawProcess, RawProcessFactory } from '@theia/process/lib/node/raw-process';
-import { Application } from 'express';
-import * as glob from 'glob';
-import { inject, injectable } from 'inversify';
-import * as path from 'path';
-
-import { CodeGenServer } from '../common/generate-protocol';
-
-@injectable()
-export class CoffeeCodeGenServer implements CodeGenServer, BackendApplicationContribution {
- constructor(
- @inject(RawProcessFactory) protected readonly processFactory: RawProcessFactory,
- @inject(ILogger) private readonly logger: ILogger
- ) {}
-
- generateCode(sourceFile: string, targetFolder: string, packageName: string): Promise {
- const serverPath = path.resolve(__dirname, '..', '..', 'server');
- const jarPaths = glob.sync('**/plugins/org.eclipse.equinox.launcher_*.jar', { cwd: serverPath });
- if (jarPaths.length === 0) {
- throw new Error('The Java server launcher is not found.');
- }
-
- const jarPath = path.resolve(serverPath, jarPaths[0]);
-
- const command = 'java';
- const args: string[] = [];
-
- args.push('-jar', jarPath, '-targetFolder', targetFolder, '-source', sourceFile, '-packageName', packageName);
-
- return new Promise(resolve => {
- const process = this.spawnProcess(command, args);
- if (process === undefined || process.process === undefined) {
- resolve('Process not spawned');
- return;
- }
- process.process.on('exit', code => {
- switch (code) {
- case 0:
- resolve('OK');
- break;
- case -10:
- resolve('Target Folder Parameter missing');
- break;
- case -11:
- resolve('Source File Parameter missing');
- break;
- case -12:
- resolve('Package Name Parameter missing');
- break;
- case -20:
- resolve('Encoding not found, check Server Log!');
- break;
- case -30:
- resolve('IO Exception occurred, check Server Log!');
- break;
- default:
- resolve('UNKNOWN ERROR');
- break;
- }
- });
- });
- }
-
- onStop(app?: Application): void {
- this.dispose();
- }
-
- dispose(): void {
- // do nothing
- }
-
- setClient(): void {
- // do nothing
- }
-
- private spawnProcess(command: string, args?: string[]): RawProcess | undefined {
- const rawProcess = this.processFactory({ command, args });
- if (rawProcess.process === undefined) {
- return undefined;
- }
- rawProcess.process.on('error', this.onDidFailSpawnProcess.bind(this));
- const stderr = rawProcess.process.stderr;
- if (stderr) {
- stderr.on('data', this.logError.bind(this));
- }
- return rawProcess;
- }
-
- protected onDidFailSpawnProcess(error: Error): void {
- this.logger.error(error);
- }
-
- protected logError(data: string | Buffer): void {
- if (data) {
- this.logger.error(`Code Gen: ${data}`);
- }
- }
-}
diff --git a/web/coffee-server/src/node/backend-module.ts b/web/coffee-server/src/node/backend-module.ts
deleted file mode 100644
index 195c60ab..00000000
--- a/web/coffee-server/src/node/backend-module.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2019-2021 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- */
-import { LaunchOptions } from '@eclipse-emfcloud/modelserver-theia';
-import { BackendApplicationContribution } from '@theia/core/lib/node';
-import { ContainerModule, injectable } from '@theia/core/shared/inversify';
-import { sync } from 'glob';
-import { join, resolve } from 'path';
-
-import { WorkflowLSPServerLauncher } from './workflow-lsp-launcher';
-
-@injectable()
-export class CoffeeModelServerLaunchOptions implements LaunchOptions {
- baseURL = 'api/v1/';
- serverPort = 8081;
- hostname = 'localhost';
- jarPath = getJarPath('model');
- additionalArgs = ['--errorsOnly'];
-}
-
-export default new ContainerModule((bind, _unbind, isBound, rebind) => {
- if (isBound(LaunchOptions)) {
- rebind(LaunchOptions).to(CoffeeModelServerLaunchOptions).inSingletonScope();
- } else {
- bind(LaunchOptions).to(CoffeeModelServerLaunchOptions).inSingletonScope();
- }
-
- bind(WorkflowLSPServerLauncher).toSelf().inSingletonScope();
- bind(BackendApplicationContribution).toService(WorkflowLSPServerLauncher);
-});
-
-export const getJarPath = (server: string): string => {
- const serverPath = resolve(join(__dirname, '..', '..', 'server', server));
- const jarPaths = sync('**/plugins/org.eclipse.equinox.launcher_*.jar', { cwd: serverPath });
- const jarPath = resolve(serverPath, jarPaths[0]);
- return jarPath;
-};
-
-export function inDebugMode(): boolean {
- const args = process.argv.filter(a => a.startsWith('--debug'));
- return args.length > 0;
-}
diff --git a/web/coffee-welcome-page/tsconfig.json b/web/coffee-welcome-page/tsconfig.json
deleted file mode 100644
index a6cb5406..00000000
--- a/web/coffee-welcome-page/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "extends": "../configs/base.tsconfig",
- "compilerOptions": {
- "rootDir": "src",
- "outDir": "lib",
- "baseUrl": "."
- },
- "include": [
- "src",
- ]
-}
\ No newline at end of file
diff --git a/web/coffee-workflow-analyzer-editor/.eslintrc.js b/web/coffee-workflow-analyzer-editor/.eslintrc.js
deleted file mode 100644
index c9e16d6e..00000000
--- a/web/coffee-workflow-analyzer-editor/.eslintrc.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @type {import('eslint').Linter.Config} */
-module.exports = {
- root: true,
- extends: [
- '../../web/configs/base.eslintrc.json',
- '../../web/configs/warnings.eslintrc.json',
- '../../web/configs/errors.eslintrc.json'
- ],
- ignorePatterns: [
- '**/{node_modules,lib}'
- ],
- parserOptions: {
- tsconfigRootDir: __dirname,
- project: 'tsconfig.json'
- }
-};
diff --git a/web/coffee-workflow-analyzer/tsconfig.json b/web/coffee-workflow-analyzer/tsconfig.json
deleted file mode 100644
index 1c7ec1df..00000000
--- a/web/coffee-workflow-analyzer/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "extends": "../configs/base.tsconfig",
- "compilerOptions": {
- "rootDir": "src",
- "outDir": "lib",
- "baseUrl": "."
- },
- "include": [
- "src"
- ]
-}
\ No newline at end of file
diff --git a/web/coffee-workflow-glsp-editor/src/node/backend-module.ts b/web/coffee-workflow-glsp-editor/src/node/backend-module.ts
deleted file mode 100644
index b533164f..00000000
--- a/web/coffee-workflow-glsp-editor/src/node/backend-module.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2019 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- */
-import { GLSPServerContribution } from '@eclipse-glsp/theia-integration/lib/node';
-import { ContainerModule } from 'inversify';
-
-import { WorkflowGLSPServerContribution } from './workflow-glsp-server-contribution';
-
-export default new ContainerModule(bind => {
- bind(GLSPServerContribution).to(WorkflowGLSPServerContribution).inSingletonScope();
-});
diff --git a/web/coffee-workflow-glsp-editor/src/node/equinox.ts b/web/coffee-workflow-glsp-editor/src/node/equinox.ts
deleted file mode 100644
index 1e9c0ebf..00000000
--- a/web/coffee-workflow-glsp-editor/src/node/equinox.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2021 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- */
-import * as glob from 'glob';
-import * as path from 'path';
-
-export function findEquinoxLauncher(productPath: string): string {
- const jarPaths = glob.sync('**/plugins/org.eclipse.equinox.launcher_*.jar', { cwd: productPath });
- if (jarPaths.length === 0) {
- throw new Error('The eclipse.equinox.launcher is not found. ');
- }
- const jarPath = path.resolve(productPath, jarPaths[0]);
- return jarPath;
-}
diff --git a/web/coffee-workflow-glsp-editor/src/node/workflow-glsp-server-contribution.ts b/web/coffee-workflow-glsp-editor/src/node/workflow-glsp-server-contribution.ts
deleted file mode 100644
index ef9aa049..00000000
--- a/web/coffee-workflow-glsp-editor/src/node/workflow-glsp-server-contribution.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2019 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is
- * available at https://opensource.org/licenses/MIT.
- *
- * SPDX-License-Identifier: EPL-2.0 OR MIT
- */
-import { getPort } from '@eclipse-glsp/protocol';
-import {
- JavaSocketServerContribution,
- JavaSocketServerLaunchOptions,
- START_UP_COMPLETE_MSG
-} from '@eclipse-glsp/theia-integration/lib/node';
-import { ILogger } from '@theia/core';
-import * as fs from 'fs';
-import { inject, injectable } from 'inversify';
-import { join } from 'path';
-
-import { WorkflowNotationLanguage } from '../common/workflow-language';
-import { findEquinoxLauncher } from './equinox';
-
-export const PORT_ARG_KEY = 'WORKFLOW_NOTATION_LSP';
-export const SERVER_DIR = join(__dirname, '..', '..', '..', 'coffee-server', 'server');
-export const GLSP_JAR_FILE = join(SERVER_DIR, 'glsp');
-
-@injectable()
-export class WorkflowGLSPServerContribution extends JavaSocketServerContribution {
- @inject(ILogger) private readonly logger: ILogger;
-
- readonly id = WorkflowNotationLanguage.contributionId;
-
- createLaunchOptions(): Partial {
- return {
- jarPath: GLSP_JAR_FILE,
- additionalArgs: ['--consoleLog', 'true'],
- socketConnectionOptions: {
- port: getPort(PORT_ARG_KEY)
- }
- };
- }
-
- async launch(): Promise {
- if (!fs.existsSync(this.launchOptions.jarPath)) {
- throw new Error(`Could not launch GLSP server. The given jar path is not valid: ${this.launchOptions.jarPath}`);
- }
- if (isNaN(this.launchOptions.socketConnectionOptions.port)) {
- throw new Error(
- `Could not launch GLSP Server. The given server port is not a number: ${this.launchOptions.socketConnectionOptions.port}`
- );
- }
- let args = [
- '-jar',
- findEquinoxLauncher(this.launchOptions.jarPath),
- '--port',
- `${this.launchOptions.socketConnectionOptions.port}`
- ];
- if (this.launchOptions.additionalArgs) {
- args = [...args, ...this.launchOptions.additionalArgs];
- }
-
- await this.spawnProcessAsync('java', args, undefined);
- return this.onReady;
- }
- protected processLogInfo(data: string | Buffer): void {
- if (data) {
- const message = data.toString();
- if (message.startsWith(START_UP_COMPLETE_MSG)) {
- this.resolveReady();
- }
- this.logger.info(`WorkflowGLSPServerContribution: ${data}`);
- }
- }
-
- protected processLogError(data: string | Buffer): void {
- if (data) {
- this.logger.error(`WorkflowGLSPServerContribution: ${data}`);
- }
- }
-}
diff --git a/web/configs/base.eslintrc.json b/web/configs/base.eslintrc.json
deleted file mode 100644
index d8128116..00000000
--- a/web/configs/base.eslintrc.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "parser": "@typescript-eslint/parser",
- "parserOptions": {
- "sourceType": "module",
- "ecmaVersion": 6,
- "ecmaFeatures": {
- "jsx": true
- }
- },
- "plugins": [
- "@typescript-eslint",
- "header",
- "import",
- "no-null"
- ],
- "extends": [
- "eslint:recommended",
- "plugin:@typescript-eslint/eslint-recommended",
- "plugin:@typescript-eslint/recommended",
- "plugin:import/errors",
- "plugin:import/warnings",
- "plugin:import/typescript"
- ],
- "env": {
- "browser": true,
- "mocha": true,
- "es2017": true,
- "node": true
- },
- "ignorePatterns": [
- "node_modules",
- "*.d.ts"
- ]
-}
diff --git a/web/configs/base.tsconfig.json b/web/configs/base.tsconfig.json
deleted file mode 100644
index e68b8904..00000000
--- a/web/configs/base.tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "compilerOptions": {
- "skipLibCheck": true,
- "declaration": true,
- "declarationMap": true,
- "noImplicitAny": true,
- "noEmitOnError": false,
- "noImplicitThis": true,
- "noUnusedLocals": true,
- "noImplicitReturns": true,
- "strictNullChecks": true,
- "experimentalDecorators": true,
- "emitDecoratorMetadata": true,
- "downlevelIteration": true,
- "module": "commonjs",
- "moduleResolution": "node",
- "target": "ES2017",
- "jsx": "react",
- "lib": [
- "ES2017",
- "dom"
- ],
- "sourceMap": true
- }
-}
diff --git a/web/configs/errors.eslintrc.json b/web/configs/errors.eslintrc.json
deleted file mode 100644
index 149c327c..00000000
--- a/web/configs/errors.eslintrc.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "rules": {
- // https://eslint.org/docs/rules/
- // TODO reenable in the future
- "@typescript-eslint/ban-types": "off",
- // Possible Errors
- "no-inner-declarations": "off",
- // Best Practices
- "eqeqeq": ["error", "smart"],
- "guard-for-in": "error",
- "no-caller": "error",
- "no-eval": "error",
- "no-restricted-imports": ["error", "..", "../index", "../..", "../../index", "src"],
- "no-sequences": "error",
- "no-throw-literal": "error",
- "no-unused-expressions": [
- "error",
- {
- "allowShortCircuit": true,
- "allowTernary": true
- }
- ],
- // Variables
- "no-unused-vars": "off", // typescript-eslint rule activated instead
- "no-use-before-define": "off", // typescript-eslint rule activated instead
- "no-underscore-dangle": "off",
- "quotes": "off", // typescript-eslint rule activated instead
- "one-var": ["error", "never"],
- // ECMAScript6
- "arrow-body-style": ["error", "as-needed"],
- "no-var": "error",
- "prefer-const": [
- "error",
- {
- "destructuring": "all"
- }
- ],
- // @typescript-eslint/eslint-plugin
- "@typescript-eslint/naming-convention": "off",
- "@typescript-eslint/consistent-type-definitions": "error",
- "@typescript-eslint/no-misused-new": "error",
- "@typescript-eslint/no-empty-interface": "off",
- "@typescript-eslint/no-namespace": "off",
- "@typescript-eslint/no-use-before-define": "off",
- "@typescript-eslint/no-unused-vars": [
- "error",
- {
- "args": "none"
- }
- ],
- // eslint-plugin-header
- "header/header": [
- 2,
- "block",
- [
- "",
- {
- "pattern": "\\* Copyright \\([cC]\\) \\d{4}(-\\d{4})? [a-zA-Z\\s\\,\\.]*\\.",
- "template": " * Copyright (c) 2022 EclipseSource and others."
- },
- " *",
- " * This program and the accompanying materials are made available under the",
- " * terms of the Eclipse Public License v. 2.0 which is available at",
- " * http://www.eclipse.org/legal/epl-2.0, or the MIT License which is",
- " * available at https://opensource.org/licenses/MIT.",
- " *",
- " * SPDX-License-Identifier: EPL-2.0 OR MIT",
- " "
- ]
- ],
- // eslint-plugin-import
- "import/export": "off", // we have multiple exports due to namespaces, enums and classes that share the same name
- "import/no-deprecated": "error",
- // eslint-plugin-no-null
- "no-null/no-null": "error"
- }
-}
diff --git a/web/configs/warnings.eslintrc.json b/web/configs/warnings.eslintrc.json
deleted file mode 100644
index 47d599fc..00000000
--- a/web/configs/warnings.eslintrc.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
- "rules": {
- // https://eslint.org/docs/rules/
- "brace-style": "off",
- "comma-dangle": "warn",
- "curly": "warn",
- "eol-last": "warn",
- "no-invalid-this": "warn",
- "no-new-wrappers": "warn",
- "no-return-await": "warn",
- "no-redeclare": "off",
- "no-shadow": [
- "warn",
- {
- "hoist": "all"
- }
- ],
- "no-multiple-empty-lines": [
- "warn",
- {
- "max": 1
- }
- ],
- "no-trailing-spaces": "warn",
- "no-void": "warn",
- "prefer-const": [
- "warn",
- {
- "destructuring": "all"
- }
- ],
- "prefer-object-spread": "warn",
- "radix": "warn",
- "spaced-comment": [
- "warn",
- "always",
- {
- "exceptions": [
- "*",
- "+",
- "-",
- "/",
- "!"
- ]
- }
- ],
- "space-before-function-paren": [
- "warn",
- {
- "anonymous": "always",
- "named": "never",
- "asyncArrow": "always"
- }
- ],
- // Stylistic Issues
- "max-len": [
- "warn",
- {
- "code": 180
- }
- ],
- "use-isnan": "warn",
- "arrow-parens": [
- "warn",
- "as-needed"
- ],
- // @typescript-eslint/eslint-plugin
- "@typescript-eslint/semi": [
- "warn",
- "always"
- ],
- "@typescript-eslint/quotes": [
- "warn",
- "single",
- {
- "avoidEscape": true
- }
- ],
- "@typescript-eslint/explicit-function-return-type": [
- "warn",
- {
- "allowExpressions": true
- }
- ],
- "@typescript-eslint/explicit-module-boundary-types": "off",
- "@typescript-eslint/no-non-null-assertion": "off",
- "@typescript-eslint/type-annotation-spacing": "warn",
- "@typescript-eslint/no-explicit-any": "off",
- "@typescript-eslint/no-this-alias": "off"
- }
-}
\ No newline at end of file
diff --git a/web/package.json b/web/package.json
deleted file mode 100644
index c921c258..00000000
--- a/web/package.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
- "private": true,
- "license": "(EPL-2.0 OR MIT)",
- "contributors": [
- {
- "name": "Eclipse EMF.cloud Project",
- "email": "emfcloud-dev@eclipse.org",
- "url": "https://projects.eclipse.org/projects/ecd.emfcloud"
- }
- ],
- "repository": {
- "type": "git",
- "url": "https://github.com/eclipse-emfcloud/coffee-editor.git"
- },
- "homepage": "https://www.eclipse.org/emfcloud/",
- "bugs": "https://github.com/eclipse-emfcloud/coffee-editor/issues",
- "scripts": {
- "prepare": "lerna run prepare",
- "rebuild:browser": "theia rebuild:browser",
- "watch": "lerna run --parallel watch",
- "lint": "lerna run lint",
- "start": "cd browser-app && yarn start",
- "debug": "cd browser-app && yarn debug"
- },
- "devDependencies": {
- "@typescript-eslint/eslint-plugin": "^4.32.0",
- "@typescript-eslint/parser": "^4.32.0",
- "babel-loader": "8.0.6",
- "eslint": "^7.32.0",
- "eslint-config-prettier": "^8.3.0",
- "eslint-plugin-chai-friendly": "^0.7.2",
- "eslint-plugin-header": "^3.1.1",
- "eslint-plugin-import": "^2.24.2",
- "eslint-plugin-no-null": "^1.0.2",
- "eslint-plugin-prettier": "^4.0.0",
- "eslint-plugin-react": "^7.20.3",
- "eslint-plugin-react-hooks": "^4.0.8",
- "lerna": "^2.11.0",
- "typescript": "^4.2.3"
- },
- "workspaces": {
- "packages": [
- "browser-app",
- "configs",
- "coffee-comparison",
- "coffee-cpp-extension/",
- "coffee-editor-extension/",
- "coffee-java-extension/",
- "coffee-server/",
- "coffee-welcome-page/",
- "coffee-workflow-analyzer/",
- "coffee-workflow-analyzer-editor/",
- "coffee-workflow-glsp-editor/",
- "coffee-workflow-glsp/"
- ]
- },
- "resolutions": {
- "**/@theia/application-manager": "1.20.0",
- "**/@theia/application-package": "1.20.0",
- "**/@theia/callhierarchy": "1.20.0",
- "**/@theia/cli": "1.20.0",
- "**/@theia/console": "1.20.0",
- "**/@theia/core": "1.20.0",
- "**/@theia/debug": "1.20.0",
- "**/@theia/editor": "1.20.0",
- "**/@theia/file-search": "1.20.0",
- "**/@theia/filesystem": "1.20.0",
- "**/@theia/git": "1.20.0",
- "**/@theia/keymaps": "1.20.0",
- "**/@theia/markers": "1.20.0",
- "**/@theia/messages": "1.20.0",
- "**/@theia/mini-browser": "1.20.0",
- "**/@theia/monaco": "1.20.0",
- "**/@theia/navigator": "1.20.0",
- "**/@theia/outline-view": "1.20.0",
- "**/@theia/output": "1.20.0",
- "**/@theia/plugin-dev": "1.20.0",
- "**/@theia/plugin-ext": "1.20.0",
- "**/@theia/plugin-ext-vscode": "1.20.0",
- "**/@theia/plugin-metrics": "1.20.0",
- "**/@theia/preferences": "1.20.0",
- "**/@theia/process": "1.20.0",
- "**/@theia/scm": "1.20.0",
- "**/@theia/scm-extra": "1.20.0",
- "**/@theia/search-in-workspace": "1.20.0",
- "**/@theia/task": "1.20.0",
- "**/@theia/terminal": "1.20.0",
- "**/@theia/typehierarchy": "1.20.0",
- "**/@theia/userstorage": "1.20.0",
- "**/@theia/variable-resolver": "1.20.0",
- "**/@theia/vsx-registry": "1.20.0",
- "**/@theia/workspace": "1.20.0",
- "**/@eclipse-glsp/client": "0.9.0",
- "**/@eclipse-glsp/protocol": "0.9.0",
- "**/@eclipse-glsp/theia-integration": "0.9.0",
- "**/@eclipse-emfcloud/modelserver-theia": "0.8.0-next.bfd82e29",
- "**/@eclipse-emfcloud/theia-tree-editor": "0.7.0-next.1cc6a31",
- "**/inversify": "5.1.1",
- "**/sprotty": "0.10.0",
- "**/sprotty-theia": "0.10.0"
- }
-}
diff --git a/web/tsconfig.json b/web/tsconfig.json
deleted file mode 100644
index 6e27192a..00000000
--- a/web/tsconfig.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "extends": "./configs/base.tsconfig",
- "compilerOptions": {
- "baseUrl": ".",
- "paths": {
- "coffee-comparison": ["coffee-comparison/src/*"],
- "coffee-editor-extension": ["coffee-editor-extension/src/*"],
- "coffee-java-extension": ["coffee-java-extension/src/*"],
- "coffee-cpp-extension": ["coffee-cpp-extension/src/*"],
- "coffee-server": ["coffee-server/src/*"],
- "coffee-welcome-page": ["coffee-welcome-page/src/*"],
- "coffee-workflow-analyzer": ["coffee-workflow-analyzer/src/*"],
- "coffee-workflow-analyzer-editor": ["coffee-workflow-analyzer-editor/src/*"],
- "coffee-workflow-glsp-editor": ["coffee-workflow-glsp-editor/src/*"],
- "coffee-workflow-glsp": ["coffee-workflow-glsp/src/*"]
- }
- },
- "include": [
- "coffee-comparison/src",
- "coffee-editor-extension/src",
- "coffee-java-extension/src",
- "coffee-cpp-extension/src",
- "coffee-server/src",
- "coffee-welcome-page/src",
- "coffee-workflow-analyzer/src",
- "coffee-workflow-analyzer-editor/src",
- "coffee-workflow-glsp-editor/src",
- "coffee-workflow-glsp/src"
- ],
- "exclude": ["node_modules"]
-}
From 0e3dea7c17e233e7e6a03a13ebf9e499e6567a48 Mon Sep 17 00:00:00 2001
From: Nina Doschek
Date: Thu, 1 Sep 2022 17:30:18 +0200
Subject: [PATCH 05/34] #455 Update Getting Started
- Enhance styling and replace outdated Theia variables
- Structure Java and CPP features in detail sections
- Improve link styling, behaviour and add titles
---
client/coffee-welcome-page/package.json | 1 +
.../src/browser/style/index.css | 62 ++-
.../src/browser/welcome-page-widget.tsx | 373 +++++++++++-------
3 files changed, 286 insertions(+), 150 deletions(-)
diff --git a/client/coffee-welcome-page/package.json b/client/coffee-welcome-page/package.json
index 2a249e6e..83bc5101 100644
--- a/client/coffee-welcome-page/package.json
+++ b/client/coffee-welcome-page/package.json
@@ -24,6 +24,7 @@
],
"dependencies": {
"@theia/core": "^1.27.0",
+ "@theia/git": "^1.27.0",
"@theia/workspace": "^1.27.0",
"@theia/keymaps": "^1.27.0",
"@theia/filesystem": "^1.27.0",
diff --git a/client/coffee-welcome-page/src/browser/style/index.css b/client/coffee-welcome-page/src/browser/style/index.css
index 26543130..79d69575 100644
--- a/client/coffee-welcome-page/src/browser/style/index.css
+++ b/client/coffee-welcome-page/src/browser/style/index.css
@@ -26,7 +26,7 @@ body {
.gs-action-container {
line-height: 20px;
- color: var(--theia-ui-font-color1);
+ color: var(--theia-foreground);
}
.gs-container {
@@ -34,12 +34,16 @@ body {
}
.gs-header h1 {
- color: var(--theia-ui-font-color1);
+ color: var(--theia-foreground);
flex: 1;
font-weight: 600;
text-transform: uppercase;
}
+.gs-header p > a {
+ text-decoration: none;
+}
+
.gs-hr {
background-color: var(--theia-border-color1);
height: 1px;
@@ -49,29 +53,43 @@ body {
.gs-section a {
border: none;
- color: var(--theia-accent-color1);
+ color: var(--theia-textLink-foreground);
font-weight: 500;
outline: 0;
text-decoration: none;
}
-.gs-section a:hover {
- text-decoration: underline;
+.gs-nested-section {
+ margin-left: 20px;
+}
+
+.gs-header p > a:hover,
+.gs-section a:hover,
+.gs-container summary > .gs-section:hover {
+ cursor: pointer;
+}
+
+.gs-container details > summary:focus {
+ outline: none;
}
.gs-section-header {
- color: var(--theia-ui-font-color1);
+ color: var(--theia-foreground);
font-size: var(--theia-ui-font-size2);
font-weight: 600;
margin-bottom: 5px;
}
-.gs-section-header i {
- padding-right: 5px;
+.gs-section-header-icon {
+ padding-right: 10px;
+}
+
+.gs-link-icon {
+ padding-left: 5px;
}
.gs-sub-header {
- color: var(--theia-ui-font-color2);
+ color: var(--theia-descriptionForeground);
text-transform: capitalize;
font-weight: 200;
}
@@ -80,3 +98,29 @@ body {
display: flex;
align-items: center;
}
+
+.gs-detail-summary {
+ display: inline-block;
+ padding-left: 6px;
+ padding-bottom: 10px;
+}
+
+.gs-container details summary::-webkit-details-marker,
+.gs-container details > summary::marker {
+ content: '\eab6'; /* codicon codicon-chevron-right */
+ font-family: 'codicon';
+}
+
+.gs-container details[open] summary::-webkit-details-marker,
+.gs-container details[open] > summary::marker {
+ content: '\eab4'; /* codicon codicon-chevron-down */
+}
+
+.gs-section-listing {
+ list-style-type: circle;
+}
+
+.gs-language-icon {
+ font-style: normal;
+ font-weight: normal;
+}
diff --git a/client/coffee-welcome-page/src/browser/welcome-page-widget.tsx b/client/coffee-welcome-page/src/browser/welcome-page-widget.tsx
index 83258d71..c71db993 100644
--- a/client/coffee-welcome-page/src/browser/welcome-page-widget.tsx
+++ b/client/coffee-welcome-page/src/browser/welcome-page-widget.tsx
@@ -15,7 +15,8 @@ import { ApplicationInfo, ApplicationServer } from '@theia/core/lib/common/appli
import URI from '@theia/core/lib/common/uri';
import { DebugConfigurationManager } from '@theia/debug/lib/browser/debug-configuration-manager';
import { DebugCommands } from '@theia/debug/lib/browser/debug-frontend-application-contribution';
-import { EXPLORER_VIEW_CONTAINER_ID, FILE_NAVIGATOR_ID, FileNavigatorWidget } from '@theia/navigator/lib/browser';
+import { GitDiffCommands } from '@theia/git/lib/browser/diff/git-diff-contribution';
+import { EXPLORER_VIEW_CONTAINER_ID, FileNavigatorWidget, FILE_NAVIGATOR_ID } from '@theia/navigator/lib/browser';
import { WorkspaceService } from '@theia/workspace/lib/browser';
import { CODEGEN_COMMAND as CODEGEN_CPP_COMMAND } from 'coffee-cpp-extension/lib/browser/command-contribution';
import { CODEGEN_COMMAND as CODEGEN_JAVA_COMMAND } from 'coffee-java-extension/lib/browser/command-contribution';
@@ -80,10 +81,11 @@ export class WelcomePageWidget extends ReactWidget {
the graphical language server platform (Eclipse GLSP)
- . Double click the file "superbrewer3000.coffeenotation" in the file explorer or click the header
- try out the diagram editor!
+ . Open the file "superbrewer3000.notation" via the file explorer or click the header to try out
+ the diagram editor!
,
- this.openDiagram
+ this.openDiagram,
+ 'Open "superbrewer3000.notation" with diagram editor'
)}
@@ -94,15 +96,16 @@ export class WelcomePageWidget extends ReactWidget {
'codicon codicon-preview',
This editor allows to edit elements in a form-based view along with a tree showing the hierarchy of the
- model instances. This allows to efficiently browse the model and enter data.
- The form editor is based on{' '}
+ model instances. This allows to efficiently browse the model and enter data. The form editor is based on
+
JSON Forms
- . Double click the file "superbrewer3000.coffee" in the file explorer or click the header to try
- out the editor!
+ . Open the file "superbrewer3000.coffee" via the file explorer or click the header to try out the
+ editor!
,
- this.openTreeEditor
+ this.openTreeEditor,
+ 'Open "superbrewer3000.coffee" with Tree editor'
)}
@@ -117,10 +120,11 @@ export class WelcomePageWidget extends ReactWidget {
Xtext
- . Double click the file "superbrewer3000.wfconfig" in the file explorer or click the header to try
- out the textual DSl!
+ . Open the file "superbrewer3000.wfconfig" via the file explorer or click the header to try out
+ the textual DSL!
,
- this.openTextualDSL
+ this.openTextualDSL,
+ 'Open "superbrewer3000.wfconfig" with the Workflow DSL editor'
)}
@@ -134,104 +138,119 @@ export class WelcomePageWidget extends ReactWidget {
The result is visualized as a "sun burst" chart. The analysis is an external component written in
Kotlin, the chart is based on D3. Select the file "superbrewer3000.wfconfig" in the file explorer,
press F1, type "Analyze workflow model" and hit enter to see the model analysis in action.
- Alternatively do a right click in the open textual DSL editor or click the header above.
+ Alternatively, do a right click in the open textual DSL editor and select "Perform Analysis" or
+ click the header above.
,
- this.runModelAnalysis
+ this.runModelAnalysis,
+ 'Trigger Workflow Model Analysis'
)}
-