From 4371e39a6c404e707c5af8b9389e1a2cd3c74eb7 Mon Sep 17 00:00:00 2001 From: Antranig Basman Date: Mon, 9 May 2022 13:32:54 +0100 Subject: [PATCH 1/5] FLUID-6727: Added explanation on configuring writable DataSources with link to upcoming docs --- ReleaseNotes.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 664a57cbb0..82dfe54a09 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -33,6 +33,9 @@ * Round tranformation can round to an integer or decimal value * `fluid.stringTemplate` updated to support nested objects for interpolating values * Added `fluid.dataSource` grade + * _**NOTE:** The scheme for configuring writable dataSources is not compatible with that seen in some development + releases of Infusion, e.g. 3.0.0-dev and 4.0.0-dev - see [API Changes documentation](https://docs.fluidproject.org/infusion/development/apichangesfrom2_0to3_0#datasources) + for more details * Added `fluid.remoteModelComponent` for keeping remote and local models in sync. * Preference framework * Switched from Stylus to SASS for CSS pre-processing From d9208e40fe58727c36b6150d93334020b2bb373f Mon Sep 17 00:00:00 2001 From: Antranig Basman Date: Mon, 9 May 2022 13:38:36 +0100 Subject: [PATCH 2/5] FLUID-6727: Added trailing underscore --- ReleaseNotes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 82dfe54a09..58179ff4c1 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -35,7 +35,7 @@ * Added `fluid.dataSource` grade * _**NOTE:** The scheme for configuring writable dataSources is not compatible with that seen in some development releases of Infusion, e.g. 3.0.0-dev and 4.0.0-dev - see [API Changes documentation](https://docs.fluidproject.org/infusion/development/apichangesfrom2_0to3_0#datasources) - for more details + for more details_ * Added `fluid.remoteModelComponent` for keeping remote and local models in sync. * Preference framework * Switched from Stylus to SASS for CSS pre-processing From 66d820e882cf194a1af77d6a5f661eb5d9532562 Mon Sep 17 00:00:00 2001 From: Antranig Basman Date: Mon, 9 May 2022 20:18:33 +0100 Subject: [PATCH 3/5] FLUID-6727: Updated versions to 3.0.1 --- ReleaseNotes.md | 9 +++++++-- package.json | 2 +- src/framework/core/js/Fluid.js | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 58179ff4c1..9442a4474c 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,9 +1,14 @@ -# Release Notes for Fluid Infusion 3.0.0 +# Release Notes for Fluid Infusion 3.0.1 [Fluid Project](https://fluidproject.org) [Infusion Documentation](https://github.com/fluid-project/infusion-docs) +## What's New in 3.0.1 + +This is a small patch release whose purpose is to clarify the API status of the DataSource component in the +notes below. + ## What's New in 3.0.0? ### New Features @@ -158,7 +163,7 @@ https://docs.fluidproject.org/infusion/development/) site. ## Supported Browsers -Infusion 3.0.0 is tested with the latest versions of the following desktop browsers: +Infusion 3.0.1 is tested with the latest versions of the following desktop browsers: * [Chrome](https://google.com/chrome/) (v91) * [Edge](https://microsoft.com/edge/) (v91) diff --git a/package.json b/package.json index 3092516c22..c515ba6f1a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "infusion", "description": "Infusion is an application framework for developing flexible stuff with JavaScript", - "version": "3.0.0", + "version": "3.0.1", "author": "Fluid Project", "bugs": "http://issues.fluidproject.org/browse/FLUID", "homepage": "http://www.fluidproject.org/", diff --git a/src/framework/core/js/Fluid.js b/src/framework/core/js/Fluid.js index 7127c89396..fa6ef272cc 100644 --- a/src/framework/core/js/Fluid.js +++ b/src/framework/core/js/Fluid.js @@ -1,5 +1,5 @@ /*! - * Fluid Infusion v3.0.0 + * Fluid Infusion v3.0.1 * * Infusion is distributed under the Educational Community License 2.0 and new BSD licenses: * http://wiki.fluidproject.org/display/fluid/Fluid+Licensing @@ -32,7 +32,7 @@ var fluid = fluid || fluid_3_0_0; // eslint-disable-line no-redeclare (function ($, fluid) { "use strict"; - fluid.version = "Infusion 3.0.0"; + fluid.version = "Infusion 3.0.1"; // Export this for use in environments like node.js, where it is useful for // configuring stack trace behaviour From 8ab7e0acd9b8c62a4207b88a25694f05b2603423 Mon Sep 17 00:00:00 2001 From: Antranig Basman Date: Tue, 10 May 2022 16:12:51 +0100 Subject: [PATCH 4/5] chore: Updating workflow files to those in main --- .github/workflows/ci-build.yml | 6 +----- .github/workflows/ci-lint.yml | 6 +----- .github/workflows/ci-test.yml | 6 ++---- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index edad2dd573..000f5e857d 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -1,10 +1,6 @@ name: Test build -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] +on: [push, pull_request] defaults: run: diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml index fcbd4dc264..9a616116da 100644 --- a/.github/workflows/ci-lint.yml +++ b/.github/workflows/ci-lint.yml @@ -1,10 +1,6 @@ name: Code linting -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] +on: [push, pull_request] jobs: lint: diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index ade083b58b..931f9c13a3 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -2,7 +2,6 @@ name: Automated tests on: push: - branches: [ main ] paths: - '.nycrc' - 'package.json' @@ -14,7 +13,6 @@ on: - 'tests/**/*.js' - 'tests/**/*.json' pull_request: - branches: [ main ] paths: - '.nycrc' - 'package.json' @@ -80,7 +78,7 @@ jobs: run: npm run posttest - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v2 with: - file: ./reports/coverage-final.json + files: ./reports/coverage-final.json flags: unit-tests From e597a22529d4e074d6062e6c9b758ce7785d5647 Mon Sep 17 00:00:00 2001 From: Antranig Basman Date: Tue, 10 May 2022 17:58:27 +0100 Subject: [PATCH 5/5] FLUID-6727: Reverting update to fluid.version --- src/framework/core/js/Fluid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/framework/core/js/Fluid.js b/src/framework/core/js/Fluid.js index fa6ef272cc..bb0ef8bc8b 100644 --- a/src/framework/core/js/Fluid.js +++ b/src/framework/core/js/Fluid.js @@ -32,7 +32,7 @@ var fluid = fluid || fluid_3_0_0; // eslint-disable-line no-redeclare (function ($, fluid) { "use strict"; - fluid.version = "Infusion 3.0.1"; + fluid.version = "Infusion 3.0.0"; // Export this for use in environments like node.js, where it is useful for // configuring stack trace behaviour