Skip to content

Integrate immutable-js-oss fork into main repository #1833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 51 commits into from
Jul 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
f31d0fc
Update README with charter
conartist6 Jul 14, 2019
71905e1
Remove package-lock.json (#1)
Methuselah96 Aug 15, 2020
f172650
fix: do not modify iter during List.map and Map.map (#1649) (#7)
mishawakerman Aug 18, 2020
bff3a94
Migrate gulp 3 to 4 (#8)
hahnlee Aug 20, 2020
0596731
Remove incorrect size property from Record in doc example (#5)
Methuselah96 Aug 20, 2020
5c4fb84
Fix ordered map delete all (#4)
Methuselah96 Aug 20, 2020
182ffbf
Include full license in each distribution (#6)
Methuselah96 Aug 20, 2020
04b61af
Update some references to immutable-js (#2)
Methuselah96 Aug 20, 2020
5d88d29
Update publishing scripts (#3)
Methuselah96 Aug 20, 2020
f7d7056
docs: Fix simple typo, interpretted -> interpreted (#10)
conartist6 Aug 22, 2020
d2575be
Add editorconfig (#14)
conartist6 Aug 22, 2020
45196e3
Hash symbols as objects (#17)
conartist6 Aug 27, 2020
b67b2e2
Rename ./rescources/jest to ./resources/jest.sh (#19)
Methuselah96 Sep 4, 2020
7b09331
Fix glob for npm format script on Windows (#18)
Methuselah96 Sep 4, 2020
5af68f5
Remove deprecated cursor API (#15)
conartist6 Sep 4, 2020
a470e48
Fix benchmarks (#21)
conartist6 Sep 4, 2020
b86aebd
Add missing es exports (#20)
conartist6 Sep 4, 2020
f6b62aa
Fix returning a Record in merge() when Record is empty (#23)
Methuselah96 Sep 26, 2020
64fe9a0
platform independent build commands (#184)
bdurrer Oct 31, 2020
9484d58
Support nulls in genTypeDefData.js (#185)
mcclure Nov 5, 2020
4bdf944
Upgrade dtslint (#188)
Methuselah96 Nov 5, 2020
ab75fae
Upgrade linting packages (#189)
Methuselah96 Nov 5, 2020
8e35097
Upgrade prettier (#190)
Methuselah96 Nov 6, 2020
d05b468
Separate formatting from test script (#191)
Methuselah96 Nov 6, 2020
fd6e96a
Versioned docs (#193)
bdurrer Nov 18, 2020
c0a8b01
Update README.md (#197)
conartist6 Nov 20, 2020
f3a6d5c
Fix #159: Support isPlainObj in IE11 and other esoteric parameters (#…
bdurrer Nov 20, 2020
7a79603
ensure that `subtract` works correcly (#198)
jdeniau Nov 21, 2020
6cb40e4
assert that setIn works as expected (#204)
jdeniau Nov 30, 2020
fad903a
check that "delete" works as "remove" (#203)
jdeniau Dec 1, 2020
a39136a
Use ranges in devDependencies (#192)
Methuselah96 Dec 1, 2020
a9a1612
Similar factories should be equals (#196)
jdeniau Dec 1, 2020
9c7e5cb
throw Error when passing a instance of Record as a Record factory def…
jdeniau Dec 3, 2020
55011d0
Record clear does work (#201)
jdeniau Dec 3, 2020
37c34ec
Fix ordered set with map (#206)
jdeniau Dec 8, 2020
954d75b
Test that #41 is fixed. Fixes #41 (#207)
jdeniau Dec 8, 2020
a9063d2
Allow running tests without building dist + lines are correcly report…
jdeniau Dec 10, 2020
1b062c6
Throw TypeError on merge() if types are incompatible (#215)
Methuselah96 Jan 22, 2021
26dcca9
Revert "Throw TypeError on merge() if types are incompatible (#215)" …
Methuselah96 Jan 29, 2021
a713991
Add sponsor button
Methuselah96 Feb 26, 2021
bb28fa6
Merge remote-tracking branch 'immutable/main' into immutable-oss-inte…
jdeniau Jun 28, 2021
d28c992
fix nextjs build for main branch
jdeniau Jun 28, 2021
4bea8f1
Remove "Community Maintained Edition"
jdeniau Jun 28, 2021
16d6490
Integrate https://github.com/immutable-js-oss/immutable-js/pull/18 back
jdeniau Jun 29, 2021
4971edd
use `immutable` in tests to improve DX
jdeniau Jun 29, 2021
d23c84d
Improve DX for tests in JS files too
jdeniau Jun 29, 2021
1356f56
ensure #1706 is fixed
jdeniau Jun 29, 2021
39a2744
Merge pull request #1835 from immutable-js/fix-1706
jdeniau Jun 29, 2021
84806cd
Merge pull request #1834 from immutable-js/feat-improveDxInJsFilesToo
jdeniau Jun 29, 2021
d36f774
fix typo (duplicated LICENSE)
jdeniau Jun 29, 2021
2b46195
Better comments, and tests cases thanks to @acusti
jdeniau Jun 30, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# EditorConfig is awesome: http://EditorConfig.org

root = true

[*]
end_of_line = lf
insert_final_newline = true

[*.{js,d.ts,json,html,md,sh}]
charset = utf-8
indent_style = space
indent_size = 2
4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/pages/out/**
/pages/generated/**
/dist/**
node_modules
6 changes: 3 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@
"prefer-template": "off",
"spaced-comment": "off",
"vars-on-top": "off",
"react/destructuring-assignment": "off",
"react/jsx-boolean-value": "off",
"react/jsx-curly-brace-presence": "off",
"react/jsx-filename-extension": "off",
"react/no-array-index-key": "off",
"react/no-danger": "off",
Expand All @@ -58,8 +60,6 @@
"react/prop-types": "off",
"react/self-closing-comp": "error",
"react/sort-comp": "off",
"react/destructuring-assignment": "off",
"react/jsx-curly-brace-presence": "off",
"react/jsx-props-no-spreading": "off",
"jsx-a11y/no-static-element-interactions": "off",
"import/extensions": [
Expand All @@ -68,11 +68,11 @@
{ "js": "never", "ts": "never", "tsx": "never" }
],
"import/newline-after-import": "error",
"import/no-cycle": "off",
"import/no-extraneous-dependencies": "off",
"import/no-mutable-exports": "error",
"import/no-unresolved": "error",
"import/no-useless-path-segments": "off",
"import/no-cycle": "off",
"import/prefer-default-export": "off",
"prettier/prettier": "error"
}
Expand Down
30 changes: 17 additions & 13 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ Immutable.js is maintained within the [Contributor Covenant's Code of Conduct](h
All active development of Immutable JS happens on GitHub. We actively welcome
your [pull requests](https://help.github.com/articles/creating-a-pull-request).

1. Fork the repo and create your branch from `master`.
2. Install all dependencies. (`npm install`)
3. If you've added code, add tests.
4. If you've changed APIs, update the documentation.
5. Build generated JS, run tests and ensure your code passes lint. (`npm run test`)
6. If you haven't already, complete the Contributor License Agreement ("CLA").
1. Fork the repo and create your branch from `master`.
2. Install all dependencies. (`npm install`)
3. If you've added code, add tests.
4. If you've changed APIs, update the documentation.
5. Build generated JS, run tests and ensure your code passes lint. (`npm run test`)
6. If you haven't already, complete the Contributor License Agreement ("CLA").

## Documentation

Expand All @@ -39,17 +39,18 @@ while making edits.

## Coding Style

* 2 spaces for indentation (no tabs)
* 80 character line length strongly preferred.
* Prefer `'` over `"`
* ES6 Harmony when possible.
* Use semicolons;
* Trailing commas,
* Avd abbr wrds.
- 2 spaces for indentation (no tabs)
- 80 character line length strongly preferred.
- Prefer `'` over `"`
- ES6 Harmony when possible.
- Use semicolons;
- Trailing commas,
- Avd abbr wrds.

# Functionality Testing

Run the following command to build the library and test functionality:

```bash
npm run test
```
Expand All @@ -60,6 +61,7 @@ Performance tests run against master and your feature branch.
Make sure to commit your changes in your local feature branch before proceeding.

These commands assume you have a remote named `upstream` amd that you do not already have a local `master` branch:

```bash
git fetch upstream
git checkout -b master upstream/master
Expand All @@ -73,12 +75,14 @@ git commit -m 'perf test prerequisite.'
```

Switch back to your feature branch, and run the following command to run regression tests:

```bash
npm run test
npm run perf
```

Sample output:

```bash
> immutable@4.0.0-rc.9 perf ~/github.com/immutable-js/immutable-js
> node ./resources/bench.js
Expand Down
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github: [Methuselah96]
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Search existing issues first: https://github.com/immutable-js/immutable-js/searc
Please ensure you're using the latest version, and provide some information below.

-->

### What happened

<!-- Shortly summarize what went wrong. Be sure to include not just what
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
restore-keys: ${{ runner.OS }}-dts-
- run: npm ci
- run: npm run build
- run: npm run test:types
- run: npm run type-check
- run: npm run check:git-clean

test:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ yarn-error.log
*~
*.swp
.idea
*.iml
TODO
/website/.next
/website/out
Expand Down
5 changes: 5 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dist
pages/generated
pages/out
type-definitions/ts-tests/
type-definitions/flow-tests/
3 changes: 3 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"singleQuote": true
}
Loading