Skip to content

Commit

Permalink
Merge remote-tracking branch 'amb26/FLUID-6727' into 3.x
Browse files Browse the repository at this point in the history
* amb26/FLUID-6727:
  FLUID-6727: Reverting update to fluid.version
  chore: Updating workflow files to those in main
  FLUID-6727: Updated versions to 3.0.1
  FLUID-6727: Added trailing underscore
  FLUID-6727: Added explanation on configuring writable DataSources with link to upcoming docs
  • Loading branch information
jobara committed May 10, 2022
2 parents b298ba9 + e597a22 commit 681a084
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 18 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: Test build

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
on: [push, pull_request]

defaults:
run:
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/ci-lint.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: Code linting

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
on: [push, pull_request]

jobs:
lint:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Automated tests

on:
push:
branches: [ main ]
paths:
- '.nycrc'
- 'package.json'
Expand All @@ -14,7 +13,6 @@ on:
- 'tests/**/*.js'
- 'tests/**/*.json'
pull_request:
branches: [ main ]
paths:
- '.nycrc'
- 'package.json'
Expand Down Expand Up @@ -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
12 changes: 10 additions & 2 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -33,6 +38,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
Expand Down Expand Up @@ -155,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)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/js/Fluid.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 681a084

Please sign in to comment.