Skip to content
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

Merge branch 4.x into master #1774

Merged
merged 20 commits into from Dec 29, 2021
Merged

Merge branch 4.x into master #1774

merged 20 commits into from Dec 29, 2021

Conversation

jaylinski
Copy link
Member

:octocat:

@jaylinski jaylinski self-assigned this Dec 3, 2021
@jaylinski jaylinski force-pushed the merge-4.x branch 3 times, most recently from 403157e to be905dc Compare December 3, 2021 18:49
If `global` is used and handlebars is compiled for browser
usage without a Node.js `global` polyfill, handlebars
fails with a `global is undefined` error.

Fixes #1593
First part of reorganizing and cleaning up test-folders.
Second part of reorganizing and cleaning up test-folders.
Third part of reorganizing and cleaning up test-folders.
Also removed it from published files, since the script doesn't seem to be used.

Fourth part of reorganizing and cleaning up test-folders.
Also reorganized npm scripts.
AMD modules were removed in v5.
Fixes the following error when running integration-tests:
```
npm ERR! code ERESOLVE
npm ERR! ERESOLVE unable to resolve dependency tree
npm ERR!
npm ERR! While resolving: webpack-test@1.0.0
npm ERR! Found: handlebars@5.0.0-alpha.1
npm ERR! node_modules/handlebars
npm ERR!   dev handlebars@"file:../../.." from the root project
npm ERR!
npm ERR! Could not resolve dependency:
npm ERR! peer handlebars@">= 1.3.0 < 5" from handlebars-loader@1.7.1
npm ERR! node_modules/handlebars-loader
npm ERR!   dev handlebars-loader@"^1.7.1" from the root project
npm ERR!
```
Also upgraded to `@definitelytyped/dtslint`.
@jaylinski jaylinski merged commit 35ea8e6 into master Dec 29, 2021
13 checks passed
@jaylinski jaylinski deleted the merge-4.x branch December 29, 2021 22:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants