Code

Move fork back into main project#362

Code

Merged

fb55 merged 180 commits intoinikulin:masterinikulin/parse5:masterfrom parse5:masterparse5/parse5-fork:masterCopy head branch name to clipboardFeb 7, 2022

+21,127-33,332

Commits

Commits on Jan 7, 2022

• chore(deps-dev): Upgrade all dev dependencies

  fb55

  committed
  d1c8a5b

  Copy full SHA for d1c8a5b

• chore(bench): Fix imports in benchmarks

  fb55

  committed
  c0b88ee

  Copy full SHA for c0b88ee

• fix(bench): correct some imports and URL paths

  

  43081j

  authored and

  fb55

  committed
  8cbe79f

  Copy full SHA for 8cbe79f

• Fix generating tests

  Show description for 75d2113
  fb55

  committed
  75d2113

  Copy full SHA for 75d2113

• Add note to README

  fb55

  committed
  07a70d6

  Copy full SHA for 07a70d6

• Run both prettier & eslint in lint & format scripts

  fb55

  committed
  0a5bd39

  Copy full SHA for 0a5bd39

• refactor: Use ES6 in many more places

  fb55

  committed
  1dbb700

  Copy full SHA for 1dbb700

• refactor: Improve ESLint fix output

  fb55

  committed
  0684dfe

  Copy full SHA for 0684dfe

• refactor: Use String.fromCodePoint

  fb55

  committed
  d51f6a3

  Copy full SHA for d51f6a3

• refactor: Remove merge-options

  fb55

  committed
  b90fe6f

  Copy full SHA for b90fe6f

• refactor: Replace some maps with Set

  fb55

  committed
  7c036c4

  Copy full SHA for 7c036c4

• refactor: Use Map for SVG & XML replacement maps

  fb55

  committed
  a39912f

  Copy full SHA for a39912f

• refactor: Minor cleanup

  fb55

  committed
  9f94715

  Copy full SHA for 9f94715

• Bump eslint from 8.1.0 to 8.2.0 (#3)

  Show description for cf10865
  

  dependabot[bot]

  authored and

  fb55

  committed
  cf10865

  Copy full SHA for cf10865

• chore: Fix scripts

  fb55

  committed
  167f4cb

  Copy full SHA for 167f4cb

• test: Add several feedback tests

  fb55

  committed
  ea18c5f

  Copy full SHA for ea18c5f

• refactor: Make C1_CONTROLS_REFERENCE_REPLACEMENTS a Map

  fb55

  committed
  71c0d8a

  Copy full SHA for 71c0d8a

• refactor: Use branches for tokenizer states for 25% speed gains

  fb55

  committed
  5d7a780

  Copy full SHA for 5d7a780

• refactor: Use Map for parser TOKEN_HANDLERS

  fb55

  committed
  d57563e

  Copy full SHA for d57563e

• fix: End tags in the 'in row' insertion mode were not properly ignored

  Show description for dc4e269
  fb55

  committed
  dc4e269

  Copy full SHA for dc4e269

• refactor: Introduce Sets in the serializer

  fb55

  committed
  c66c985

  Copy full SHA for c66c985

• refactor: Move more maps & lists to Map & Set

  fb55

  committed
  818614e

  Copy full SHA for 818614e

• refactor: Drop length optimisation in favour of Sets in element stack

  Show description for 890e3a8
  fb55

  committed
  890e3a8

  Copy full SHA for 890e3a8

• refactor: Simplify FormattingElementList

  fb55

  committed
  e1917dd

  Copy full SHA for e1917dd

• test: Switch to default mocha UI

  fb55

  committed
  fa80d08

  Copy full SHA for fa80d08

• test: Switch from Mocha to Jest

  Show description for 66df66b
  fb55

  committed
  66df66b

  Copy full SHA for 66df66b

• refactor: Port Tokenizer to TS

  fb55

  committed
  dee793b

  Copy full SHA for dee793b

• fix: Do namespace check for every numbered header / table cell

  Show description for b4b5d4a
  fb55

  committed
  b4b5d4a

  Copy full SHA for b4b5d4a

• refactor: Continue porting to TS

  fb55

  committed
  a18c22e

  Copy full SHA for a18c22e

• refactor: Introduce enums

  fb55

  committed
  31036f3

  Copy full SHA for 31036f3

• refactor: Fix Mixin type, start converting them

  fb55

  committed
  d335656

  Copy full SHA for d335656

• refactor: Introduce tree adapter type

  fb55

  committed
  4385fde

  Copy full SHA for 4385fde

• refactor: Convert most of the parser to TS

  fb55

  committed
  347206c

  Copy full SHA for 347206c

• fix: Properly handle end tags in table body

  fb55

  committed
  a0aff95

  Copy full SHA for a0aff95

• refactor: Finish porting parser

  fb55

  committed
  7170a4b

  Copy full SHA for 7170a4b

• refactor: All the TS

  fb55

  committed
  34d9e7a

  Copy full SHA for 34d9e7a

• refactor: Remove most uses of any

  fb55

  committed
  d3a1924

  Copy full SHA for d3a1924

• refactor(parser): Move token handler maps to fns

  fb55

  committed
  c4416bb

  Copy full SHA for c4416bb

• refactor: Simplify OpenElementStack

  fb55

  committed
  586ad6d

  Copy full SHA for 586ad6d

• refactor: Re-introduce open element stack stackTop

  Show description for a728cbb
  fb55

  committed
  a728cbb

  Copy full SHA for a728cbb

• refactor: Make _findFosterParentingLocation return definite types

  fb55

  committed
  73ba3d3

  Copy full SHA for 73ba3d3

• refactor: Simplify tmplInsertionModeStack

  fb55

  committed
  339fb85

  Copy full SHA for 339fb85

• fix: Use node --loader to run parser feedback gen

  fb55

  committed
  25d5331

  Copy full SHA for 25d5331

• test: Co-locate tests & implementation files

  Show description for 5655435
  fb55

  committed
  5655435

  Copy full SHA for 5655435

• refactor: Use import aliases for HTML

  fb55

  committed
  73138c3

  Copy full SHA for 73138c3

• fix: Fix exports of updated htmlparser2 interface

  fb55

  committed
  7f841eb

  Copy full SHA for 7f841eb

• refactor: Remove parse5- prefix, use @parse5 ns

  fb55

  committed
  7b7be06

  Copy full SHA for 7b7be06

• refactor: Convert htmlparser2 adapter to TS, improve adapters

  fb55

  committed
  fee564f

  Copy full SHA for fee564f

• test: Refactor tests to call it directly

  Show description for 6b6b419
  fb55

  committed
  6b6b419

  Copy full SHA for 6b6b419

• chore(build): Add build config for main pkg

  fb55

  committed
  3db2bb1

  Copy full SHA for 3db2bb1

• refactor: Switch FormattingElementList entries order, simplify

  fb55

  committed
  386faa9

  Copy full SHA for 386faa9

• refactor: Move more docs into JSDoc comments

  fb55

  committed
  ebae166

  Copy full SHA for ebae166

• refactor: Re-enable eslint, --fix

  fb55

  committed
  8132b00

  Copy full SHA for 8132b00

• refactor: Remove Tokenizer statics

  fb55

  committed
  08d3fab

  Copy full SHA for 08d3fab

• refactor: Remove FormattingElemList statics

  fb55

  committed
  44a8baa

  Copy full SHA for 44a8baa

• refactor: Compute SVG adjusted names

  fb55

  committed
  3ddad9e

  Copy full SHA for 3ddad9e

• refactor: Remove PositionTrackingPreprocessorMixin

  fb55

  committed
  1419546

  Copy full SHA for 1419546

• refactor: Simplify preprocessor

  fb55

  committed
  82b643c

  Copy full SHA for 82b643c

• refactor: Merge LocationInfoTokenizerMixin into Tokenizer

  fb55

  committed
  63b4680

  Copy full SHA for 63b4680

• refactor: Inline preprocessor & tokenizer error mixins

  fb55

  committed
  ce75f9d

  Copy full SHA for ce75f9d

• refactor: Move ErrorReportingParserMixin into parser

  fb55

  committed
  5e4e08d

  Copy full SHA for 5e4e08d

• refactor: Start moving LocationInfoParserMixin into parser

  fb55

  committed
  b6b5be6

  Copy full SHA for b6b5be6

• refactor: Make TokenType a numeric enum

  fb55

  committed
  19db1fb

  Copy full SHA for 19db1fb

• refactor: Call states/modes directly

  Show description for f39136e
  fb55

  committed
  f39136e

  Copy full SHA for f39136e

• refactor: Small fixes

  fb55

  committed
  04616fa

  Copy full SHA for 04616fa

• refactor: Don't re-initialize tempBuff

  fb55

  committed
  0659cfa

  Copy full SHA for 0659cfa

• refactor: Remove the last mixin

  fb55

  committed
  c4ed435

  Copy full SHA for c4ed435

• test: Move location info tests

  fb55

  committed
  5dea37c

  Copy full SHA for 5dea37c

• refactor: Set tag end locations on EOF

  fb55

  committed
  5c3b003

  Copy full SHA for 5c3b003

• refactor: Add more types

  fb55

  committed
  490aef2

  Copy full SHA for 490aef2

• refactor: Use entities for decoding entities

  Show description for 2b92054
  fb55

  committed
  2b92054

  Copy full SHA for 2b92054

• refactor: Add more types

  fb55

  committed
  655633f

  Copy full SHA for 655633f

• test: Add return types

  fb55

  committed
  f00a97c

  Copy full SHA for f00a97c

• refactor: Simplify some code

  fb55

  committed
  3e0e0d3

  Copy full SHA for 3e0e0d3

• chore(package): Introduce npm workspaces

  fb55

  committed
  6170165

  Copy full SHA for 6170165

• chore(lerna): Skip lerna bootstrap

  Show description for 651d3dd
  fb55

  committed
  651d3dd

  Copy full SHA for 651d3dd

• chore(ci): Bump npm client before installing deps

  fb55

  committed
  ac61a2b

  Copy full SHA for ac61a2b

• refactor: Use original parse5 package name

  Show description for a24e91e
  fb55

  committed
  a24e91e

  Copy full SHA for a24e91e

• refactor: Add warnings on explicit any

  fb55

  committed
  fa58493

  Copy full SHA for fa58493

• chore(ci): Test on lts/*

  fb55

  committed
  6f8aa38

  Copy full SHA for 6f8aa38

• fix: Fix import in html-rewriting-stream

  fb55

  committed
  b9bca86

  Copy full SHA for b9bca86

• refactor: Move rewriting-stream.test to TS

  fb55

  committed
  5ad3ab7

  Copy full SHA for 5ad3ab7

• refactor: Use fs/promises when already dealing with promises

  fb55

  committed
  be12796

  Copy full SHA for be12796

• chore: Improve prettier & lint-staged config

  fb55

  committed
  7df6b6d

  Copy full SHA for 7df6b6d

• fix: Target es2019 for Node 12 support

  fb55

  committed
  e47e403

  Copy full SHA for e47e403

• refactor: Move test to packages/test-utils

  fb55

  committed
  e4d58c5

  Copy full SHA for e4d58c5

• fix: Fix package name in parser-stream package.json

  fb55

  committed
  e81a14d

  Copy full SHA for e81a14d

• test: Simplify moduleNameMapper

  fb55

  committed
  dd718fe

  Copy full SHA for dd718fe

• chore(pkg): Add bench as a workspace

  Show description for 4f2f19e
  fb55

  committed
  4f2f19e

  Copy full SHA for 4f2f19e

• feat: Make it possible to build all packages

  fb55

  committed
  8a03a32

  Copy full SHA for 8a03a32

• refactor: Remove many uses of any and non-null

  fb55

  committed
  79394ac

  Copy full SHA for 79394ac

• chore: Move most sax-parser docs to TSDoc

  fb55

  committed
  2120bf7

  Copy full SHA for 2120bf7

• test: Don't hand-roll setTimeout promise

  fb55

  committed
  84282ec

  Copy full SHA for 84282ec

• test: Make formatting-element-list test tokens match elements

  fb55

  committed
  f066688

  Copy full SHA for f066688

• test: Assert entry exists

  fb55

  committed
  b807842

  Copy full SHA for b807842

• chore: Fix ignores for html5lib path

  fb55

  committed
  aa66b91

  Copy full SHA for aa66b91

• fix: Overwrite stream end method instead of _final

  Show description for 4ad738f
  fb55

  committed
  4ad738f

  Copy full SHA for 4ad738f

• Revert "test: Don't hand-roll setTimeout promise"

  Show description for 5a27aef
  fb55

  committed
  5a27aef

  Copy full SHA for 5a27aef

• refactor: Introduce tagIDs (#18)

  fb55

  committed
  48433d6

  Copy full SHA for 48433d6

• Update .gitattributes

  fb55

  committed
  bf4802e

  Copy full SHA for bf4802e

• refactor: Introduce eslint-plugin-unicorn

  fb55

  committed
  44913e7

  Copy full SHA for 44913e7

• refactor: Move special end tag handling to method

  Show description for 67096f7
  fb55

  committed
  67096f7

  Copy full SHA for 67096f7

• refactor: Output state name in generateTokenizationTests

  fb55

  committed
  c8ce001

  Copy full SHA for c8ce001

• fix: Emit error on undefined named entity in attribute starting with known entity

  Show description for 70c1935
  fb55

  committed
  70c1935

  Copy full SHA for 70c1935

• refactor: Simplify _consumeSequenceIfMatch

  Show description for b93ef2f
  fb55

  committed
  b93ef2f

  Copy full SHA for b93ef2f

• refactor: Read double escaped script as sequence

  Show description for cc0218c
  fb55

  committed
  cc0218c

  Copy full SHA for cc0218c

• refactor: Don't write to tempBuff when decoding entities

  fb55

  committed
  cf0a37a

  Copy full SHA for cf0a37a

• refactor: Add return types everywhere

  fb55

  committed
  50a3b16

  Copy full SHA for 50a3b16

• refactor: Combine loops for Noah's Ark condition

  fb55

  committed
  06a9316

  Copy full SHA for 06a9316

• refactor: Create tokens that don't change only once

  fb55

  committed
  0af88be

  Copy full SHA for 0af88be

• refactor: Make sequences strings, handle special end tag as sequence

  fb55

  committed
  2d2e0b4

  Copy full SHA for 2d2e0b4

• refactor: Re-introduce isWhitespace

  fb55

  committed
  fbab2d2

  Copy full SHA for fbab2d2

• refactor: Pass count to retreat

  Show description for 4e9041c
  fb55

  committed
  4e9041c

  Copy full SHA for 4e9041c

• refactor: Setup tokenizer CDATA mode on stack updates

  Show description for 25d5baa
  fb55

  committed
  25d5baa

  Copy full SHA for 25d5baa

• test: Use assert.ok when a pretty printed message is available

  fb55

  committed
  d331397

  Copy full SHA for d331397

• refactor: Use .bind to pass handlers to stack

  Show description for e8ea78d
  fb55

  committed
  e8ea78d

  Copy full SHA for e8ea78d

• refactor: Only set source code location if that is enabled

  Show description for 8f76a0a
  fb55

  committed
  8f76a0a

  Copy full SHA for 8f76a0a

• chore: Add some comments

  fb55

  committed
  b06b621

  Copy full SHA for b06b621

• refactor: Remove _isSequenceMatch method

  fb55

  committed
  4946405

  Copy full SHA for 4946405

• refactor: Use switch in more places

  Show description for 7beef44
  fb55

  committed
  7beef44

  Copy full SHA for 7beef44

• refactor: Simplify code

  Show description for 41daefc
  fb55

  committed
  41daefc

  Copy full SHA for 41daefc

• refactor: Move <html> and <body> end tag location logic

  Show description for 9bd426e
  fb55

  committed
  9bd426e

  Copy full SHA for 9bd426e

• refactor: No more temp buffer

  fb55

  committed
  98e211a

  Copy full SHA for 98e211a

• refactor: Simplify parser constructor

  fb55

  committed
  6ac7e5e

  Copy full SHA for 6ac7e5e

• refactor: Use unions to describe DOM (#26)

  fb55

  committed
  681915f

  Copy full SHA for 681915f

• refactor: Use old package names

  fb55

  committed
  2832779

  Copy full SHA for 2832779

• fix: Move html5lib-tests submodule to the expected place

  fb55

  committed
  cc78cd5

  Copy full SHA for cc78cd5

• fix: Import files shipped in packages

  Show description for 87bbdc3
  fb55

  committed
  87bbdc3

  Copy full SHA for 87bbdc3

• chore(deps-dev): Upgrade dev dependencies

  fb55

  committed
  7513864

  Copy full SHA for 7513864

• chore(deps): bump human-format from 0.7.0 to 0.11.0 (#48)

  Show description for b554ddb
  

  dependabot[bot]

  authored and

  fb55

  committed
  b554ddb

  Copy full SHA for b554ddb

• docs: Point links back at the original repo

  fb55

  committed
  02db713

  Copy full SHA for 02db713

• docs: Fix package links

  fb55

  committed
  b1de070

  Copy full SHA for b1de070

• chore: Revert unnecessary changes

  fb55

  committed
  35007d5

  Copy full SHA for 35007d5

• refactor: Improve error message

  fb55

  committed
  069852f

  Copy full SHA for 069852f

Commits on Jan 8, 2022

• Set prettier log level to warn

  Show description for ef014f5
  

  fb55

  and

  wooorm

  authored
  ef014f5

  Copy full SHA for ef014f5

• Move test utils back to their original directory

  fb55

  committed
  dab5af7

  Copy full SHA for dab5af7

• Fix builds for test utils

  fb55

  committed
  195ef62

  Copy full SHA for 195ef62

Commits on Jan 9, 2022

• Use tsc --build --clean to clean build artifacts

  fb55

  committed
  1a855b3

  Copy full SHA for 1a855b3

Commits on Jan 10, 2022

• fix: Have default adapter getNamespaceURI return a namespace

  fb55

  committed
  5652651

  Copy full SHA for 5652651

Commits on Jan 11, 2022

• chore(deps-dev): bump @typescript-eslint/eslint-plugin (#50)

  Show description for 00bfa24
  dependabot[bot]

  authored
  00bfa24

  Copy full SHA for 00bfa24

• chore(deps-dev): bump @typescript-eslint/parser from 5.9.0 to 5.9.1 (#51)

  Show description for 0482436
  dependabot[bot]

  authored
  0482436

  Copy full SHA for 0482436

• Merge branch 'master' of https://github.com/parse5/parse5-fork

  fb55

  committed
  e67175b

  Copy full SHA for e67175b

• Remove lerna

  fb55

  committed
  0e62445

  Copy full SHA for 0e62445

• Revert parser feedback updates

  fb55

  committed
  9658d33

  Copy full SHA for 9658d33

• Improve find

  fb55

  committed
  fbababb

  Copy full SHA for fbababb

• Document events

  Show description for eb0fcc1
  fb55

  committed
  eb0fcc1

  Copy full SHA for eb0fcc1

• Update index.ts

  fb55

  committed
  31ca0a0

  Copy full SHA for 31ca0a0

• Update index.ts

  fb55

  committed
  c382a97

  Copy full SHA for c382a97

• Replace dedent with outdent

  Show description for aaa5de0
  fb55

  committed
  aaa5de0

  Copy full SHA for aaa5de0

• Make TOKEN_EMISSION_HELPERS a switch

  Show description for 7c3dcf4
  fb55

  committed
  7c3dcf4

  Copy full SHA for 7c3dcf4

• Added TODO comments

  fb55

  committed
  71f6c21

  Copy full SHA for 71f6c21

Commits on Jan 13, 2022

• Fix format of comment

  fb55

  committed
  be83e40

  Copy full SHA for be83e40

• Use project references to build the project

  fb55

  committed
  651bb21

  Copy full SHA for 651bb21

• Import parser options from main export

  fb55

  committed
  af89d24

  Copy full SHA for af89d24

• Add arrow-body-style eslint rule

  fb55

  committed
  fae4b14

  Copy full SHA for fae4b14

• Update generateImpliedEndTagsWithExclusion to use tag ids

  Show description for 9c73b72
  fb55

  committed
  9c73b72

  Copy full SHA for 9c73b72

• Make tokenizer state a const enum again

  fb55

  committed
  5ba2990

  Copy full SHA for 5ba2990

Commits on Jan 17, 2022

• chore(deps-dev): bump eslint-plugin-unicorn from 40.0.0 to 40.1.0 (#52)

  Show description for 4126b91
  dependabot[bot]

  authored
  4126b91

  Copy full SHA for 4126b91

• chore(deps-dev): bump eslint from 8.6.0 to 8.7.0 (#53)

  Show description for f1d16d6
  dependabot[bot]

  authored
  f1d16d6

  Copy full SHA for f1d16d6

• chore(deps-dev): bump ts-jest from 27.1.2 to 27.1.3 (#54)

  Show description for c928df6
  dependabot[bot]

  authored
  c928df6

  Copy full SHA for c928df6

Commits on Jan 18, 2022

• chore(deps-dev): bump @typescript-eslint/eslint-plugin (#55)

  Show description for 413a4e3
  dependabot[bot]

  authored
  413a4e3

  Copy full SHA for 413a4e3

• chore(deps-dev): bump @typescript-eslint/parser from 5.9.1 to 5.10.0 (#56)

  Show description for 20e2071
  dependabot[bot]

  authored
  20e2071

  Copy full SHA for 20e2071

• Merge remote-tracking branch 'upstream/master'

  fb55

  committed
  465d5cb

  Copy full SHA for 465d5cb

Commits on Jan 19, 2022

• chore(deps-dev): bump lint-staged from 12.1.7 to 12.2.0 (#57)

  Show description for 23eac84
  dependabot[bot]

  authored
  23eac84

  Copy full SHA for 23eac84

Commits on Jan 20, 2022

• chore(deps-dev): bump lint-staged from 12.2.0 to 12.2.1 (#58)

  Show description for bcfe0eb
  dependabot[bot]

  authored
  bcfe0eb

  Copy full SHA for bcfe0eb

Commits on Jan 21, 2022

• chore(deps-dev): bump lint-staged from 12.2.1 to 12.2.2 (#59)

  Show description for 38ede91
  dependabot[bot]

  authored
  38ede91

  Copy full SHA for 38ede91

• chore(deps-dev): bump typescript from 4.5.4 to 4.5.5 (#60)

  Show description for 6e0483e
  dependabot[bot]

  authored
  6e0483e

  Copy full SHA for 6e0483e

Commits on Jan 24, 2022

• chore(deps-dev): bump lint-staged from 12.2.2 to 12.3.1 (#61)

  Show description for 4882c17
  dependabot[bot]

  authored
  4882c17

  Copy full SHA for 4882c17

Commits on Jan 25, 2022

• chore(deps-dev): bump @typescript-eslint/eslint-plugin (#62)

  Show description for 30e9e14
  dependabot[bot]

  authored
  30e9e14

  Copy full SHA for 30e9e14

• chore(deps-dev): bump @typescript-eslint/parser from 5.10.0 to 5.10.1 (#63)

  Show description for 153505c
  dependabot[bot]

  authored
  153505c

  Copy full SHA for 153505c

Commits on Jan 27, 2022

• chore(deps-dev): bump lint-staged from 12.3.1 to 12.3.2 (#64)

  Show description for b7e7857
  dependabot[bot]

  authored
  b7e7857

  Copy full SHA for b7e7857

Commits on Jan 31, 2022

• chore(deps-dev): bump eslint from 8.7.0 to 8.8.0 (#65)

  Show description for c303aec
  dependabot[bot]

  authored
  c303aec

  Copy full SHA for c303aec

Commits on Feb 1, 2022

• chore(deps-dev): bump @typescript-eslint/eslint-plugin (#66)

  Show description for cd82916
  dependabot[bot]

  authored
  cd82916

  Copy full SHA for cd82916

Commits on Feb 2, 2022

• chore(deps-dev): bump lint-staged from 12.3.2 to 12.3.3 (#68)

  Show description for e17472b
  dependabot[bot]

  authored
  e17472b

  Copy full SHA for e17472b

• chore(deps-dev): bump @typescript-eslint/parser from 5.10.1 to 5.10.2 (#67)

  Show description for 802f805
  dependabot[bot]

  authored
  802f805

  Copy full SHA for 802f805

Commits on Feb 3, 2022

• fix(package): Set files to dist

  Show description for af21282
  fb55

  committed
  af21282

  Copy full SHA for af21282

Commits on Feb 5, 2022

• Fix TreeAdapter types

  fb55

  committed
  12b6cfd

  Copy full SHA for 12b6cfd

Commits on Feb 7, 2022

• chore(deps-dev): bump jest from 27.4.7 to 27.5.0 (#69)

  Show description for 57d0ccc
  dependabot[bot]

  authored
  57d0ccc

  Copy full SHA for 57d0ccc

• Avoid casts for find

  fb55

  committed
  f374816

  Copy full SHA for f374816

• Merge remote-tracking branch 'upstream/master'

  fb55

  committed
  1be2263

  Copy full SHA for 1be2263