Skip to content

Commit 389ff15

Browse files
author
Eugene Tolmachev
committed
org rename backport
1 parent a99d78c commit 389ff15

22 files changed

+604
-590
lines changed

‎.github/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
First of all - thanks for taking the time to contribute!
44

5-
With that in mind, fable-elmish is a young project and as such while we welcome the contributions from non-member there are certain things we'd like to get more right than fast. To make everyone's experience as enjoyable as possible please keep the following things in mind:
5+
With that in mind, elmish is a young project and as such while we welcome the contributions from non-member there are certain things we'd like to get more right than fast. To make everyone's experience as enjoyable as possible please keep the following things in mind:
66

77
* Unless it's a trivial fix, consider opening an issue first to discuss it with the team.
88
* If you are just looking for something to take on, check the *help wanted" labeled items

‎.github/ISSUE_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Please provide the expected and actual results.
1313

1414
### Related information
1515

16-
* fable-elmish version:
16+
* elmish version:
1717
* fable-compiler version:
1818
* fable-core version:
1919
* Operating system:

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ samples/react-native/navigation/windows/
3030
**/public/bundle.js.map
3131

3232
*.nupkg
33-
Meta.props
33+
Directory.Build.props
3434
docs/output
3535
temp
3636
paket-files

‎.paket/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
load/

‎.paket/Paket.Restore.targets

+9-8
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@
4848

4949
<!-- Because ReadAllText is slow on osx/linux, try to find shasum and awk -->
5050
<PropertyGroup>
51-
<PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketRestoreCacheFile) | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher>
52-
<PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketLockFilePath) | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher>
51+
<PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum "$(PaketRestoreCacheFile)" | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher>
52+
<PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum "$(PaketLockFilePath)" | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher>
5353
</PropertyGroup>
5454

5555
<!-- If shasum and awk exist get the hashes -->
56-
<Exec Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
57-
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
56+
<Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
57+
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
5858
</Exec>
59-
<Exec Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
60-
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
59+
<Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
60+
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
6161
</Exec>
6262

6363
<PropertyGroup Condition="Exists('$(PaketRestoreCacheFile)') ">
@@ -127,6 +127,7 @@
127127
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
128128
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
129129
<PrivateAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'true'">All</PrivateAssets>
130+
<ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
130131
</PackageReference>
131132
</ItemGroup>
132133

@@ -183,8 +184,8 @@
183184

184185
<ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)">
185186
<Output TaskParameter="AbsolutePaths" PropertyName="NuspecFileAbsolutePath" />
186-
</ConvertToAbsolutePath>
187-
187+
</ConvertToAbsolutePath>
188+
188189

189190
<!-- Call Pack -->
190191
<PackTask Condition="$(UseNewPack)"

‎.paket/paket.exe

11.8 KB
Binary file not shown.

‎LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2016 fable-elmish contributors
1+
Copyright 2016 elmish contributors
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
Elmish-React: React extensions for [fable-elmish](https://github.com/fable-compiler/fable-elmish) applications.
1+
Elmish-React: React extensions for [elmish](https://github.com/fable-compiler/elmish) applications.
22
=======
3-
[![Windows Build](https://ci.appveyor.com/api/projects/status/vg3200aksdbvx5me?svg=true)](https://ci.appveyor.com/project/et1975/react) [![Mono/OSX build](https://travis-ci.org/fable-elmish/react.svg?branch=master)](https://travis-ci.org/fable-elmish/react) [![NuGet version](https://badge.fury.io/nu/react.svg)](https://badge.fury.io/nu/react)
3+
[![Windows Build](https://ci.appveyor.com/api/projects/status/vg3200aksdbvx5me?svg=true)](https://ci.appveyor.com/project/et1975/react) [![Mono/OSX build](https://travis-ci.org/elmish/react.svg?branch=master)](https://travis-ci.org/elmish/react) [![NuGet version](https://badge.fury.io/nu/react.svg)](https://badge.fury.io/nu/react)
44

55
React and ReactNative support for Elmish apps.
66

7-
For more information see [the docs](https://fable-elmish.github.io/react).
7+
For more information see [the docs](https://elmish.github.io/react).
88

99
## Installation
10-
The easiest way to start with Elmish and React is to use the [template](https://github.com/fable-elmish/templates):
10+
The easiest way to start with Elmish and React is to use the [template](https://github.com/elmish/templates):
1111

1212

1313
```shell
1414
dotnet new -i "Fable.Template.Elmish.React::*"
15-
dotnet new fable-elmish-react -n MyProject
15+
dotnet new elmish-react -n MyProject
1616
```
1717

1818
Alternatively, you can just add it to an existing project via paket:

‎build.fsx

+11-11
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ open Fake.Git
1111

1212

1313
let gitName = "react"
14-
let gitOwner = "fable-elmish"
14+
let gitOwner = "elmish"
1515
let gitHome = sprintf "https://github.com/%s" gitOwner
1616

1717
// Filesets
1818
let projects =
1919
!! "src/**.fsproj"
2020

2121

22-
let dotnetcliVersion = "2.0.0"
22+
let dotnetcliVersion = DotNetCli.GetDotNetSDKVersionFromGlobalJson()
2323
let mutable dotnetExePath = "dotnet"
2424

2525
let runDotnet workingDir =
@@ -57,15 +57,16 @@ Target "Meta" (fun _ ->
5757
"<PropertyGroup>"
5858
"<Description>Elmish extensions for writing Fable apps with React and ReactNative</Description>"
5959
sprintf "<PackageProjectUrl>http://%s.github.io/%s</PackageProjectUrl>" gitOwner gitName
60-
"<PackageLicenseUrl>https://raw.githubusercontent.com/fable-elmish/react/master/LICENSE.md</PackageLicenseUrl>"
61-
"<PackageIconUrl>https://raw.githubusercontent.com/fable-elmish/elmish/master/docs/files/img/logo.png</PackageIconUrl>"
60+
"<PackageLicenseUrl>https://raw.githubusercontent.com/elmish/react/master/LICENSE.md</PackageLicenseUrl>"
61+
"<PackageIconUrl>https://raw.githubusercontent.com/elmish/elmish/master/docs/files/img/logo.png</PackageIconUrl>"
6262
sprintf "<RepositoryUrl>%s/%s</RepositoryUrl>" gitHome gitName
6363
"<PackageTags>fable;elmish;fsharp;React;React-Native</PackageTags>"
64+
sprintf "<PackageReleaseNotes>%s</PackageReleaseNotes>" (List.head release.Notes)
6465
"<Authors>Eugene Tolmachev</Authors>"
6566
sprintf "<Version>%s</Version>" (string release.SemVer)
6667
"</PropertyGroup>"
6768
"</Project>"]
68-
|> WriteToFile false "Meta.props"
69+
|> WriteToFile false "Directory.Build.props"
6970
)
7071

7172
// --------------------------------------------------------------------------------------
@@ -109,12 +110,11 @@ let executeFAKEWithOutput workingDirectory script fsiargs envArgs =
109110
let copyFiles() =
110111
let header =
111112
splitStr "\n" """(*** hide ***)
112-
#I "../../src/bin/Debug/netstandard1.6"
113-
#I "../../packages/Fable.Core/lib/netstandard1.6"
114-
#I "../../packages/Fable.Elmish/lib/netstandard1.6"
115-
#I "../../packages/Fable.React/lib/netstandard1.6"
116-
#r "Fable.React.dll"
117-
#r "Fable.Elmish.dll"
113+
#I ".paket/load/netstandard2.0"
114+
#I "../../.paket/load/netstandard2.0"
115+
#I "../../src/bin/Debug/netstandard2.0"
116+
#load "Fable.React.Native.fsx"
117+
#load "Fable.Elmish.fsx"
118118
#r "Fable.Elmish.React.dll"
119119
120120
(**

‎docs/content/browser.fsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
(*** hide ***)
2+
#I "../../.paket/load/netstandard2.0"
23
#I "../../src/bin/Debug/netstandard1.6"
3-
#I "../../packages/Fable.Core/lib/netstandard1.6"
4-
#I "../../packages/Fable.Elmish/lib/netstandard1.6"
5-
#I "../../packages/Fable.React/lib/netstandard1.6"
64
#r "Fable.Core.dll"
75
#r "Fable.React.dll"
86
#r "Fable.Elmish.dll"

‎docs/content/common.fsx

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
(*** hide ***)
2-
#I "../../src/bin/Debug/netstandard1.6"
3-
#I "../../packages/Fable.Core/lib/netstandard1.6"
4-
#I "../../packages/Fable.Elmish/lib/netstandard1.6"
5-
#I "../../packages/Fable.React/lib/netstandard1.6"
6-
#r "Fable.React.dll"
7-
#r "Fable.Elmish.dll"
2+
#I ".paket/load/netstandard2.0"
3+
#I "../../.paket/load/netstandard2.0"
4+
#I "../../src/bin/Debug/netstandard2.0"
5+
#load "Fable.React.Native.fsx"
6+
#load "Fable.Elmish.fsx"
87
#r "Fable.Elmish.React.dll"
98

109
(**

‎docs/content/index.fsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
(*** hide ***)
22
#I "../../src/bin/Debug/netstandard1.6"
3-
#I "../../packages/Fable.Elmish/lib/netstandard1.6"
4-
#I "../../packages/Fable.React/lib/netstandard1.6"
3+
#I "../../.paket/load/netstandard2.0"
54
#r "Fable.React.dll"
65
#r "Fable.Elmish.dll"
76
#r "Fable.Elmish.React.dll"

‎docs/content/native.fsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
(*** hide ***)
22
#I "../../src/bin/Debug/netstandard1.6"
3-
#I "../../packages/Fable.Elmish/lib/netstandard1.6"
4-
#I "../../packages/Fable.React/lib/netstandard1.6"
5-
#I "../../packages/Fable.React.Native/lib/netstandard1.6"
3+
#I "../../.paket/load/netstandard2.0"
64
#r "Fable.React.dll"
75
#r "Fable.React.Native.dll"
86
#r "Fable.Elmish.dll"

‎docs/content/react-native.fsx

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
(*** hide ***)
2-
#I "../../src/bin/Debug/netstandard1.6"
3-
#I "../../packages/Fable.Core/lib/netstandard1.6"
4-
#I "../../packages/Fable.Elmish/lib/netstandard1.6"
5-
#I "../../packages/Fable.React/lib/netstandard1.6"
6-
#r "Fable.React.dll"
7-
#r "Fable.Elmish.dll"
2+
#I ".paket/load/netstandard2.0"
3+
#I "../../.paket/load/netstandard2.0"
4+
#I "../../src/bin/Debug/netstandard2.0"
5+
#load "Fable.React.Native.fsx"
6+
#load "Fable.Elmish.fsx"
87
#r "Fable.Elmish.React.dll"
98

109
(**

‎docs/content/react.fsx

+16-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
(*** hide ***)
2-
#I "../../src/bin/Debug/netstandard1.6"
3-
#I "../../packages/Fable.Core/lib/netstandard1.6"
4-
#I "../../packages/Fable.Elmish/lib/netstandard1.6"
5-
#I "../../packages/Fable.React/lib/netstandard1.6"
6-
#r "Fable.React.dll"
7-
#r "Fable.Elmish.dll"
2+
#I ".paket/load/netstandard2.0"
3+
#I "../../.paket/load/netstandard2.0"
4+
#I "../../src/bin/Debug/netstandard2.0"
5+
#load "Fable.React.Native.fsx"
6+
#load "Fable.Elmish.fsx"
87
#r "Fable.Elmish.React.dll"
98

109
(**
@@ -47,7 +46,7 @@ module Program =
4746
{ program with setState = setState }
4847

4948
/// `withReact` uses `requestAnimationFrame` to optimize rendering in scenarios with updates at a higher rate than 60FPS, but this makes the cursor jump to the end in `input` elements.
50-
/// This function works around the glitch if you don't need the optimization (see https://github.com/fable-elmish/react/issues/12).
49+
/// This function works around the glitch if you don't need the optimization (see https://github.com/elmish/react/issues/12).
5150
let withReactUnoptimized placeholderId (program:Elmish.Program<_,_,_,_>) =
5251
let setState model dispatch =
5352
Fable.Import.ReactDom.render(
@@ -56,3 +55,13 @@ module Program =
5655
)
5756

5857
{ program with setState = setState }
58+
59+
/// Setup rendering of root React component inside html element identified by placeholderId using React.hydrate
60+
let withReactHydrate placeholderId (program:Elmish.Program<_,_,_,_>) =
61+
let setState model dispatch =
62+
Fable.Import.ReactDom.hydrate(
63+
lazyView2With (fun x y -> obj.ReferenceEquals(x,y)) program.view model dispatch,
64+
document.getElementById(placeholderId)
65+
)
66+
67+
{ program with setState = setState }

‎docs/tools/generate.fsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
// --------------------------------------------------------------------------------------
55

66
// Web site location for the generated documentation
7-
let website = "https://fable-elmish.github.io/react"
7+
let website = "https://elmish.github.io/react"
88

9-
let githubLink = "https://github.com/fable-elmish/react"
9+
let githubLink = "https://github.com/elmish/react"
1010

1111
// Specify more information about your project
1212
let info =

‎docs/tools/templates/template.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<div class="container">
2121
<div class="masthead">
2222
<ul class="nav nav-pills pull-right">
23-
<li><a href="https://fable-elmish.github.io">fable-elmish</a></li>
23+
<li><a href="https://elmish.github.io">elmish</a></li>
2424
<li><a href="http://fable.io">fable</a></li>
2525
<li><a href="http://fsharp.org">fsharp.org</a></li>
2626
</ul>

‎global.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"sdk": {
3+
"version": "2.0.0"
4+
}
5+
}

‎paket.dependencies

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
source https://nuget.org/api/v2
2-
2+
storage: none
3+
generate_load_scripts: true
34
nuget FSharp.Core redirects:force, content:none
45
nuget Fable.Core
56
nuget Fable.React
7+
nuget Fable.React.Native
68
nuget Fable.Elmish
79
nuget Fable.PowerPack
810

0 commit comments

Comments
 (0)