diff --git a/package.json b/package.json index d12f3824..0ed10ade 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "preversion": "npm run lint && pnpm run build", "version": "pnpm run preversion && pnpm run generate:all && git add .", "release": "np --no-cleanup --no-yarn --no-tests", - "update:check": "pnpx npm-check-updates -x typescript-* --dep dev,prod", + "update:check": "pnpx npm-check-updates -x typescript-*,ava,chalk --dep dev,prod", "update:commit": "pnpx npm-check-updates -u -x typescript-*,ava,chalk --dep dev,prod && pnpm update && pnpm install" }, "keywords": [ @@ -104,7 +104,7 @@ "@rollup/pluginutils": "^4.2.0", "@wessberg/stringutil": "^1.0.19", "browserslist": "^4.20.2", - "browserslist-generator": "^1.0.65", + "browserslist-generator": "^1.0.66", "chalk": "4.1.2", "compatfactory": "^0.0.13", "crosspath": "1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b56c15ec..146a2a8c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,7 +23,7 @@ specifiers: ava: 3.15.0 babel-preset-minify: ^0.5.1 browserslist: ^4.20.2 - browserslist-generator: ^1.0.65 + browserslist-generator: ^1.0.66 chalk: 4.1.2 compatfactory: ^0.0.13 crosspath: 1.0.0 @@ -66,7 +66,7 @@ dependencies: '@rollup/pluginutils': 4.2.0 '@wessberg/stringutil': 1.0.19 browserslist: 4.20.2 - browserslist-generator: 1.0.65 + browserslist-generator: 1.0.66 chalk: 4.1.2 compatfactory: 0.0.13_typescript@4.6.3 crosspath: 1.0.0 @@ -2578,34 +2578,22 @@ packages: fill-range: 7.0.1 dev: true - /browserslist-generator/1.0.65: - resolution: {integrity: sha512-2+p27BTZ0T6fGAn57IZOoGRTDqIhaHVPHWTg5ZejMA/SKaQG1ChvfOnb9sxqRwLMUGtrUXbX0QQA7H1s6oQh0A==} + /browserslist-generator/1.0.66: + resolution: {integrity: sha512-aFDax4Qzh29DdyhHQBD2Yu2L5OvaDnvYFMbmpLrLwwaNK4H6dHEhC/Nxv93/+mfAA+a/t94ln0P2JZvHO6LZDA==} engines: {node: '>=8.0.0'} dependencies: '@mdn/browser-compat-data': 4.1.16 '@types/object-path': 0.11.1 '@types/semver': 7.3.9 '@types/ua-parser-js': 0.7.36 - browserslist: 4.18.1 + browserslist: 4.20.2 caniuse-lite: 1.0.30001328 - isbot: 3.3.4 + isbot: 3.4.5 object-path: 0.11.8 semver: 7.3.7 ua-parser-js: 1.0.2 dev: false - /browserslist/4.18.1: - resolution: {integrity: sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==} - engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} - hasBin: true - dependencies: - caniuse-lite: 1.0.30001328 - electron-to-chromium: 1.4.107 - escalade: 3.1.1 - node-releases: 2.0.3 - picocolors: 1.0.0 - dev: false - /browserslist/4.20.2: resolution: {integrity: sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} @@ -4766,8 +4754,8 @@ packages: resolution: {integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=} dev: true - /isbot/3.3.4: - resolution: {integrity: sha512-a6o/e6nBMoRGvoovg5NT2r/N7S4398yCDXc6HgEOILdBAjYv05SX1MBhgc8SHnEJdRyLfOpAPqc10ezLWkj7rQ==} + /isbot/3.4.5: + resolution: {integrity: sha512-+KD6q1BBtw0iK9aGBGSfxJ31/ZgizKRjhm8ebgJUBMx0aeeQuIJ1I72beCoIrltIZGrSm4vmrxRxrG5n1aUTtw==} engines: {node: '>=12'} dev: false diff --git a/src/util/get-script-target-from-browserslist/get-script-target-from-browserslist.ts b/src/util/get-script-target-from-browserslist/get-script-target-from-browserslist.ts index afb70f9e..590731e5 100644 --- a/src/util/get-script-target-from-browserslist/get-script-target-from-browserslist.ts +++ b/src/util/get-script-target-from-browserslist/get-script-target-from-browserslist.ts @@ -36,8 +36,18 @@ export function getScriptTargetFromBrowserslist(browserslist: string[], typescri ); // Support older TypeScript versions that may not supported ES2021 as a ScriptTarget with nullish coalescing case "es2021": + return ( + typescript.ScriptTarget.ES2021 ?? + typescript.ScriptTarget.ES2020 ?? + typescript.ScriptTarget.ES2019 ?? + typescript.ScriptTarget.ES2018 ?? + typescript.ScriptTarget.ES2017 ?? + typescript.ScriptTarget.ES2016 ?? + typescript.ScriptTarget.ES2015 + ); case "es2022": return ( + typescript.ScriptTarget.ES2022 ?? typescript.ScriptTarget.ES2021 ?? typescript.ScriptTarget.ES2020 ?? typescript.ScriptTarget.ES2019 ?? @@ -75,9 +85,11 @@ export function getEcmaVersionForScriptTarget( return "es2020"; case typescript.ScriptTarget.ES2021: return "es2021"; + case typescript.ScriptTarget.ES2022: + return "es2022"; case typescript.ScriptTarget.ESNext: case typescript.ScriptTarget.Latest: case typescript.ScriptTarget.JSON: - return "es2021"; + return "es2022"; } }