From 59eda00380981b2555cd62d26e8d6f4122a13c40 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Thu, 6 Apr 2023 18:07:50 +0200 Subject: [PATCH] Rename Web to HTML (#2997) 1. Rename "compose.web" to "compose.html" in Gradle DSL 2. Rename maven artifacts (with backward compatible "relocation" artifact) 3. Rename "web" folder to "html" Will do in support/1.4.0 branch 1. Move examples/web-* to examples/html/* 2. Rename Tutorials/Web to Tutorials/HTML 3. Rename "Compose for Web" to "Compose HTML Library" in the tutorials --- .../org/jetbrains/compose/ComposePlugin.kt | 24 +- .../test-projects/misc/jsMpp/build.gradle | 2 +- {web => html}/CHANGELOG.md | 0 {web => html}/README.md | 0 {web => html}/benchmark-core/build.gradle.kts | 4 +- .../karma.config.d/setTimeout.js | 0 .../com/sample/content/CodeSamplesSwitcher.kt | 0 .../src/jsTest/kotlin/BenchmarkComposables.kt | 0 .../src/jsTest/kotlin/BenchmarkTests.kt | 0 {web => html}/build.gradle.kts | 50 ++- {web => html}/buildSrc/build.gradle.kts | 0 {web => html}/buildSrc/gradle.properties | 0 {web => html}/buildSrc/settings.gradle.kts | 0 .../src/main/kotlin/SeleniumDriverPlugin.kt | 0 .../buildSrc/src/main/kotlin/karmaconf.kt | 0 .../compose-compiler-integration/README.md | 0 .../build.gradle.kts | 2 +- .../lib/build.gradle.kts | 2 +- .../lib/src/commonMain/kotlin/Interfaces.kt | 0 .../main-template/build.gradle.kts | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../main-template/gradlew | 0 .../main-template/gradlew.bat | 0 .../main-template/lib/build.gradle.kts | 0 .../lib/src/commonMain/kotlin/Lib.kt | 0 .../main-template/settings.gradle.kts | 0 .../src/commonMain/kotlin/Expect.kt | 0 .../src/commonMain/kotlin/Main.kt | 0 .../main-template/src/jsMain/kotlin/Deps.kt | 0 .../kotlin/CrossmoduleTestsDependencies.kt | 0 .../kotlin/AnonymousObjectsInComposable.kt | 0 .../jsTest/kotlin/ComposableLambdaCalls.kt | 0 .../kotlin/ComposablesInConstructorTests.kt | 0 .../src/jsTest/kotlin/InheritanceTests.kt | 0 .../src/jsTest/kotlin/StabilityTests.kt | 0 .../CompanionGetValueOperatorComposable.kt | 0 .../InstanceGetValueOperatorComposable.kt | 0 .../MutableStateDestructuringDeclarartion.kt | 0 ...leWithDefaultValuesDefinedByOtherParams.kt | 0 .../ComposableWithNullableTypeParameter.kt | 0 .../ComposableWithParamsWithDefaultValues.kt | 0 .../passing/ComposableWithTypeParams.kt | 0 .../ComposableWithTypedDefaultValues.kt | 0 .../passing/PassingComposableToConstructor.kt | 0 ...eBlockUsingTypeParameterAndDefaultValue.kt | 0 {web => html}/core/build.gradle.kts | 4 +- .../compose/web/ExperimentalComposeWebApi.kt | 0 .../web/ExperimentalComposeWebStyleApi.kt | 0 .../jetbrains/compose/web/attributes/Attrs.kt | 0 .../compose/web/attributes/AttrsScope.kt | 0 .../web/attributes/EventsListenerScope.kt | 0 .../compose/web/attributes/HtmlAttrMarker.kt | 0 .../web/attributes/PredefinedAttrValues.kt | 0 .../web/attributes/SyntheticEventListener.kt | 0 .../attributes/builders/InputAttrsScope.kt | 0 .../builders/InternalControlledInputUtils.kt | 0 .../attributes/builders/SelectAttrsScope.kt | 0 .../attributes/builders/TextAreaAttrsScope.kt | 0 .../jetbrains/compose/web/css/BrowserAPI.kt | 0 .../jetbrains/compose/web/css/CSSBuilder.kt | 0 .../org/jetbrains/compose/web/css/CSSEnums.kt | 0 .../compose/web/css/CSSKeyframeRule.kt | 0 .../jetbrains/compose/web/css/CSSKeywords.kt | 0 .../jetbrains/compose/web/css/CSSMediaRule.kt | 0 .../compose/web/css/CSSOperations.kt | 0 .../org/jetbrains/compose/web/css/CSSRules.kt | 0 .../org/jetbrains/compose/web/css/CSSUnits.kt | 0 .../org/jetbrains/compose/web/css/Color.kt | 0 .../compose/web/css/StylePropertyValue.kt | 0 .../jetbrains/compose/web/css/StyleScope.kt | 0 .../jetbrains/compose/web/css/StyleSheet.kt | 0 .../compose/web/css/StyleSheetBuilder.kt | 0 .../compose/web/css/keywords/Keywords.kt | 0 .../compose/web/css/properties/animation.kt | 0 .../compose/web/css/properties/background.kt | 0 .../compose/web/css/properties/border.kt | 0 .../compose/web/css/properties/box.kt | 0 .../compose/web/css/properties/color.kt | 0 .../compose/web/css/properties/filter.kt | 0 .../compose/web/css/properties/flex.kt | 0 .../compose/web/css/properties/grid.kt | 0 .../compose/web/css/properties/listStyle.kt | 0 .../compose/web/css/properties/margin.kt | 0 .../compose/web/css/properties/overflow.kt | 0 .../compose/web/css/properties/padding.kt | 0 .../compose/web/css/properties/position.kt | 0 .../compose/web/css/properties/properties.kt | 0 .../compose/web/css/properties/text.kt | 0 .../compose/web/css/properties/transform.kt | 0 .../compose/web/css/properties/transitions.kt | 0 .../compose/web/css/properties/ui.kt | 0 .../compose/web/css/selectors/CSSSelectors.kt | 0 .../compose/web/css/utils/stylsheet.kt | 0 .../jetbrains/compose/web/elements/Base.kt | 0 .../compose/web/elements/ElementScope.kt | 0 .../compose/web/elements/Elements.kt | 0 .../compose/web/elements/InputElements.kt | 0 .../compose/web/elements/RadioGroup.kt | 0 .../jetbrains/compose/web/elements/Style.kt | 0 .../web/events/SyntheticAnimationEvent.kt | 0 .../web/events/SyntheticChangeEvent.kt | 0 .../web/events/SyntheticClipboardEvent.kt | 0 .../compose/web/events/SyntheticEvent.kt | 0 .../compose/web/events/SyntheticFocusEvent.kt | 0 .../compose/web/events/SyntheticInputEvent.kt | 0 .../web/events/SyntheticKeyboardEvent.kt | 0 .../compose/web/events/SyntheticMouseEvent.kt | 0 .../web/events/SyntheticSelectEvent.kt | 0 .../web/events/SyntheticSubmitEvent.kt | 0 .../compose/web/events/SyntheticTouchEvent.kt | 0 .../core/src/jsMain/resources/index.html | 0 .../core/src/jsTest/kotlin/CSSEnums.kt | 0 .../src/jsTest/kotlin/CSSStylesheetTests.kt | 0 .../core/src/jsTest/kotlin/CSSUnitApiTests.kt | 0 .../kotlin/ControlledRadioGroupsTests.kt | 0 .../src/jsTest/kotlin/CssSelectorsTests.kt | 0 .../src/jsTest/kotlin/DomSideEffectTests.kt | 0 .../src/jsTest/kotlin/FailingTestCases.kt | 0 .../src/jsTest/kotlin/InlineStyleTests.kt | 0 .../core/src/jsTest/kotlin/MediaQueryTests.kt | 0 .../jsTest/kotlin/StaticComposableTests.kt | 0 .../src/jsTest/kotlin/css/AnimationTests.kt | 0 .../jsTest/kotlin/css/CSSBackgroundTests.kt | 0 .../src/jsTest/kotlin/css/CSSBorderTests.kt | 0 .../core/src/jsTest/kotlin/css/CSSBoxTests.kt | 0 .../src/jsTest/kotlin/css/CSSDisplayTests.kt | 0 .../src/jsTest/kotlin/css/CSSFlexTests.kt | 0 .../jsTest/kotlin/css/CSSListStyleTests.kt | 0 .../src/jsTest/kotlin/css/CSSMarginTests.kt | 0 .../src/jsTest/kotlin/css/CSSOverflowTests.kt | 0 .../src/jsTest/kotlin/css/CSSPaddingTests.kt | 0 .../src/jsTest/kotlin/css/CSSTextTests.kt | 0 .../core/src/jsTest/kotlin/css/CSSUiTests.kt | 0 .../core/src/jsTest/kotlin/css/ColorTests.kt | 0 .../core/src/jsTest/kotlin/css/FilterTests.kt | 0 .../core/src/jsTest/kotlin/css/GridTests.kt | 0 .../src/jsTest/kotlin/css/NthChildTests.kt | 0 .../src/jsTest/kotlin/css/PositionTests.kt | 0 .../src/jsTest/kotlin/css/StyleSheetTests.kt | 0 .../src/jsTest/kotlin/css/TransformTests.kt | 0 .../src/jsTest/kotlin/css/TransitionsTests.kt | 0 .../jsTest/kotlin/elements/AttributesTests.kt | 0 .../jsTest/kotlin/elements/ElementsTests.kt | 0 .../src/jsTest/kotlin/elements/EventTests.kt | 0 .../InputsGenerateCorrectHtmlTests.kt | 0 .../jsTest/kotlin/elements/RadioGroupTests.kt | 0 .../src/jsTest/kotlin/elements/StyleTest.kt | 0 .../src/jsTest/kotlin/elements/TableTests.kt | 0 {web => html}/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {web => html}/gradlew | 0 {web => html}/gradlew.bat | 178 ++++---- .../integration-core/build.gradle.kts | 2 +- .../compose/web/sample/CodeSnippetSamples.kt | 0 .../compose/web/sample/HighlightJs.kt | 0 .../androidx/compose/web/sample/Sample.kt | 0 .../compose/web/sample/tests/Common.kt | 0 .../ControlledInputsCursorsPositionTests.kt | 0 .../web/sample/tests/ControlledInputsTests.kt | 0 .../compose/web/sample/tests/EventsTests.kt | 0 .../compose/web/sample/tests/InputsTests.kt | 0 .../web/sample/tests/RadioGroupTestCases.kt | 0 .../web/sample/tests/SelectElementTests.kt | 0 .../compose/web/sample/tests/TestCases1.kt | 0 .../sample/tests/UncontrolledInputsTests.kt | 0 .../src/jsMain/resources/hljs.css | 0 .../src/jsMain/resources/index.html | 0 .../ControlledInputsCursorsPositionTests.kt | 0 .../integration/ControlledInputsTests.kt | 0 .../web/tests/integration/EventTests.kt | 0 .../web/tests/integration/InputsTests.kt | 0 .../web/tests/integration/IntegrationTests.kt | 0 .../web/tests/integration/RadioGroupTests.kt | 0 .../tests/integration/SelectElementTests.kt | 0 .../integration/UncontrolledInputsTests.kt | 0 .../common/BaseIntegrationTests.kt | 0 .../common/DisplayNameSimplifier.kt | 0 .../common/IntegrationTestsSetup.kt | 0 .../integration/common/ServerLauncher.kt | 0 .../build.gradle.kts | 0 .../org/jetbrains/compose/web/dom/DOMSCope.kt | 0 .../internal/runtime/ComposeWebInternalApi.kt | 0 .../web/internal/runtime/DomApplier.kt | 0 .../internal/runtime/GlobalSnapshotManager.kt | 0 .../runtime/JsMicrotasksDispatcher.kt | 0 .../jetbrains/compose/web/renderComposable.kt | 0 .../jsTest/kotlin/RenderComposableTests.kt | 0 {web => html}/kotlin-js-store/yarn.lock | 420 ++++++++++-------- {web => html}/licenses/third_party/README.md | 0 .../licenses/third_party/bsd-3-revised.txt | 0 {web => html}/settings.gradle.kts | 12 +- {web => html}/svg/build.gradle.kts | 6 +- .../web/ExperimentalComposeWebSvgApi.kt | 0 .../org/jetbrains/compose/web/svg/svg.kt | 0 .../org/jetbrains/compose/web/svg/svgAttrs.kt | 0 .../svg/src/jsTest/kotlin/svg/SvgTests.kt | 0 {web => html}/test-utils/build.gradle.kts | 2 +- .../karma-kotlin-reporter-decorated.js | 0 .../conf/karma.config.common.d/patch.js | 0 .../ComposeWebExperimentalTestsApi.kt | 0 .../compose/web/testutils/TestUtils.kt | 0 .../src/jsTest/kotlin/TestsForTestUtils.kt | 0 204 files changed, 396 insertions(+), 312 deletions(-) rename {web => html}/CHANGELOG.md (100%) rename {web => html}/README.md (100%) rename {web => html}/benchmark-core/build.gradle.kts (94%) rename {web => html}/benchmark-core/karma.config.d/setTimeout.js (100%) rename {web => html}/benchmark-core/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt (100%) rename {web => html}/benchmark-core/src/jsTest/kotlin/BenchmarkComposables.kt (100%) rename {web => html}/benchmark-core/src/jsTest/kotlin/BenchmarkTests.kt (100%) rename {web => html}/build.gradle.kts (74%) rename {web => html}/buildSrc/build.gradle.kts (100%) rename {web => html}/buildSrc/gradle.properties (100%) rename {web => html}/buildSrc/settings.gradle.kts (100%) rename {web => html}/buildSrc/src/main/kotlin/SeleniumDriverPlugin.kt (100%) rename {web => html}/buildSrc/src/main/kotlin/karmaconf.kt (100%) rename {web => html}/compose-compiler-integration/README.md (100%) rename {web => html}/compose-compiler-integration/build.gradle.kts (99%) rename {web => html}/compose-compiler-integration/lib/build.gradle.kts (89%) rename {web => html}/compose-compiler-integration/lib/src/commonMain/kotlin/Interfaces.kt (100%) rename {web => html}/compose-compiler-integration/main-template/build.gradle.kts (100%) rename {web => html}/compose-compiler-integration/main-template/gradle/wrapper/gradle-wrapper.jar (100%) rename {web => html}/compose-compiler-integration/main-template/gradle/wrapper/gradle-wrapper.properties (100%) rename {web => html}/compose-compiler-integration/main-template/gradlew (100%) mode change 100755 => 100644 rename {web => html}/compose-compiler-integration/main-template/gradlew.bat (100%) rename {web => html}/compose-compiler-integration/main-template/lib/build.gradle.kts (100%) rename {web => html}/compose-compiler-integration/main-template/lib/src/commonMain/kotlin/Lib.kt (100%) rename {web => html}/compose-compiler-integration/main-template/settings.gradle.kts (100%) rename {web => html}/compose-compiler-integration/main-template/src/commonMain/kotlin/Expect.kt (100%) rename {web => html}/compose-compiler-integration/main-template/src/commonMain/kotlin/Main.kt (100%) rename {web => html}/compose-compiler-integration/main-template/src/jsMain/kotlin/Deps.kt (100%) rename {web => html}/compose-compiler-integration/src/jsMain/kotlin/CrossmoduleTestsDependencies.kt (100%) rename {web => html}/compose-compiler-integration/src/jsTest/kotlin/AnonymousObjectsInComposable.kt (100%) rename {web => html}/compose-compiler-integration/src/jsTest/kotlin/ComposableLambdaCalls.kt (100%) rename {web => html}/compose-compiler-integration/src/jsTest/kotlin/ComposablesInConstructorTests.kt (100%) rename {web => html}/compose-compiler-integration/src/jsTest/kotlin/InheritanceTests.kt (100%) rename {web => html}/compose-compiler-integration/src/jsTest/kotlin/StabilityTests.kt (100%) rename {web => html}/compose-compiler-integration/testcases/failing/CompanionGetValueOperatorComposable.kt (100%) rename {web => html}/compose-compiler-integration/testcases/failing/InstanceGetValueOperatorComposable.kt (100%) rename {web => html}/compose-compiler-integration/testcases/failing/MutableStateDestructuringDeclarartion.kt (100%) rename {web => html}/compose-compiler-integration/testcases/passing/ComposableWithDefaultValuesDefinedByOtherParams.kt (100%) rename {web => html}/compose-compiler-integration/testcases/passing/ComposableWithNullableTypeParameter.kt (100%) rename {web => html}/compose-compiler-integration/testcases/passing/ComposableWithParamsWithDefaultValues.kt (100%) rename {web => html}/compose-compiler-integration/testcases/passing/ComposableWithTypeParams.kt (100%) rename {web => html}/compose-compiler-integration/testcases/passing/ComposableWithTypedDefaultValues.kt (100%) rename {web => html}/compose-compiler-integration/testcases/passing/PassingComposableToConstructor.kt (100%) rename {web => html}/compose-compiler-integration/testcases/passing/WithComposableBlockUsingTypeParameterAndDefaultValue.kt (100%) rename {web => html}/core/build.gradle.kts (90%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/ExperimentalComposeWebApi.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/ExperimentalComposeWebStyleApi.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/Attrs.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/AttrsScope.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/EventsListenerScope.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/HtmlAttrMarker.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/PredefinedAttrValues.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/SyntheticEventListener.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/InputAttrsScope.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/InternalControlledInputUtils.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/SelectAttrsScope.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/TextAreaAttrsScope.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/BrowserAPI.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSBuilder.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSEnums.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSKeyframeRule.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSKeywords.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSMediaRule.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSOperations.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSRules.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSUnits.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/Color.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StylePropertyValue.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleScope.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleSheet.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleSheetBuilder.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/keywords/Keywords.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/animation.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/background.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/border.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/box.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/color.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/filter.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/flex.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/grid.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/listStyle.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/margin.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/overflow.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/padding.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/position.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/properties.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/text.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/transform.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/transitions.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/ui.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/selectors/CSSSelectors.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/utils/stylsheet.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Base.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/ElementScope.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Elements.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/InputElements.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/RadioGroup.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Style.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticAnimationEvent.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticChangeEvent.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticClipboardEvent.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticEvent.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticFocusEvent.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticInputEvent.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticKeyboardEvent.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticMouseEvent.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticSelectEvent.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticSubmitEvent.kt (100%) rename {web => html}/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticTouchEvent.kt (100%) rename {web => html}/core/src/jsMain/resources/index.html (100%) rename {web => html}/core/src/jsTest/kotlin/CSSEnums.kt (100%) rename {web => html}/core/src/jsTest/kotlin/CSSStylesheetTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/CSSUnitApiTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/ControlledRadioGroupsTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/CssSelectorsTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/DomSideEffectTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/FailingTestCases.kt (100%) rename {web => html}/core/src/jsTest/kotlin/InlineStyleTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/MediaQueryTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/StaticComposableTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/AnimationTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/CSSBackgroundTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/CSSBorderTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/CSSBoxTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/CSSDisplayTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/CSSFlexTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/CSSListStyleTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/CSSMarginTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/CSSOverflowTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/CSSPaddingTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/CSSTextTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/CSSUiTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/ColorTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/FilterTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/GridTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/NthChildTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/PositionTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/StyleSheetTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/TransformTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/css/TransitionsTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/elements/AttributesTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/elements/ElementsTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/elements/EventTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/elements/InputsGenerateCorrectHtmlTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/elements/RadioGroupTests.kt (100%) rename {web => html}/core/src/jsTest/kotlin/elements/StyleTest.kt (100%) rename {web => html}/core/src/jsTest/kotlin/elements/TableTests.kt (100%) rename {web => html}/gradle.properties (100%) rename {web => html}/gradle/wrapper/gradle-wrapper.jar (100%) rename {web => html}/gradle/wrapper/gradle-wrapper.properties (100%) rename {web => html}/gradlew (100%) rename {web => html}/gradlew.bat (96%) rename {web => html}/integration-core/build.gradle.kts (98%) rename {web => html}/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/CodeSnippetSamples.kt (100%) rename {web => html}/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/HighlightJs.kt (100%) rename {web => html}/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/Sample.kt (100%) rename {web => html}/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/Common.kt (100%) rename {web => html}/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/ControlledInputsCursorsPositionTests.kt (100%) rename {web => html}/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/ControlledInputsTests.kt (100%) rename {web => html}/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/EventsTests.kt (100%) rename {web => html}/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/InputsTests.kt (100%) rename {web => html}/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/RadioGroupTestCases.kt (100%) rename {web => html}/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/SelectElementTests.kt (100%) rename {web => html}/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/TestCases1.kt (100%) rename {web => html}/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/UncontrolledInputsTests.kt (100%) rename {web => html}/integration-core/src/jsMain/resources/hljs.css (100%) rename {web => html}/integration-core/src/jsMain/resources/index.html (100%) rename {web => html}/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/ControlledInputsCursorsPositionTests.kt (100%) rename {web => html}/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/ControlledInputsTests.kt (100%) rename {web => html}/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/EventTests.kt (100%) rename {web => html}/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/InputsTests.kt (100%) rename {web => html}/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/IntegrationTests.kt (100%) rename {web => html}/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/RadioGroupTests.kt (100%) rename {web => html}/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/SelectElementTests.kt (100%) rename {web => html}/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/UncontrolledInputsTests.kt (100%) rename {web => html}/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/BaseIntegrationTests.kt (100%) rename {web => html}/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/DisplayNameSimplifier.kt (100%) rename {web => html}/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/IntegrationTestsSetup.kt (100%) rename {web => html}/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/ServerLauncher.kt (100%) rename {web/internal-web-core-runtime => html/internal-html-core-runtime}/build.gradle.kts (100%) rename {web/internal-web-core-runtime => html/internal-html-core-runtime}/src/jsMain/kotlin/org/jetbrains/compose/web/dom/DOMSCope.kt (100%) rename {web/internal-web-core-runtime => html/internal-html-core-runtime}/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/ComposeWebInternalApi.kt (100%) rename {web/internal-web-core-runtime => html/internal-html-core-runtime}/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/DomApplier.kt (100%) rename {web/internal-web-core-runtime => html/internal-html-core-runtime}/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/GlobalSnapshotManager.kt (100%) rename {web/internal-web-core-runtime => html/internal-html-core-runtime}/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/JsMicrotasksDispatcher.kt (100%) rename {web/internal-web-core-runtime => html/internal-html-core-runtime}/src/jsMain/kotlin/org/jetbrains/compose/web/renderComposable.kt (100%) rename {web/internal-web-core-runtime => html/internal-html-core-runtime}/src/jsTest/kotlin/RenderComposableTests.kt (100%) rename {web => html}/kotlin-js-store/yarn.lock (91%) rename {web => html}/licenses/third_party/README.md (100%) rename {web => html}/licenses/third_party/bsd-3-revised.txt (100%) rename {web => html}/settings.gradle.kts (89%) rename {web => html}/svg/build.gradle.kts (83%) rename {web => html}/svg/src/jsMain/kotlin/org/jetbrains/compose/web/ExperimentalComposeWebSvgApi.kt (100%) rename {web => html}/svg/src/jsMain/kotlin/org/jetbrains/compose/web/svg/svg.kt (100%) rename {web => html}/svg/src/jsMain/kotlin/org/jetbrains/compose/web/svg/svgAttrs.kt (100%) rename {web => html}/svg/src/jsTest/kotlin/svg/SvgTests.kt (100%) rename {web => html}/test-utils/build.gradle.kts (89%) rename {web => html}/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js (100%) rename {web => html}/test-utils/conf/karma.config.common.d/patch.js (100%) rename {web => html}/test-utils/src/jsMain/kotlin/org/jetbrains/compose/web/testutils/ComposeWebExperimentalTestsApi.kt (100%) rename {web => html}/test-utils/src/jsMain/kotlin/org/jetbrains/compose/web/testutils/TestUtils.kt (100%) rename {web => html}/test-utils/src/jsTest/kotlin/TestsForTestUtils.kt (100%) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt index 0997f30a..7da98f98 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt @@ -106,6 +106,7 @@ class ComposePlugin : Plugin { } } + @Suppress("DEPRECATION") class Dependencies(project: Project) { val desktop = DesktopDependencies val compiler = CompilerDependencies(project) @@ -122,7 +123,9 @@ class ComposePlugin : Plugin { val preview get() = composeDependency("org.jetbrains.compose.ui:ui-tooling-preview") val materialIconsExtended get() = composeDependency("org.jetbrains.compose.material:material-icons-extended") val components get() = CommonComponentsDependencies + @Deprecated("Use compose.html", replaceWith = ReplaceWith("html")) val web: WebDependencies get() = WebDependencies + val html: HtmlDependencies get() = HtmlDependencies } object DesktopDependencies { @@ -163,17 +166,32 @@ class ComposePlugin : Plugin { val animatedImage = composeDependency("org.jetbrains.compose.components:components-animatedimage") } + @Deprecated("Use compose.html") object WebDependencies { val core by lazy { - composeDependency("org.jetbrains.compose.web:web-core") + composeDependency("org.jetbrains.compose.html:html-core") } val svg by lazy { - composeDependency("org.jetbrains.compose.web:web-svg") + composeDependency("org.jetbrains.compose.html:html-svg") } val testUtils by lazy { - composeDependency("org.jetbrains.compose.web:test-utils") + composeDependency("org.jetbrains.compose.html:html-test-utils") + } + } + + object HtmlDependencies { + val core by lazy { + composeDependency("org.jetbrains.compose.html:html-core") + } + + val svg by lazy { + composeDependency("org.jetbrains.compose.html:html-svg") + } + + val testUtils by lazy { + composeDependency("org.jetbrains.compose.html:html-test-utils") } } } diff --git a/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/build.gradle b/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/build.gradle index 74f1512b..e409ff5f 100644 --- a/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/build.gradle +++ b/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/build.gradle @@ -16,7 +16,7 @@ kotlin { } named("jsMain") { dependencies { - implementation(compose.web.core) + implementation(compose.html.core) implementation(compose.runtime) } } diff --git a/web/CHANGELOG.md b/html/CHANGELOG.md similarity index 100% rename from web/CHANGELOG.md rename to html/CHANGELOG.md diff --git a/web/README.md b/html/README.md similarity index 100% rename from web/README.md rename to html/README.md diff --git a/web/benchmark-core/build.gradle.kts b/html/benchmark-core/build.gradle.kts similarity index 94% rename from web/benchmark-core/build.gradle.kts rename to html/benchmark-core/build.gradle.kts index 60d5e761..d3f11475 100644 --- a/web/benchmark-core/build.gradle.kts +++ b/html/benchmark-core/build.gradle.kts @@ -21,7 +21,7 @@ kotlin { val commonMain by getting { dependencies { implementation(compose.runtime) - implementation(project(":web-core")) + implementation(project(":html-core")) implementation(kotlin("stdlib-common")) } } @@ -34,7 +34,7 @@ kotlin { val jsTest by getting { dependencies { - implementation(project(":test-utils")) + implementation(project(":html-test-utils")) implementation(kotlin("test-js")) } } diff --git a/web/benchmark-core/karma.config.d/setTimeout.js b/html/benchmark-core/karma.config.d/setTimeout.js similarity index 100% rename from web/benchmark-core/karma.config.d/setTimeout.js rename to html/benchmark-core/karma.config.d/setTimeout.js diff --git a/web/benchmark-core/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt b/html/benchmark-core/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt similarity index 100% rename from web/benchmark-core/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt rename to html/benchmark-core/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt diff --git a/web/benchmark-core/src/jsTest/kotlin/BenchmarkComposables.kt b/html/benchmark-core/src/jsTest/kotlin/BenchmarkComposables.kt similarity index 100% rename from web/benchmark-core/src/jsTest/kotlin/BenchmarkComposables.kt rename to html/benchmark-core/src/jsTest/kotlin/BenchmarkComposables.kt diff --git a/web/benchmark-core/src/jsTest/kotlin/BenchmarkTests.kt b/html/benchmark-core/src/jsTest/kotlin/BenchmarkTests.kt similarity index 100% rename from web/benchmark-core/src/jsTest/kotlin/BenchmarkTests.kt rename to html/benchmark-core/src/jsTest/kotlin/BenchmarkTests.kt diff --git a/web/build.gradle.kts b/html/build.gradle.kts similarity index 74% rename from web/build.gradle.kts rename to html/build.gradle.kts index a8063581..13e65ea8 100644 --- a/web/build.gradle.kts +++ b/html/build.gradle.kts @@ -33,10 +33,11 @@ rootProject.plugins.withType @@ -73,8 +74,8 @@ subprojects { publications.all { this as MavenPublication pom { - name.set("JetBrains Compose Multiplatform") - description.set("JetBrains Compose Multiplatform for Web") + name.set("JetBrains Compose Multiplatform HTML library") + description.set("JetBrains Compose Multiplatform HTML library") url.set("https://www.jetbrains.com/lp/compose-mpp/") licenses { license { @@ -91,9 +92,40 @@ subprojects { } } scm { - connection.set("scm:git://github.com/JetBrains/compose-jb.git") - developerConnection.set("scm:git://github.com/JetBrains/compose-jb.git") - url.set("https://github.com/jetbrains/compose-jb") + connection.set("scm:git://github.com/JetBrains/compose-multiplatform.git") + developerConnection.set("scm:git://github.com/JetBrains/compose-multiplatform.git") + url.set("https://github.com/jetbrains/compose-multiplatform") + } + } + } + publications { + val oldArtifactId = when (projectName) { + "html-core" -> "web-core" + "html-svg" -> "web-svg" + "html-test-utils" -> "test-utils" + "html-benchmark-core" -> "web-benchmark-core" + "internal-html-core-runtime" -> "internal-web-core-runtime" + "html-integration-core" -> "web-integration-core" + "compose-compiler-integration" -> "compose-compiler-integration" + "compose-compiler-integration-lib" -> "compose-compiler-integration-lib" + else -> null + } + + // TODO Remove this publishing in Compose 1.7. The package was migrated in 1.4. + if (oldArtifactId != null) { + create("relocation") { + pom { + // Old artifact coordinates + groupId = "org.jetbrains.compose.web" + artifactId = oldArtifactId + distributionManagement { + relocation { + // New artifact coordinates + groupId.set("org.jetbrains.compose.html") + artifactId.set(projectName) + } + } + } } } } @@ -139,8 +171,8 @@ subprojects { println("substituting published artifacts with projects ones in project $name") configurations.all { resolutionStrategy.dependencySubstitution { - substitute(module("org.jetbrains.compose.web:web-core")).apply { - with(project(":web-core")) + substitute(module("org.jetbrains.compose.html:html-core")).apply { + with(project(":html-core")) } } } diff --git a/web/buildSrc/build.gradle.kts b/html/buildSrc/build.gradle.kts similarity index 100% rename from web/buildSrc/build.gradle.kts rename to html/buildSrc/build.gradle.kts diff --git a/web/buildSrc/gradle.properties b/html/buildSrc/gradle.properties similarity index 100% rename from web/buildSrc/gradle.properties rename to html/buildSrc/gradle.properties diff --git a/web/buildSrc/settings.gradle.kts b/html/buildSrc/settings.gradle.kts similarity index 100% rename from web/buildSrc/settings.gradle.kts rename to html/buildSrc/settings.gradle.kts diff --git a/web/buildSrc/src/main/kotlin/SeleniumDriverPlugin.kt b/html/buildSrc/src/main/kotlin/SeleniumDriverPlugin.kt similarity index 100% rename from web/buildSrc/src/main/kotlin/SeleniumDriverPlugin.kt rename to html/buildSrc/src/main/kotlin/SeleniumDriverPlugin.kt diff --git a/web/buildSrc/src/main/kotlin/karmaconf.kt b/html/buildSrc/src/main/kotlin/karmaconf.kt similarity index 100% rename from web/buildSrc/src/main/kotlin/karmaconf.kt rename to html/buildSrc/src/main/kotlin/karmaconf.kt diff --git a/web/compose-compiler-integration/README.md b/html/compose-compiler-integration/README.md similarity index 100% rename from web/compose-compiler-integration/README.md rename to html/compose-compiler-integration/README.md diff --git a/web/compose-compiler-integration/build.gradle.kts b/html/compose-compiler-integration/build.gradle.kts similarity index 99% rename from web/compose-compiler-integration/build.gradle.kts rename to html/compose-compiler-integration/build.gradle.kts index 5ae69a67..0dad4704 100644 --- a/web/compose-compiler-integration/build.gradle.kts +++ b/html/compose-compiler-integration/build.gradle.kts @@ -24,7 +24,7 @@ kotlin { implementation(project(":compose-compiler-integration-lib")) implementation(kotlin("stdlib-js")) implementation(compose.runtime) - implementation(project(":web-core")) + implementation(project(":html-core")) } } diff --git a/web/compose-compiler-integration/lib/build.gradle.kts b/html/compose-compiler-integration/lib/build.gradle.kts similarity index 89% rename from web/compose-compiler-integration/lib/build.gradle.kts rename to html/compose-compiler-integration/lib/build.gradle.kts index 825cb6c3..0e48fefc 100644 --- a/web/compose-compiler-integration/lib/build.gradle.kts +++ b/html/compose-compiler-integration/lib/build.gradle.kts @@ -20,7 +20,7 @@ kotlin { dependencies { implementation(kotlin("stdlib-common")) implementation(compose.runtime) - implementation(project(":web-core")) + implementation(project(":html-core")) } } } diff --git a/web/compose-compiler-integration/lib/src/commonMain/kotlin/Interfaces.kt b/html/compose-compiler-integration/lib/src/commonMain/kotlin/Interfaces.kt similarity index 100% rename from web/compose-compiler-integration/lib/src/commonMain/kotlin/Interfaces.kt rename to html/compose-compiler-integration/lib/src/commonMain/kotlin/Interfaces.kt diff --git a/web/compose-compiler-integration/main-template/build.gradle.kts b/html/compose-compiler-integration/main-template/build.gradle.kts similarity index 100% rename from web/compose-compiler-integration/main-template/build.gradle.kts rename to html/compose-compiler-integration/main-template/build.gradle.kts diff --git a/web/compose-compiler-integration/main-template/gradle/wrapper/gradle-wrapper.jar b/html/compose-compiler-integration/main-template/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from web/compose-compiler-integration/main-template/gradle/wrapper/gradle-wrapper.jar rename to html/compose-compiler-integration/main-template/gradle/wrapper/gradle-wrapper.jar diff --git a/web/compose-compiler-integration/main-template/gradle/wrapper/gradle-wrapper.properties b/html/compose-compiler-integration/main-template/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from web/compose-compiler-integration/main-template/gradle/wrapper/gradle-wrapper.properties rename to html/compose-compiler-integration/main-template/gradle/wrapper/gradle-wrapper.properties diff --git a/web/compose-compiler-integration/main-template/gradlew b/html/compose-compiler-integration/main-template/gradlew old mode 100755 new mode 100644 similarity index 100% rename from web/compose-compiler-integration/main-template/gradlew rename to html/compose-compiler-integration/main-template/gradlew diff --git a/web/compose-compiler-integration/main-template/gradlew.bat b/html/compose-compiler-integration/main-template/gradlew.bat similarity index 100% rename from web/compose-compiler-integration/main-template/gradlew.bat rename to html/compose-compiler-integration/main-template/gradlew.bat diff --git a/web/compose-compiler-integration/main-template/lib/build.gradle.kts b/html/compose-compiler-integration/main-template/lib/build.gradle.kts similarity index 100% rename from web/compose-compiler-integration/main-template/lib/build.gradle.kts rename to html/compose-compiler-integration/main-template/lib/build.gradle.kts diff --git a/web/compose-compiler-integration/main-template/lib/src/commonMain/kotlin/Lib.kt b/html/compose-compiler-integration/main-template/lib/src/commonMain/kotlin/Lib.kt similarity index 100% rename from web/compose-compiler-integration/main-template/lib/src/commonMain/kotlin/Lib.kt rename to html/compose-compiler-integration/main-template/lib/src/commonMain/kotlin/Lib.kt diff --git a/web/compose-compiler-integration/main-template/settings.gradle.kts b/html/compose-compiler-integration/main-template/settings.gradle.kts similarity index 100% rename from web/compose-compiler-integration/main-template/settings.gradle.kts rename to html/compose-compiler-integration/main-template/settings.gradle.kts diff --git a/web/compose-compiler-integration/main-template/src/commonMain/kotlin/Expect.kt b/html/compose-compiler-integration/main-template/src/commonMain/kotlin/Expect.kt similarity index 100% rename from web/compose-compiler-integration/main-template/src/commonMain/kotlin/Expect.kt rename to html/compose-compiler-integration/main-template/src/commonMain/kotlin/Expect.kt diff --git a/web/compose-compiler-integration/main-template/src/commonMain/kotlin/Main.kt b/html/compose-compiler-integration/main-template/src/commonMain/kotlin/Main.kt similarity index 100% rename from web/compose-compiler-integration/main-template/src/commonMain/kotlin/Main.kt rename to html/compose-compiler-integration/main-template/src/commonMain/kotlin/Main.kt diff --git a/web/compose-compiler-integration/main-template/src/jsMain/kotlin/Deps.kt b/html/compose-compiler-integration/main-template/src/jsMain/kotlin/Deps.kt similarity index 100% rename from web/compose-compiler-integration/main-template/src/jsMain/kotlin/Deps.kt rename to html/compose-compiler-integration/main-template/src/jsMain/kotlin/Deps.kt diff --git a/web/compose-compiler-integration/src/jsMain/kotlin/CrossmoduleTestsDependencies.kt b/html/compose-compiler-integration/src/jsMain/kotlin/CrossmoduleTestsDependencies.kt similarity index 100% rename from web/compose-compiler-integration/src/jsMain/kotlin/CrossmoduleTestsDependencies.kt rename to html/compose-compiler-integration/src/jsMain/kotlin/CrossmoduleTestsDependencies.kt diff --git a/web/compose-compiler-integration/src/jsTest/kotlin/AnonymousObjectsInComposable.kt b/html/compose-compiler-integration/src/jsTest/kotlin/AnonymousObjectsInComposable.kt similarity index 100% rename from web/compose-compiler-integration/src/jsTest/kotlin/AnonymousObjectsInComposable.kt rename to html/compose-compiler-integration/src/jsTest/kotlin/AnonymousObjectsInComposable.kt diff --git a/web/compose-compiler-integration/src/jsTest/kotlin/ComposableLambdaCalls.kt b/html/compose-compiler-integration/src/jsTest/kotlin/ComposableLambdaCalls.kt similarity index 100% rename from web/compose-compiler-integration/src/jsTest/kotlin/ComposableLambdaCalls.kt rename to html/compose-compiler-integration/src/jsTest/kotlin/ComposableLambdaCalls.kt diff --git a/web/compose-compiler-integration/src/jsTest/kotlin/ComposablesInConstructorTests.kt b/html/compose-compiler-integration/src/jsTest/kotlin/ComposablesInConstructorTests.kt similarity index 100% rename from web/compose-compiler-integration/src/jsTest/kotlin/ComposablesInConstructorTests.kt rename to html/compose-compiler-integration/src/jsTest/kotlin/ComposablesInConstructorTests.kt diff --git a/web/compose-compiler-integration/src/jsTest/kotlin/InheritanceTests.kt b/html/compose-compiler-integration/src/jsTest/kotlin/InheritanceTests.kt similarity index 100% rename from web/compose-compiler-integration/src/jsTest/kotlin/InheritanceTests.kt rename to html/compose-compiler-integration/src/jsTest/kotlin/InheritanceTests.kt diff --git a/web/compose-compiler-integration/src/jsTest/kotlin/StabilityTests.kt b/html/compose-compiler-integration/src/jsTest/kotlin/StabilityTests.kt similarity index 100% rename from web/compose-compiler-integration/src/jsTest/kotlin/StabilityTests.kt rename to html/compose-compiler-integration/src/jsTest/kotlin/StabilityTests.kt diff --git a/web/compose-compiler-integration/testcases/failing/CompanionGetValueOperatorComposable.kt b/html/compose-compiler-integration/testcases/failing/CompanionGetValueOperatorComposable.kt similarity index 100% rename from web/compose-compiler-integration/testcases/failing/CompanionGetValueOperatorComposable.kt rename to html/compose-compiler-integration/testcases/failing/CompanionGetValueOperatorComposable.kt diff --git a/web/compose-compiler-integration/testcases/failing/InstanceGetValueOperatorComposable.kt b/html/compose-compiler-integration/testcases/failing/InstanceGetValueOperatorComposable.kt similarity index 100% rename from web/compose-compiler-integration/testcases/failing/InstanceGetValueOperatorComposable.kt rename to html/compose-compiler-integration/testcases/failing/InstanceGetValueOperatorComposable.kt diff --git a/web/compose-compiler-integration/testcases/failing/MutableStateDestructuringDeclarartion.kt b/html/compose-compiler-integration/testcases/failing/MutableStateDestructuringDeclarartion.kt similarity index 100% rename from web/compose-compiler-integration/testcases/failing/MutableStateDestructuringDeclarartion.kt rename to html/compose-compiler-integration/testcases/failing/MutableStateDestructuringDeclarartion.kt diff --git a/web/compose-compiler-integration/testcases/passing/ComposableWithDefaultValuesDefinedByOtherParams.kt b/html/compose-compiler-integration/testcases/passing/ComposableWithDefaultValuesDefinedByOtherParams.kt similarity index 100% rename from web/compose-compiler-integration/testcases/passing/ComposableWithDefaultValuesDefinedByOtherParams.kt rename to html/compose-compiler-integration/testcases/passing/ComposableWithDefaultValuesDefinedByOtherParams.kt diff --git a/web/compose-compiler-integration/testcases/passing/ComposableWithNullableTypeParameter.kt b/html/compose-compiler-integration/testcases/passing/ComposableWithNullableTypeParameter.kt similarity index 100% rename from web/compose-compiler-integration/testcases/passing/ComposableWithNullableTypeParameter.kt rename to html/compose-compiler-integration/testcases/passing/ComposableWithNullableTypeParameter.kt diff --git a/web/compose-compiler-integration/testcases/passing/ComposableWithParamsWithDefaultValues.kt b/html/compose-compiler-integration/testcases/passing/ComposableWithParamsWithDefaultValues.kt similarity index 100% rename from web/compose-compiler-integration/testcases/passing/ComposableWithParamsWithDefaultValues.kt rename to html/compose-compiler-integration/testcases/passing/ComposableWithParamsWithDefaultValues.kt diff --git a/web/compose-compiler-integration/testcases/passing/ComposableWithTypeParams.kt b/html/compose-compiler-integration/testcases/passing/ComposableWithTypeParams.kt similarity index 100% rename from web/compose-compiler-integration/testcases/passing/ComposableWithTypeParams.kt rename to html/compose-compiler-integration/testcases/passing/ComposableWithTypeParams.kt diff --git a/web/compose-compiler-integration/testcases/passing/ComposableWithTypedDefaultValues.kt b/html/compose-compiler-integration/testcases/passing/ComposableWithTypedDefaultValues.kt similarity index 100% rename from web/compose-compiler-integration/testcases/passing/ComposableWithTypedDefaultValues.kt rename to html/compose-compiler-integration/testcases/passing/ComposableWithTypedDefaultValues.kt diff --git a/web/compose-compiler-integration/testcases/passing/PassingComposableToConstructor.kt b/html/compose-compiler-integration/testcases/passing/PassingComposableToConstructor.kt similarity index 100% rename from web/compose-compiler-integration/testcases/passing/PassingComposableToConstructor.kt rename to html/compose-compiler-integration/testcases/passing/PassingComposableToConstructor.kt diff --git a/web/compose-compiler-integration/testcases/passing/WithComposableBlockUsingTypeParameterAndDefaultValue.kt b/html/compose-compiler-integration/testcases/passing/WithComposableBlockUsingTypeParameterAndDefaultValue.kt similarity index 100% rename from web/compose-compiler-integration/testcases/passing/WithComposableBlockUsingTypeParameterAndDefaultValue.kt rename to html/compose-compiler-integration/testcases/passing/WithComposableBlockUsingTypeParameterAndDefaultValue.kt diff --git a/web/core/build.gradle.kts b/html/core/build.gradle.kts similarity index 90% rename from web/core/build.gradle.kts rename to html/core/build.gradle.kts index 65375aea..0cd32929 100644 --- a/web/core/build.gradle.kts +++ b/html/core/build.gradle.kts @@ -31,7 +31,7 @@ kotlin { optIn("org.jetbrains.compose.web.internal.runtime.ComposeWebInternalApi") } dependencies { - implementation(project(":internal-web-core-runtime")) + implementation(project(":internal-html-core-runtime")) } } @@ -41,7 +41,7 @@ kotlin { optIn("org.jetbrains.compose.web.testutils.ComposeWebExperimentalTestsApi") } dependencies { - implementation(project(":test-utils")) + implementation(project(":html-test-utils")) implementation(kotlin("test-js")) } } diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/ExperimentalComposeWebApi.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/ExperimentalComposeWebApi.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/ExperimentalComposeWebApi.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/ExperimentalComposeWebApi.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/ExperimentalComposeWebStyleApi.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/ExperimentalComposeWebStyleApi.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/ExperimentalComposeWebStyleApi.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/ExperimentalComposeWebStyleApi.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/Attrs.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/Attrs.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/Attrs.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/Attrs.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/AttrsScope.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/AttrsScope.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/AttrsScope.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/AttrsScope.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/EventsListenerScope.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/EventsListenerScope.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/EventsListenerScope.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/EventsListenerScope.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/HtmlAttrMarker.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/HtmlAttrMarker.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/HtmlAttrMarker.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/HtmlAttrMarker.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/PredefinedAttrValues.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/PredefinedAttrValues.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/PredefinedAttrValues.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/PredefinedAttrValues.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/SyntheticEventListener.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/SyntheticEventListener.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/SyntheticEventListener.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/SyntheticEventListener.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/InputAttrsScope.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/InputAttrsScope.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/InputAttrsScope.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/InputAttrsScope.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/InternalControlledInputUtils.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/InternalControlledInputUtils.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/InternalControlledInputUtils.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/InternalControlledInputUtils.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/SelectAttrsScope.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/SelectAttrsScope.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/SelectAttrsScope.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/SelectAttrsScope.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/TextAreaAttrsScope.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/TextAreaAttrsScope.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/TextAreaAttrsScope.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/attributes/builders/TextAreaAttrsScope.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/BrowserAPI.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/BrowserAPI.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/BrowserAPI.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/BrowserAPI.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSBuilder.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSBuilder.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSBuilder.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSBuilder.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSEnums.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSEnums.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSEnums.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSEnums.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSKeyframeRule.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSKeyframeRule.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSKeyframeRule.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSKeyframeRule.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSKeywords.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSKeywords.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSKeywords.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSKeywords.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSMediaRule.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSMediaRule.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSMediaRule.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSMediaRule.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSOperations.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSOperations.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSOperations.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSOperations.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSRules.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSRules.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSRules.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSRules.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSUnits.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSUnits.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSUnits.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/CSSUnits.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/Color.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/Color.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/Color.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/Color.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StylePropertyValue.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StylePropertyValue.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StylePropertyValue.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StylePropertyValue.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleScope.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleScope.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleScope.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleScope.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleSheet.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleSheet.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleSheet.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleSheet.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleSheetBuilder.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleSheetBuilder.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleSheetBuilder.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleSheetBuilder.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/keywords/Keywords.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/keywords/Keywords.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/keywords/Keywords.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/keywords/Keywords.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/animation.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/animation.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/animation.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/animation.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/background.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/background.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/background.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/background.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/border.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/border.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/border.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/border.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/box.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/box.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/box.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/box.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/color.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/color.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/color.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/color.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/filter.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/filter.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/filter.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/filter.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/flex.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/flex.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/flex.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/flex.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/grid.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/grid.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/grid.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/grid.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/listStyle.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/listStyle.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/listStyle.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/listStyle.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/margin.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/margin.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/margin.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/margin.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/overflow.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/overflow.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/overflow.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/overflow.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/padding.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/padding.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/padding.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/padding.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/position.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/position.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/position.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/position.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/properties.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/properties.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/properties.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/properties.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/text.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/text.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/text.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/text.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/transform.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/transform.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/transform.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/transform.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/transitions.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/transitions.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/transitions.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/transitions.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/ui.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/ui.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/ui.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/ui.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/selectors/CSSSelectors.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/selectors/CSSSelectors.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/selectors/CSSSelectors.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/selectors/CSSSelectors.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/utils/stylsheet.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/utils/stylsheet.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/utils/stylsheet.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/utils/stylsheet.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Base.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Base.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Base.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Base.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/ElementScope.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/ElementScope.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/ElementScope.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/ElementScope.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Elements.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Elements.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Elements.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Elements.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/InputElements.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/InputElements.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/InputElements.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/InputElements.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/RadioGroup.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/RadioGroup.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/RadioGroup.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/RadioGroup.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Style.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Style.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Style.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Style.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticAnimationEvent.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticAnimationEvent.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticAnimationEvent.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticAnimationEvent.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticChangeEvent.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticChangeEvent.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticChangeEvent.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticChangeEvent.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticClipboardEvent.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticClipboardEvent.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticClipboardEvent.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticClipboardEvent.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticEvent.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticEvent.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticEvent.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticEvent.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticFocusEvent.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticFocusEvent.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticFocusEvent.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticFocusEvent.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticInputEvent.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticInputEvent.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticInputEvent.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticInputEvent.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticKeyboardEvent.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticKeyboardEvent.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticKeyboardEvent.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticKeyboardEvent.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticMouseEvent.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticMouseEvent.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticMouseEvent.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticMouseEvent.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticSelectEvent.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticSelectEvent.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticSelectEvent.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticSelectEvent.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticSubmitEvent.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticSubmitEvent.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticSubmitEvent.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticSubmitEvent.kt diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticTouchEvent.kt b/html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticTouchEvent.kt similarity index 100% rename from web/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticTouchEvent.kt rename to html/core/src/jsMain/kotlin/org/jetbrains/compose/web/events/SyntheticTouchEvent.kt diff --git a/web/core/src/jsMain/resources/index.html b/html/core/src/jsMain/resources/index.html similarity index 100% rename from web/core/src/jsMain/resources/index.html rename to html/core/src/jsMain/resources/index.html diff --git a/web/core/src/jsTest/kotlin/CSSEnums.kt b/html/core/src/jsTest/kotlin/CSSEnums.kt similarity index 100% rename from web/core/src/jsTest/kotlin/CSSEnums.kt rename to html/core/src/jsTest/kotlin/CSSEnums.kt diff --git a/web/core/src/jsTest/kotlin/CSSStylesheetTests.kt b/html/core/src/jsTest/kotlin/CSSStylesheetTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/CSSStylesheetTests.kt rename to html/core/src/jsTest/kotlin/CSSStylesheetTests.kt diff --git a/web/core/src/jsTest/kotlin/CSSUnitApiTests.kt b/html/core/src/jsTest/kotlin/CSSUnitApiTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/CSSUnitApiTests.kt rename to html/core/src/jsTest/kotlin/CSSUnitApiTests.kt diff --git a/web/core/src/jsTest/kotlin/ControlledRadioGroupsTests.kt b/html/core/src/jsTest/kotlin/ControlledRadioGroupsTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/ControlledRadioGroupsTests.kt rename to html/core/src/jsTest/kotlin/ControlledRadioGroupsTests.kt diff --git a/web/core/src/jsTest/kotlin/CssSelectorsTests.kt b/html/core/src/jsTest/kotlin/CssSelectorsTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/CssSelectorsTests.kt rename to html/core/src/jsTest/kotlin/CssSelectorsTests.kt diff --git a/web/core/src/jsTest/kotlin/DomSideEffectTests.kt b/html/core/src/jsTest/kotlin/DomSideEffectTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/DomSideEffectTests.kt rename to html/core/src/jsTest/kotlin/DomSideEffectTests.kt diff --git a/web/core/src/jsTest/kotlin/FailingTestCases.kt b/html/core/src/jsTest/kotlin/FailingTestCases.kt similarity index 100% rename from web/core/src/jsTest/kotlin/FailingTestCases.kt rename to html/core/src/jsTest/kotlin/FailingTestCases.kt diff --git a/web/core/src/jsTest/kotlin/InlineStyleTests.kt b/html/core/src/jsTest/kotlin/InlineStyleTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/InlineStyleTests.kt rename to html/core/src/jsTest/kotlin/InlineStyleTests.kt diff --git a/web/core/src/jsTest/kotlin/MediaQueryTests.kt b/html/core/src/jsTest/kotlin/MediaQueryTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/MediaQueryTests.kt rename to html/core/src/jsTest/kotlin/MediaQueryTests.kt diff --git a/web/core/src/jsTest/kotlin/StaticComposableTests.kt b/html/core/src/jsTest/kotlin/StaticComposableTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/StaticComposableTests.kt rename to html/core/src/jsTest/kotlin/StaticComposableTests.kt diff --git a/web/core/src/jsTest/kotlin/css/AnimationTests.kt b/html/core/src/jsTest/kotlin/css/AnimationTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/AnimationTests.kt rename to html/core/src/jsTest/kotlin/css/AnimationTests.kt diff --git a/web/core/src/jsTest/kotlin/css/CSSBackgroundTests.kt b/html/core/src/jsTest/kotlin/css/CSSBackgroundTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/CSSBackgroundTests.kt rename to html/core/src/jsTest/kotlin/css/CSSBackgroundTests.kt diff --git a/web/core/src/jsTest/kotlin/css/CSSBorderTests.kt b/html/core/src/jsTest/kotlin/css/CSSBorderTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/CSSBorderTests.kt rename to html/core/src/jsTest/kotlin/css/CSSBorderTests.kt diff --git a/web/core/src/jsTest/kotlin/css/CSSBoxTests.kt b/html/core/src/jsTest/kotlin/css/CSSBoxTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/CSSBoxTests.kt rename to html/core/src/jsTest/kotlin/css/CSSBoxTests.kt diff --git a/web/core/src/jsTest/kotlin/css/CSSDisplayTests.kt b/html/core/src/jsTest/kotlin/css/CSSDisplayTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/CSSDisplayTests.kt rename to html/core/src/jsTest/kotlin/css/CSSDisplayTests.kt diff --git a/web/core/src/jsTest/kotlin/css/CSSFlexTests.kt b/html/core/src/jsTest/kotlin/css/CSSFlexTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/CSSFlexTests.kt rename to html/core/src/jsTest/kotlin/css/CSSFlexTests.kt diff --git a/web/core/src/jsTest/kotlin/css/CSSListStyleTests.kt b/html/core/src/jsTest/kotlin/css/CSSListStyleTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/CSSListStyleTests.kt rename to html/core/src/jsTest/kotlin/css/CSSListStyleTests.kt diff --git a/web/core/src/jsTest/kotlin/css/CSSMarginTests.kt b/html/core/src/jsTest/kotlin/css/CSSMarginTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/CSSMarginTests.kt rename to html/core/src/jsTest/kotlin/css/CSSMarginTests.kt diff --git a/web/core/src/jsTest/kotlin/css/CSSOverflowTests.kt b/html/core/src/jsTest/kotlin/css/CSSOverflowTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/CSSOverflowTests.kt rename to html/core/src/jsTest/kotlin/css/CSSOverflowTests.kt diff --git a/web/core/src/jsTest/kotlin/css/CSSPaddingTests.kt b/html/core/src/jsTest/kotlin/css/CSSPaddingTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/CSSPaddingTests.kt rename to html/core/src/jsTest/kotlin/css/CSSPaddingTests.kt diff --git a/web/core/src/jsTest/kotlin/css/CSSTextTests.kt b/html/core/src/jsTest/kotlin/css/CSSTextTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/CSSTextTests.kt rename to html/core/src/jsTest/kotlin/css/CSSTextTests.kt diff --git a/web/core/src/jsTest/kotlin/css/CSSUiTests.kt b/html/core/src/jsTest/kotlin/css/CSSUiTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/CSSUiTests.kt rename to html/core/src/jsTest/kotlin/css/CSSUiTests.kt diff --git a/web/core/src/jsTest/kotlin/css/ColorTests.kt b/html/core/src/jsTest/kotlin/css/ColorTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/ColorTests.kt rename to html/core/src/jsTest/kotlin/css/ColorTests.kt diff --git a/web/core/src/jsTest/kotlin/css/FilterTests.kt b/html/core/src/jsTest/kotlin/css/FilterTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/FilterTests.kt rename to html/core/src/jsTest/kotlin/css/FilterTests.kt diff --git a/web/core/src/jsTest/kotlin/css/GridTests.kt b/html/core/src/jsTest/kotlin/css/GridTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/GridTests.kt rename to html/core/src/jsTest/kotlin/css/GridTests.kt diff --git a/web/core/src/jsTest/kotlin/css/NthChildTests.kt b/html/core/src/jsTest/kotlin/css/NthChildTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/NthChildTests.kt rename to html/core/src/jsTest/kotlin/css/NthChildTests.kt diff --git a/web/core/src/jsTest/kotlin/css/PositionTests.kt b/html/core/src/jsTest/kotlin/css/PositionTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/PositionTests.kt rename to html/core/src/jsTest/kotlin/css/PositionTests.kt diff --git a/web/core/src/jsTest/kotlin/css/StyleSheetTests.kt b/html/core/src/jsTest/kotlin/css/StyleSheetTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/StyleSheetTests.kt rename to html/core/src/jsTest/kotlin/css/StyleSheetTests.kt diff --git a/web/core/src/jsTest/kotlin/css/TransformTests.kt b/html/core/src/jsTest/kotlin/css/TransformTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/TransformTests.kt rename to html/core/src/jsTest/kotlin/css/TransformTests.kt diff --git a/web/core/src/jsTest/kotlin/css/TransitionsTests.kt b/html/core/src/jsTest/kotlin/css/TransitionsTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/css/TransitionsTests.kt rename to html/core/src/jsTest/kotlin/css/TransitionsTests.kt diff --git a/web/core/src/jsTest/kotlin/elements/AttributesTests.kt b/html/core/src/jsTest/kotlin/elements/AttributesTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/elements/AttributesTests.kt rename to html/core/src/jsTest/kotlin/elements/AttributesTests.kt diff --git a/web/core/src/jsTest/kotlin/elements/ElementsTests.kt b/html/core/src/jsTest/kotlin/elements/ElementsTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/elements/ElementsTests.kt rename to html/core/src/jsTest/kotlin/elements/ElementsTests.kt diff --git a/web/core/src/jsTest/kotlin/elements/EventTests.kt b/html/core/src/jsTest/kotlin/elements/EventTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/elements/EventTests.kt rename to html/core/src/jsTest/kotlin/elements/EventTests.kt diff --git a/web/core/src/jsTest/kotlin/elements/InputsGenerateCorrectHtmlTests.kt b/html/core/src/jsTest/kotlin/elements/InputsGenerateCorrectHtmlTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/elements/InputsGenerateCorrectHtmlTests.kt rename to html/core/src/jsTest/kotlin/elements/InputsGenerateCorrectHtmlTests.kt diff --git a/web/core/src/jsTest/kotlin/elements/RadioGroupTests.kt b/html/core/src/jsTest/kotlin/elements/RadioGroupTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/elements/RadioGroupTests.kt rename to html/core/src/jsTest/kotlin/elements/RadioGroupTests.kt diff --git a/web/core/src/jsTest/kotlin/elements/StyleTest.kt b/html/core/src/jsTest/kotlin/elements/StyleTest.kt similarity index 100% rename from web/core/src/jsTest/kotlin/elements/StyleTest.kt rename to html/core/src/jsTest/kotlin/elements/StyleTest.kt diff --git a/web/core/src/jsTest/kotlin/elements/TableTests.kt b/html/core/src/jsTest/kotlin/elements/TableTests.kt similarity index 100% rename from web/core/src/jsTest/kotlin/elements/TableTests.kt rename to html/core/src/jsTest/kotlin/elements/TableTests.kt diff --git a/web/gradle.properties b/html/gradle.properties similarity index 100% rename from web/gradle.properties rename to html/gradle.properties diff --git a/web/gradle/wrapper/gradle-wrapper.jar b/html/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from web/gradle/wrapper/gradle-wrapper.jar rename to html/gradle/wrapper/gradle-wrapper.jar diff --git a/web/gradle/wrapper/gradle-wrapper.properties b/html/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from web/gradle/wrapper/gradle-wrapper.properties rename to html/gradle/wrapper/gradle-wrapper.properties diff --git a/web/gradlew b/html/gradlew similarity index 100% rename from web/gradlew rename to html/gradlew diff --git a/web/gradlew.bat b/html/gradlew.bat similarity index 96% rename from web/gradlew.bat rename to html/gradlew.bat index ac1b06f9..107acd32 100644 --- a/web/gradlew.bat +++ b/html/gradlew.bat @@ -1,89 +1,89 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/web/integration-core/build.gradle.kts b/html/integration-core/build.gradle.kts similarity index 98% rename from web/integration-core/build.gradle.kts rename to html/integration-core/build.gradle.kts index 5528b051..0d5c76e7 100644 --- a/web/integration-core/build.gradle.kts +++ b/html/integration-core/build.gradle.kts @@ -33,7 +33,7 @@ kotlin { val commonMain by getting { dependencies { implementation(compose.runtime) - implementation(project(":web-core")) + implementation(project(":html-core")) implementation(kotlin("stdlib-common")) } } diff --git a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/CodeSnippetSamples.kt b/html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/CodeSnippetSamples.kt similarity index 100% rename from web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/CodeSnippetSamples.kt rename to html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/CodeSnippetSamples.kt diff --git a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/HighlightJs.kt b/html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/HighlightJs.kt similarity index 100% rename from web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/HighlightJs.kt rename to html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/HighlightJs.kt diff --git a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/Sample.kt b/html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/Sample.kt similarity index 100% rename from web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/Sample.kt rename to html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/Sample.kt diff --git a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/Common.kt b/html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/Common.kt similarity index 100% rename from web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/Common.kt rename to html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/Common.kt diff --git a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/ControlledInputsCursorsPositionTests.kt b/html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/ControlledInputsCursorsPositionTests.kt similarity index 100% rename from web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/ControlledInputsCursorsPositionTests.kt rename to html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/ControlledInputsCursorsPositionTests.kt diff --git a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/ControlledInputsTests.kt b/html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/ControlledInputsTests.kt similarity index 100% rename from web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/ControlledInputsTests.kt rename to html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/ControlledInputsTests.kt diff --git a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/EventsTests.kt b/html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/EventsTests.kt similarity index 100% rename from web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/EventsTests.kt rename to html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/EventsTests.kt diff --git a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/InputsTests.kt b/html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/InputsTests.kt similarity index 100% rename from web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/InputsTests.kt rename to html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/InputsTests.kt diff --git a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/RadioGroupTestCases.kt b/html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/RadioGroupTestCases.kt similarity index 100% rename from web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/RadioGroupTestCases.kt rename to html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/RadioGroupTestCases.kt diff --git a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/SelectElementTests.kt b/html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/SelectElementTests.kt similarity index 100% rename from web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/SelectElementTests.kt rename to html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/SelectElementTests.kt diff --git a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/TestCases1.kt b/html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/TestCases1.kt similarity index 100% rename from web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/TestCases1.kt rename to html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/TestCases1.kt diff --git a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/UncontrolledInputsTests.kt b/html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/UncontrolledInputsTests.kt similarity index 100% rename from web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/UncontrolledInputsTests.kt rename to html/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/UncontrolledInputsTests.kt diff --git a/web/integration-core/src/jsMain/resources/hljs.css b/html/integration-core/src/jsMain/resources/hljs.css similarity index 100% rename from web/integration-core/src/jsMain/resources/hljs.css rename to html/integration-core/src/jsMain/resources/hljs.css diff --git a/web/integration-core/src/jsMain/resources/index.html b/html/integration-core/src/jsMain/resources/index.html similarity index 100% rename from web/integration-core/src/jsMain/resources/index.html rename to html/integration-core/src/jsMain/resources/index.html diff --git a/web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/ControlledInputsCursorsPositionTests.kt b/html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/ControlledInputsCursorsPositionTests.kt similarity index 100% rename from web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/ControlledInputsCursorsPositionTests.kt rename to html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/ControlledInputsCursorsPositionTests.kt diff --git a/web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/ControlledInputsTests.kt b/html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/ControlledInputsTests.kt similarity index 100% rename from web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/ControlledInputsTests.kt rename to html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/ControlledInputsTests.kt diff --git a/web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/EventTests.kt b/html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/EventTests.kt similarity index 100% rename from web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/EventTests.kt rename to html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/EventTests.kt diff --git a/web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/InputsTests.kt b/html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/InputsTests.kt similarity index 100% rename from web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/InputsTests.kt rename to html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/InputsTests.kt diff --git a/web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/IntegrationTests.kt b/html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/IntegrationTests.kt similarity index 100% rename from web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/IntegrationTests.kt rename to html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/IntegrationTests.kt diff --git a/web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/RadioGroupTests.kt b/html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/RadioGroupTests.kt similarity index 100% rename from web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/RadioGroupTests.kt rename to html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/RadioGroupTests.kt diff --git a/web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/SelectElementTests.kt b/html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/SelectElementTests.kt similarity index 100% rename from web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/SelectElementTests.kt rename to html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/SelectElementTests.kt diff --git a/web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/UncontrolledInputsTests.kt b/html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/UncontrolledInputsTests.kt similarity index 100% rename from web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/UncontrolledInputsTests.kt rename to html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/UncontrolledInputsTests.kt diff --git a/web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/BaseIntegrationTests.kt b/html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/BaseIntegrationTests.kt similarity index 100% rename from web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/BaseIntegrationTests.kt rename to html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/BaseIntegrationTests.kt diff --git a/web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/DisplayNameSimplifier.kt b/html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/DisplayNameSimplifier.kt similarity index 100% rename from web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/DisplayNameSimplifier.kt rename to html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/DisplayNameSimplifier.kt diff --git a/web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/IntegrationTestsSetup.kt b/html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/IntegrationTestsSetup.kt similarity index 100% rename from web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/IntegrationTestsSetup.kt rename to html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/IntegrationTestsSetup.kt diff --git a/web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/ServerLauncher.kt b/html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/ServerLauncher.kt similarity index 100% rename from web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/ServerLauncher.kt rename to html/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/common/ServerLauncher.kt diff --git a/web/internal-web-core-runtime/build.gradle.kts b/html/internal-html-core-runtime/build.gradle.kts similarity index 100% rename from web/internal-web-core-runtime/build.gradle.kts rename to html/internal-html-core-runtime/build.gradle.kts diff --git a/web/internal-web-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/dom/DOMSCope.kt b/html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/dom/DOMSCope.kt similarity index 100% rename from web/internal-web-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/dom/DOMSCope.kt rename to html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/dom/DOMSCope.kt diff --git a/web/internal-web-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/ComposeWebInternalApi.kt b/html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/ComposeWebInternalApi.kt similarity index 100% rename from web/internal-web-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/ComposeWebInternalApi.kt rename to html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/ComposeWebInternalApi.kt diff --git a/web/internal-web-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/DomApplier.kt b/html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/DomApplier.kt similarity index 100% rename from web/internal-web-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/DomApplier.kt rename to html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/DomApplier.kt diff --git a/web/internal-web-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/GlobalSnapshotManager.kt b/html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/GlobalSnapshotManager.kt similarity index 100% rename from web/internal-web-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/GlobalSnapshotManager.kt rename to html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/GlobalSnapshotManager.kt diff --git a/web/internal-web-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/JsMicrotasksDispatcher.kt b/html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/JsMicrotasksDispatcher.kt similarity index 100% rename from web/internal-web-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/JsMicrotasksDispatcher.kt rename to html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/JsMicrotasksDispatcher.kt diff --git a/web/internal-web-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/renderComposable.kt b/html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/renderComposable.kt similarity index 100% rename from web/internal-web-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/renderComposable.kt rename to html/internal-html-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/renderComposable.kt diff --git a/web/internal-web-core-runtime/src/jsTest/kotlin/RenderComposableTests.kt b/html/internal-html-core-runtime/src/jsTest/kotlin/RenderComposableTests.kt similarity index 100% rename from web/internal-web-core-runtime/src/jsTest/kotlin/RenderComposableTests.kt rename to html/internal-html-core-runtime/src/jsTest/kotlin/RenderComposableTests.kt diff --git a/web/kotlin-js-store/yarn.lock b/html/kotlin-js-store/yarn.lock similarity index 91% rename from web/kotlin-js-store/yarn.lock rename to html/kotlin-js-store/yarn.lock index 176f2803..e94e6822 100644 --- a/web/kotlin-js-store/yarn.lock +++ b/html/kotlin-js-store/yarn.lock @@ -21,10 +21,10 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/resolve-uri@^3.0.3": - version "3.0.8" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.8.tgz#687cc2bbf243f4e9a868ecf2262318e2658873a1" - integrity sha512-YK5G9LaddzGbcucK4c8h5tWFmMPBvRZ/uyWmN1/SbBdIvqGUdWGkJ5BAaccgs6XbzVLsqbPJrBSFwKv3kT9i7w== +"@jridgewell/resolve-uri@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" + integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== "@jridgewell/set-array@^1.0.1": version "1.1.2" @@ -39,18 +39,18 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/sourcemap-codec@^1.4.10": +"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": version "1.4.14" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== -"@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.14" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed" - integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ== +"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": + version "0.3.17" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" + integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/resolve-uri" "3.1.0" + "@jridgewell/sourcemap-codec" "1.4.14" "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -84,9 +84,11 @@ 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== + version "2.8.13" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.13.tgz#b8ade22ba455a1b8cb3b5d3f35910fd204f84f94" + integrity sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA== + dependencies: + "@types/node" "*" "@types/eslint-scope@^3.7.3": version "3.7.4" @@ -97,17 +99,17 @@ "@types/estree" "*" "@types/eslint@*": - version "8.4.3" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.3.tgz#5c92815a3838b1985c90034cd85f26f59d9d0ece" - integrity sha512-YP1S7YJRMPs+7KZKDb9G63n8YejIwW9BALq7a5j2+H4yl6iOv9CB29edho+cuFRrvmJbbaH2yiVChKLJVysDGw== + version "8.37.0" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.37.0.tgz#29cebc6c2a3ac7fea7113207bf5a828fdf4d7ef1" + integrity sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ== dependencies: "@types/estree" "*" "@types/json-schema" "*" "@types/estree@*": - version "0.0.52" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.52.tgz#7f1f57ad5b741f3d5b210d3b1f145640d89bf8fe" - integrity sha512-BZWrtCU0bMVAIliIV+HJO1f1PR41M7NKjfxrFJwwhKI1KwhwOxYw1SXg9ao+CIMt774nFuGiG6eU+udtbEI9oQ== + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" + integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== "@types/estree@^0.0.51": version "0.0.51" @@ -115,9 +117,9 @@ integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== "@types/http-proxy@^1.17.8": - version "1.17.9" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a" - integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw== + version "1.17.10" + resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.10.tgz#e576c8e4a0cc5c6a138819025a88e167ebb38d6c" + integrity sha512-Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g== dependencies: "@types/node" "*" @@ -127,9 +129,9 @@ integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== "@types/node@*", "@types/node@>=10.0.0": - version "18.0.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a" - integrity sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA== + version "18.15.11" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.11.tgz#b3b790f09cb1696cffcec605de025b088fa4225f" + integrity sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q== "@types/retry@0.12.0": version "0.12.0" @@ -307,12 +309,7 @@ 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@^8.5.0: - version "8.7.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" - integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== - -acorn@^8.7.1: +acorn@^8.5.0, acorn@^8.7.1: version "8.8.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== @@ -355,9 +352,9 @@ ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.0, ajv@^8.8.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" - integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== + version "8.12.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" + integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -392,9 +389,9 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: color-convert "^2.0.1" anymatch@~3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" @@ -419,7 +416,7 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -async@^2.6.2: +async@^2.6.4: version "2.6.4" resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== @@ -446,10 +443,10 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -body-parser@1.20.0, body-parser@^1.19.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5" - integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg== +body-parser@1.20.1: + version "1.20.1" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" + integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== dependencies: bytes "3.1.2" content-type "~1.0.4" @@ -459,11 +456,29 @@ body-parser@1.20.0, body-parser@^1.19.0: http-errors "2.0.0" iconv-lite "0.4.24" on-finished "2.4.1" - qs "6.10.3" + qs "6.11.0" raw-body "2.5.1" type-is "~1.6.18" unpipe "1.0.0" +body-parser@^1.19.0: + version "1.20.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" + integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== + dependencies: + bytes "3.1.2" + content-type "~1.0.5" + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" + iconv-lite "0.4.24" + on-finished "2.4.1" + qs "6.11.0" + raw-body "2.5.2" + type-is "~1.6.18" + unpipe "1.0.0" + bonjour@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" @@ -504,14 +519,14 @@ browser-stdout@1.3.1: integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== browserslist@^4.14.5: - version "4.21.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.1.tgz#c9b9b0a54c7607e8dc3e01a0d311727188011a00" - integrity sha512-Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ== + version "4.21.5" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" + integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== dependencies: - caniuse-lite "^1.0.30001359" - electron-to-chromium "^1.4.172" - node-releases "^2.0.5" - update-browserslist-db "^1.0.4" + caniuse-lite "^1.0.30001449" + electron-to-chromium "^1.4.284" + node-releases "^2.0.8" + update-browserslist-db "^1.0.10" buffer-from@^1.0.0: version "1.1.2" @@ -546,10 +561,10 @@ camelcase@^6.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001359: - version "1.0.30001361" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001361.tgz#ba2adb2527566fb96f3ac7c67698ae7fc495a28d" - integrity sha512-ybhCrjNtkFji1/Wto6SSJKkWk6kZgVQsDq5QI83SafsF6FXv2JB4df9eEdH6g8sdGgqTXrFLjAxqBGgYoU3azQ== +caniuse-lite@^1.0.30001449: + version "1.0.30001474" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001474.tgz#13b6fe301a831fe666cce8ca4ef89352334133d5" + integrity sha512-iaIZ8gVrWfemh5DG3T9/YqarVZoYf0r188IjaGwx68j4Pf0SGY6CQkmJUIE+NZHkkecQGohzXmBGEwWDr9aM3Q== chalk@^4.1.0: version "4.1.2" @@ -681,10 +696,10 @@ content-disposition@0.5.4: 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== +content-type@~1.0.4, content-type@~1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" + integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== cookie-signature@1.0.6: version "1.0.6" @@ -747,7 +762,7 @@ debug@4.3.4, debug@^4.1.0, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: dependencies: ms "2.1.2" -debug@^3.1.1: +debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== @@ -784,9 +799,9 @@ define-lazy-prop@^2.0.0: integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== define-properties@^1.1.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" - integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== + version "1.2.0" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" + integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== dependencies: has-property-descriptors "^1.0.0" object-keys "^1.1.1" @@ -885,10 +900,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.4.172: - version "1.4.176" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.176.tgz#61ab2a1de3b5072ee31881a937c08ac6780d1cfa" - integrity sha512-92JdgyRlcNDwuy75MjuFSb3clt6DGJ2IXSpg0MCjKd3JV9eSmuUAIyWiGAp/EtT0z2D4rqbYqThQLV90maH3Zw== +electron-to-chromium@^1.4.284: + version "1.4.352" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.352.tgz#be96bd7c2f4b980deebc9338a49a67430a33ed73" + integrity sha512-ikFUEyu5/q+wJpMOxWxTaEVk2M1qKqTGKKyfJmod1CPZxKfYnxVS41/GCBQg21ItBpZybyN8sNpRqCUGm+Zc4Q== emoji-regex@^8.0.0: version "8.0.0" @@ -901,14 +916,14 @@ encodeurl@~1.0.2: integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== 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== + version "5.0.6" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.6.tgz#7811244af173e157295dec9b2718dfe42a64ef45" + integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw== -engine.io@~6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.2.0.tgz#003bec48f6815926f2b1b17873e576acd54f41d0" - integrity sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg== +engine.io@~6.4.1: + version "6.4.1" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.4.1.tgz#8056b4526a88e779f9c280d820422d4e3eeaaae5" + integrity sha512-JFYQurD/nbsA5BSPmbaOSLa3tSVj8L6o4srSwXXY3NqE+gGUNmmPTbhn8tjzcCtSqhFgIeqef81ngny8JM25hw== dependencies: "@types/cookie" "^0.4.1" "@types/cors" "^2.8.12" @@ -919,7 +934,7 @@ engine.io@~6.2.0: cors "~2.8.5" debug "~4.3.1" engine.io-parser "~5.0.3" - ws "~8.2.3" + ws "~8.11.0" enhanced-resolve@^5.10.0: version "5.12.0" @@ -1015,13 +1030,13 @@ execa@^5.0.0: strip-final-newline "^2.0.0" express@^4.17.1: - version "4.18.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf" - integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q== + version "4.18.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" + integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.0" + body-parser "1.20.1" content-disposition "0.5.4" content-type "~1.0.4" cookie "0.5.0" @@ -1040,7 +1055,7 @@ express@^4.17.1: parseurl "~1.3.3" path-to-regexp "0.1.7" proxy-addr "~2.0.7" - qs "6.10.3" + qs "6.11.0" range-parser "~1.2.1" safe-buffer "5.2.1" send "0.18.0" @@ -1062,9 +1077,9 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-glob@^3.2.9: - version "3.2.11" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" - integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== + version "3.2.12" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" + integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -1078,14 +1093,14 @@ fast-json-stable-stringify@^2.0.0: integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== fastest-levenshtein@^1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" - integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== + version "1.0.16" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" + integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== + version "1.15.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" + integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== dependencies: reusify "^1.0.4" @@ -1156,9 +1171,9 @@ flatted@^3.2.7: integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== follow-redirects@^1.0.0: - 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== + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== format-util@1.0.5: version "1.0.5" @@ -1215,9 +1230,9 @@ get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598" - integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA== + version "1.2.0" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" + integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -1282,9 +1297,9 @@ google-protobuf@3.12.2: integrity sha512-4CZhpuRr1d6HjlyrxoXoocoGFnRYgKULgMtikMddA9ztRyYR59Aondv2FioyxWVamRo0rF2XpYawkTCBEQOSkA== graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== handle-thing@^2.0.0: version "2.0.1" @@ -1418,9 +1433,9 @@ iconv-lite@^0.6.3: safer-buffer ">= 2.1.2 < 3.0.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== + version "5.2.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" + integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== import-local@^3.0.2: version "3.1.0" @@ -1503,10 +1518,10 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" -is-core-module@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" - integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== +is-core-module@^2.11.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" + integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== dependencies: has "^1.0.3" @@ -1767,15 +1782,15 @@ log-symbols@4.1.0: is-unicode-supported "^0.1.0" log4js@^6.4.1: - version "6.7.0" - resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.7.0.tgz#fff671a74b2f6e956d135c3c756c79072809a23b" - integrity sha512-KA0W9ffgNBLDj6fZCq/lRbgR6ABAodRIDHrZnS48vOtfKa4PzWImb0Md1lmGCdO3n3sbCm/n1/WmrNlZ8kCI3Q== + version "6.9.1" + resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.9.1.tgz#aba5a3ff4e7872ae34f8b4c533706753709e38b6" + integrity sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g== dependencies: date-format "^4.0.14" debug "^4.3.4" flatted "^3.2.7" rfdc "^1.3.0" - streamroller "^3.1.3" + streamroller "^3.1.5" media-typer@0.3.0: version "0.3.0" @@ -1783,9 +1798,9 @@ media-typer@0.3.0: integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== memfs@^3.4.3: - version "3.4.7" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.7.tgz#e5252ad2242a724f938cb937e3c4f7ceb1f70e5a" - integrity sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw== + version "3.4.13" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.13.tgz#248a8bd239b3c240175cd5ec548de5227fc4f345" + integrity sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg== dependencies: fs-monkey "^1.0.3" @@ -1864,11 +1879,11 @@ minimatch@^3.0.4, minimatch@^3.1.1: brace-expansion "^1.1.7" minimist@^1.2.3, 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== + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== -mkdirp@^0.5.5: +mkdirp@^0.5.5, mkdirp@^0.5.6: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== @@ -1951,10 +1966,10 @@ node-forge@^0.10.0: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== -node-releases@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666" - integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q== +node-releases@^2.0.8: + version "2.0.10" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f" + integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w== normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" @@ -1974,9 +1989,9 @@ object-assign@^4: integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== object-inspect@^1.9.0: - version "1.12.2" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" - integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== + version "1.12.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" + integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== object-is@^1.0.1: version "1.1.5" @@ -2030,9 +2045,9 @@ onetime@^5.1.2: mimic-fn "^2.1.0" open@^8.0.9: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== + version "8.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9" + integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ== dependencies: define-lazy-prop "^2.0.0" is-docker "^2.1.1" @@ -2158,13 +2173,13 @@ pkg-dir@^4.2.0: find-up "^4.0.0" portfinder@^1.0.28: - version "1.0.28" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" - integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== + version "1.0.32" + resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.32.tgz#2fe1b9e58389712429dc2bea5beb2146146c7f81" + integrity sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg== dependencies: - async "^2.6.2" - debug "^3.1.1" - mkdirp "^0.5.5" + async "^2.6.4" + debug "^3.2.7" + mkdirp "^0.5.6" process-nextick-args@~2.0.0: version "2.0.1" @@ -2185,19 +2200,19 @@ punycode@1.3.2: integrity sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw== punycode@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== qjobs@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071" integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg== -qs@6.10.3: - version "6.10.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e" - integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ== +qs@6.11.0: + 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" @@ -2233,10 +2248,20 @@ raw-body@2.5.1: iconv-lite "0.4.24" unpipe "1.0.0" +raw-body@2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" + integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== + dependencies: + bytes "3.1.2" + http-errors "2.0.0" + iconv-lite "0.4.24" + unpipe "1.0.0" + readable-stream@^2.0.1: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + version "2.3.8" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" + integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -2247,9 +2272,9 @@ readable-stream@^2.0.1: util-deprecate "~1.0.1" readable-stream@^3.0.6: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" @@ -2306,11 +2331,11 @@ resolve-from@^5.0.0: integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== resolve@^1.9.0: - version "1.22.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" - integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== + version "1.22.2" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" + integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== dependencies: - is-core-module "^2.9.0" + is-core-module "^2.11.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -2408,13 +2433,20 @@ send@0.18.0: range-parser "~1.2.1" statuses "2.0.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@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" + integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== + dependencies: + randombytes "^2.1.0" + serve-index@^1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" @@ -2486,30 +2518,32 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== -socket.io-adapter@~2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6" - integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg== +socket.io-adapter@~2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz#5de9477c9182fdc171cd8c8364b9a8894ec75d12" + integrity sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA== + dependencies: + ws "~8.11.0" -socket.io-parser@~4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5" - integrity sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g== +socket.io-parser@~4.2.1: + version "4.2.2" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206" + integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw== dependencies: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" socket.io@^4.4.1: - version "4.5.3" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.3.tgz#44dffea48d7f5aa41df4a66377c386b953bc521c" - integrity sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg== + version "4.6.1" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.6.1.tgz#62ec117e5fce0692fa50498da9347cfb52c3bc70" + integrity sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA== dependencies: accepts "~1.3.4" base64id "~2.0.0" debug "~4.3.2" - engine.io "~6.2.0" - socket.io-adapter "~2.4.0" - socket.io-parser "~4.2.0" + engine.io "~6.4.1" + socket.io-adapter "~2.5.2" + socket.io-parser "~4.2.1" sockjs@^0.3.21: version "0.3.24" @@ -2534,7 +2568,7 @@ source-map-loader@4.0.0: iconv-lite "^0.6.3" source-map-js "^1.0.2" -source-map-support@~0.5.20: +source-map-support@0.5.21, source-map-support@~0.5.20: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -2580,10 +2614,10 @@ statuses@2.0.1: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== -streamroller@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.3.tgz#d95689a8c29b30d093525d0baffe6616fd62ca7e" - integrity sha512-CphIJyFx2SALGHeINanjFRKQ4l7x2c+rXYJ4BMq0gd+ZK0gi4VT8b+eHe2wi58x4UayBAKx4xtHpXT/ea1cz8w== +streamroller@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.5.tgz#1263182329a45def1ffaef58d31b15d13d2ee7ff" + integrity sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw== dependencies: date-format "^4.0.14" debug "^4.3.4" @@ -2661,20 +2695,20 @@ tapable@^2.1.1, tapable@^2.2.0: integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== terser-webpack-plugin@^5.1.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz#8033db876dd5875487213e87c627bca323e5ed90" - integrity sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ== + version "5.3.7" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz#ef760632d24991760f339fe9290deb936ad1ffc7" + integrity sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw== dependencies: - "@jridgewell/trace-mapping" "^0.3.7" + "@jridgewell/trace-mapping" "^0.3.17" jest-worker "^27.4.5" schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - terser "^5.7.2" + serialize-javascript "^6.0.1" + terser "^5.16.5" -terser@^5.7.2: - version "5.14.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.1.tgz#7c95eec36436cb11cf1902cc79ac564741d19eca" - integrity sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ== +terser@^5.16.5: + version "5.16.8" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.8.tgz#ccde583dabe71df3f4ed02b65eb6532e0fae15d5" + integrity sha512-QI5g1E/ef7d+PsDifb+a6nnVgC4F22Bg6T0xrBrz6iloVB4PUkkunp6V8nzoOOZJIzjWVdAGqCdlKlhLq/TbIA== dependencies: "@jridgewell/source-map" "^0.3.2" acorn "^8.5.0" @@ -2724,9 +2758,9 @@ typescript@4.7.4: integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== ua-parser-js@^0.7.30: - version "0.7.32" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz#cd8c639cdca949e30fa68c44b7813ef13e36d211" - integrity sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw== + version "0.7.35" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.35.tgz#8bda4827be4f0b1dda91699a29499575a1f1d307" + integrity sha512-veRf7dawaj9xaWEu9HoTVn5Pggtc/qj+kqTOFvNiN1l0YdxwC1kvel57UCjThjGa3BHBihE8/UJAHI+uQHmd/g== universalify@^0.1.0: version "0.1.2" @@ -2738,10 +2772,10 @@ unpipe@1.0.0, unpipe@~1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== -update-browserslist-db@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz#dbfc5a789caa26b1db8990796c2c8ebbce304824" - integrity sha512-jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA== +update-browserslist-db@^1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" + integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== dependencies: escalade "^3.1.1" picocolors "^1.0.0" @@ -2964,14 +2998,14 @@ wrappy@1: integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== ws@^8.1.0: - version "8.8.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.0.tgz#8e71c75e2f6348dbf8d78005107297056cb77769" - integrity sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ== + version "8.13.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" + integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== -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== +ws@~8.11.0: + version "8.11.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" + integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== y18n@^5.0.5: version "5.0.8" diff --git a/web/licenses/third_party/README.md b/html/licenses/third_party/README.md similarity index 100% rename from web/licenses/third_party/README.md rename to html/licenses/third_party/README.md diff --git a/web/licenses/third_party/bsd-3-revised.txt b/html/licenses/third_party/bsd-3-revised.txt similarity index 100% rename from web/licenses/third_party/bsd-3-revised.txt rename to html/licenses/third_party/bsd-3-revised.txt diff --git a/web/settings.gradle.kts b/html/settings.gradle.kts similarity index 89% rename from web/settings.gradle.kts rename to html/settings.gradle.kts index 8bb6643f..9a33cac1 100644 --- a/web/settings.gradle.kts +++ b/html/settings.gradle.kts @@ -58,16 +58,16 @@ fun module(name: String, path: String) { } -module(":web-core", "core") -module(":web-svg", "svg") -module(":web-integration-core", "integration-core") +module(":html-core", "core") +module(":html-svg", "svg") +module(":html-integration-core", "integration-core") module(":compose-compiler-integration", "compose-compiler-integration") module(":compose-compiler-integration-lib", "compose-compiler-integration/lib") -module(":internal-web-core-runtime", "internal-web-core-runtime") -module(":test-utils", "test-utils") +module(":internal-html-core-runtime", "internal-html-core-runtime") +module(":html-test-utils", "test-utils") if (extra["compose.web.tests.skip.benchmarks"]!!.toString().toBoolean() != true) { - module(":web-benchmark-core", "benchmark-core") + module(":html-benchmark-core", "benchmark-core") } else { println("skipping benchmarks") } diff --git a/web/svg/build.gradle.kts b/html/svg/build.gradle.kts similarity index 83% rename from web/svg/build.gradle.kts rename to html/svg/build.gradle.kts index 9e420ce5..748152a9 100644 --- a/web/svg/build.gradle.kts +++ b/html/svg/build.gradle.kts @@ -28,9 +28,9 @@ kotlin { val jsMain by getting { dependencies { - implementation(project(":internal-web-core-runtime")) + implementation(project(":internal-html-core-runtime")) implementation(kotlin("stdlib-js")) - implementation(project(":web-core")) + implementation(project(":html-core")) } } @@ -39,7 +39,7 @@ kotlin { optIn("org.jetbrains.compose.web.testutils.ComposeWebExperimentalTestsApi") } dependencies { - implementation(project(":test-utils")) + implementation(project(":html-test-utils")) implementation(kotlin("test-js")) } } diff --git a/web/svg/src/jsMain/kotlin/org/jetbrains/compose/web/ExperimentalComposeWebSvgApi.kt b/html/svg/src/jsMain/kotlin/org/jetbrains/compose/web/ExperimentalComposeWebSvgApi.kt similarity index 100% rename from web/svg/src/jsMain/kotlin/org/jetbrains/compose/web/ExperimentalComposeWebSvgApi.kt rename to html/svg/src/jsMain/kotlin/org/jetbrains/compose/web/ExperimentalComposeWebSvgApi.kt diff --git a/web/svg/src/jsMain/kotlin/org/jetbrains/compose/web/svg/svg.kt b/html/svg/src/jsMain/kotlin/org/jetbrains/compose/web/svg/svg.kt similarity index 100% rename from web/svg/src/jsMain/kotlin/org/jetbrains/compose/web/svg/svg.kt rename to html/svg/src/jsMain/kotlin/org/jetbrains/compose/web/svg/svg.kt diff --git a/web/svg/src/jsMain/kotlin/org/jetbrains/compose/web/svg/svgAttrs.kt b/html/svg/src/jsMain/kotlin/org/jetbrains/compose/web/svg/svgAttrs.kt similarity index 100% rename from web/svg/src/jsMain/kotlin/org/jetbrains/compose/web/svg/svgAttrs.kt rename to html/svg/src/jsMain/kotlin/org/jetbrains/compose/web/svg/svgAttrs.kt diff --git a/web/svg/src/jsTest/kotlin/svg/SvgTests.kt b/html/svg/src/jsTest/kotlin/svg/SvgTests.kt similarity index 100% rename from web/svg/src/jsTest/kotlin/svg/SvgTests.kt rename to html/svg/src/jsTest/kotlin/svg/SvgTests.kt diff --git a/web/test-utils/build.gradle.kts b/html/test-utils/build.gradle.kts similarity index 89% rename from web/test-utils/build.gradle.kts rename to html/test-utils/build.gradle.kts index 6dcb5f06..a147c0d6 100644 --- a/web/test-utils/build.gradle.kts +++ b/html/test-utils/build.gradle.kts @@ -25,7 +25,7 @@ kotlin { val commonMain by getting { dependencies { implementation(kotlin("stdlib-common")) - implementation(project(":internal-web-core-runtime")) + implementation(project(":internal-html-core-runtime")) } } val jsTest by getting { diff --git a/web/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js b/html/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js similarity index 100% rename from web/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js rename to html/test-utils/conf/karma-kotlin-runner-decorator/karma-kotlin-reporter-decorated.js diff --git a/web/test-utils/conf/karma.config.common.d/patch.js b/html/test-utils/conf/karma.config.common.d/patch.js similarity index 100% rename from web/test-utils/conf/karma.config.common.d/patch.js rename to html/test-utils/conf/karma.config.common.d/patch.js diff --git a/web/test-utils/src/jsMain/kotlin/org/jetbrains/compose/web/testutils/ComposeWebExperimentalTestsApi.kt b/html/test-utils/src/jsMain/kotlin/org/jetbrains/compose/web/testutils/ComposeWebExperimentalTestsApi.kt similarity index 100% rename from web/test-utils/src/jsMain/kotlin/org/jetbrains/compose/web/testutils/ComposeWebExperimentalTestsApi.kt rename to html/test-utils/src/jsMain/kotlin/org/jetbrains/compose/web/testutils/ComposeWebExperimentalTestsApi.kt diff --git a/web/test-utils/src/jsMain/kotlin/org/jetbrains/compose/web/testutils/TestUtils.kt b/html/test-utils/src/jsMain/kotlin/org/jetbrains/compose/web/testutils/TestUtils.kt similarity index 100% rename from web/test-utils/src/jsMain/kotlin/org/jetbrains/compose/web/testutils/TestUtils.kt rename to html/test-utils/src/jsMain/kotlin/org/jetbrains/compose/web/testutils/TestUtils.kt diff --git a/web/test-utils/src/jsTest/kotlin/TestsForTestUtils.kt b/html/test-utils/src/jsTest/kotlin/TestsForTestUtils.kt similarity index 100% rename from web/test-utils/src/jsTest/kotlin/TestsForTestUtils.kt rename to html/test-utils/src/jsTest/kotlin/TestsForTestUtils.kt