search

cubbles / cubx.core.rte

Contains the artifacts for the in-browser runtime-environment.
https://cubbles.atlassian.net/wiki/display/RTE
1 stars 1 forks source link

Migrate changes for ACR into RTE@3.0.0 branch #13

Closed pwrinc closed 5 years ago

pwrinc commented 6 years ago

Manually merge changes from master branch into 3.0.0 branch which were made during development of ACR (automatic conflict resolution). See attachements for this issue for a list of all changes:

diff.txt diff-name_only.txt

pwrinc commented 6 years ago

Following files need to be merged manually (inluding current state of work):

devtools-mappedIn/package-lock.json devtools-mappedIn/package.json -> DONE webpackages/cubx.core.rte/.webpackage

webpackages/cubx.core.rte/cif/classes/connectionManager.js webpackages/cubx.core.rte/cif/test/unit/cif_create_connection_elements_test.js webpackages/cubx.core.rte/cif/test/unit/compoundComponent_test.js webpackages/cubx.core.rte/cif/test/unit/connectionManager_dynamicConnectionsWithDirectExecution_test.js webpackages/cubx.core.rte/cif/test/unit/connectionManager_hookFunction_test.js webpackages/cubx.core.rte/cif/test/unit/connectionManager_process_connection_test.js webpackages/cubx.core.rte/cif/test/unit/dynamicConnection_test.js

webpackages/cubx.core.rte/crc-loader/js/main.js webpackages/cubx.core.rte/crc-loader/modules/polyfills/polyfills.js

webpackages/cubx.core.rte/crc/modules/crc/CRC.js -> DONE webpackages/cubx.core.rte/crc/modules/dependencyManager/depMgr.js -> DONE webpackages/cubx.core.rte/crc/modules/dependencyTree/dependencyTree.js -> DONE

webpackages/cubx.core.rte/crc/test/unit/depMgrDependencyTreeCreation_test.js -> DONE webpackages/cubx.core.rte/crc/test/unit/depMgrParseGlobalResponseCache_test.js -> DONE webpackages/cubx.core.rte/crc/test/unit/dependencyTreeModification_test.js -> DONE webpackages/cubx.core.rte/crc/test/unit/dependencyTree_test.js -> DONE

webpackages/cubx.core.rte/crc/test/unit/addToCache/webpackageDocument.json -> DONE webpackages/cubx.core.rte/crc/test/unit/addToCache/webpackageDocument1.json -> DONE webpackages/cubx.core.rte/crc/test/unit/addToCache/webpackageDocument2.json -> DONE webpackages/cubx.core.rte/crc/test/unit/addToCache/webpackageDocument3.json -> DONE webpackages/cubx.core.rte/crc/test/unit/addToCache/webpackageDocument4.json -> DONE webpackages/cubx.core.rte/crc/test/unit/addToCache/webpackageDocument5.json -> DONE webpackages/cubx.core.rte/crc/test/unit/addToCache/webpackageDocument6.json -> DONE webpackages/cubx.core.rte/crc/test/unit/addToCache/webpackageDocument7.json -> DONE webpackages/cubx.core.rte/crc/test/unit/addToCache/webpackageDocument8.json -> DONE webpackages/cubx.core.rte/crc/test/unit/addToCache/webpackageDocument9.json -> DONE

webpackages/cubx.core.rte/cubx-component-mixin/js/cubxComponentMixin.js

webpackages/cubx.core.rte/cubxpolymer/cubxPolymerMixin.jscubxPolymerMixin.js webpackages/cubx.core.rte/cubxpolymer/test/helpers.js webpackages/cubx.core.rte/cubxpolymer/test/resource/dummy-connection-hook-manifest.js webpackages/cubx.core.rte/cubxpolymer/test/unit/CubxPolymer_conectionHook_test.js webpackages/cubx.core.rte/cubxpolymer/test/unit/CubxPolymer_content_test.js webpackages/cubx.core.rte/cubxpolymer/test/unit/CubxPolymer_input_output_test.js

webpackages/cubx.core.rte/manifest.webpackage

pwrinc commented 6 years ago

All changes for ACR are merged in the RTE 3.0.0 branch. I pushed a new 3.0.0-SNAPSHOT to cubbles.world/core store. The release of the the 3.0.0 RTE will be part of another issue following.