Skip to content

Commit

Permalink
Merge branch 'main' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
DRiFTy17 committed Sep 6, 2023
2 parents d834b8e + f327974 commit b9322d2
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 60 deletions.
12 changes: 3 additions & 9 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ assignees: ''
---

**Describe the bug:**
A clear and concise description of what the bug is.
<!-- A clear and concise description of what the bug is. -->

**To Reproduce:**
Steps to reproduce the behavior:
Expand All @@ -17,17 +17,11 @@ Steps to reproduce the behavior:
4. See error

**Expected behavior:**
A clear and concise description of what you expected to happen.

**Screenshots:**
If applicable, add screenshots to help explain your problem.
<!-- A clear and concise description of what you expected to happen. -->

**Please complete the following information:**
- Package version: [e.g. v1.0.0]
- I have searched existing issues before creating this report? [Y/N]
- Browser: [e.g. Chrome, Firefox, Safari, All]
- Platform: [e.g. desktop, mobile, All]
- OS: [e.g. Windows, Mac, Linux, iOS, Android, All]

**Additional context:**
Add any other context about the problem here.
<!-- Add any other context about the problem here. -->
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ assignees: ''
---

**Describe the feature:**
A clear and concise description of the feature.
<!-- A clear and concise description of the feature. -->

**Describe any alternatives you've considered:**
A clear and concise description of any alternative features or workarounds you've considered.
<!-- A clear and concise description of any alternative features or workarounds you've considered. -->

**Additional context:**
Add any other context or screenshots about the feature request here.
<!-- Add any other context or screenshots about the feature request here. -->
13 changes: 2 additions & 11 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
## PR Checklist

Please check if your PR fulfills the following requirements:

- Tests for the changes have been added: [Y/N]
- Docs have been added / updated: [Y/N]
- Does this PR introduce a breaking change? [Y/N]
- I have linked any related GitHub issues to be closed when this PR is merged? [Y/N]

## Describe the new behavior?
A clear and concise description of the changes, including an breaking changes (if applicable)
<!-- A clear and concise description of the changes, including any breaking changes (if applicable) -->

## Additional information
Add any other context about the change here.
<!-- Add any other context about the change here. -->
2 changes: 1 addition & 1 deletion .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
${{ runner.os }}-
- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: "16"

Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
# v2.1.0 (Tue Sep 05 2023)

#### 🚀 Enhancement

- feat(typescript): add build support for es2020+ [#3](https://github.com/tyler-technologies-oss/forge-build-tools/pull/3) ([@DRiFTy17](https://github.com/DRiFTy17))

#### 🐛 Bug Fix

- chore: update workflows [#2](https://github.com/tyler-technologies-oss/forge-build-tools/pull/2) ([@DRiFTy17](https://github.com/DRiFTy17))

#### ⚠️ Pushed to `main`

- chore: upgrade workflow ([@DRiFTy17](https://github.com/DRiFTy17))

#### Authors: 1

- Kieran Nichols ([@DRiFTy17](https://github.com/DRiFTy17))

---

# v2.0.0 (Fri Jun 24 2022)

:tada: This release contains work from a new contributor! :tada:
Expand Down
34 changes: 0 additions & 34 deletions src/constants.ts

This file was deleted.

21 changes: 19 additions & 2 deletions src/typescript/typescript.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import ts from 'typescript';

import { TS_LIB_MAP } from '../constants.js';
import { isGlob, log, logError, logInfo, logWarn } from '../utils/index.js';
import { readJsonFile, globFilesAsync } from '../fs/index.js';

Expand Down Expand Up @@ -31,7 +30,7 @@ export async function compileTypeScript(files: string[] | string, options: IType
// filename (i.e. lib.es2015.d.ts), which differs from the regular tsconfig lib entries. This allows
// lib entries to specified the same way (i.e. es2015 => lib.es2015.d.ts)
if (options.lib) {
options.lib = options.lib.map(lib => TS_LIB_MAP[lib] || lib);
options.lib = options.lib.map(lib => `lib.${lib}.d.ts`);
}

const program = ts.createProgram(files, options);
Expand Down Expand Up @@ -96,6 +95,12 @@ export function normalizeCompilerOptions(options: ts.CompilerOptions): ts.Compil
case 'es2015':
options.module = ts.ModuleKind.ES2015;
break;
case 'es2020':
options.module = ts.ModuleKind.ES2020;
break;
case 'es2022':
options.module = ts.ModuleKind.ES2022;
break;
case 'esnext':
options.module = ts.ModuleKind.ESNext;
break;
Expand Down Expand Up @@ -134,6 +139,18 @@ export function normalizeCompilerOptions(options: ts.CompilerOptions): ts.Compil
case 'ES2018':
options.target = ts.ScriptTarget.ES2018;
break;
case 'ES2019':
options.target = ts.ScriptTarget.ES2019;
break;
case 'ES2020':
options.target = ts.ScriptTarget.ES2020;
break;
case 'ES2021':
options.target = ts.ScriptTarget.ES2021;
break;
case 'ES2022':
options.target = ts.ScriptTarget.ES2022;
break;
case 'ESNEXT':
options.target = ts.ScriptTarget.ESNext;
break;
Expand Down

0 comments on commit b9322d2

Please sign in to comment.