From 56e139a73ac7dc92b014d8c0dfbd0a2200eeaf44 Mon Sep 17 00:00:00 2001 From: Edward Faulkner Date: Fri, 16 Oct 2026 11:56:27 -0400 Subject: [PATCH] CI improvements - run tsc in ci - rename default branch --- .github/workflows/ci.yml | 5 +- .github/workflows/plan-release.yml | 5 +- .github/workflows/publish.yml | 1 - package.json | 5 +- pnpm-lock.yaml | 90 +++++++++++++++++++++++++++--- src/evented-tokenizer.ts | 2 +- 6 files changed, 91 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28804d0..e0a40ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build: @@ -19,4 +19,5 @@ jobs: node-version: 20.x cache: pnpm - run: pnpm install --frozen-lockfile + - run: pnpm lint - run: pnpm test diff --git a/.github/workflows/plan-release.yml b/.github/workflows/plan-release.yml index 5f003f8..4b9cf02 100644 --- a/.github/workflows/plan-release.yml +++ b/.github/workflows/plan-release.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - master pull_request_target: # This workflow has permissions on the repo, do NOT run code from PRs in this workflow. See https://securitylab.github.com/research/github-actions-preventing-pwn-requests/ types: - labeled @@ -23,7 +22,7 @@ jobs: steps: - uses: release-plan/actions/should-prepare-release@v1 with: - ref: 'master' + ref: 'main' id: should-prepare create-prepare-release-pr: @@ -40,7 +39,7 @@ jobs: - uses: release-plan/actions/prepare@v1 name: Run release-plan prepare with: - ref: 'master' + ref: 'main' env: GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }} id: explanation diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 77725c0..ab1b544 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,7 +8,6 @@ on: push: branches: - main - - master paths: - '.release-plan.json' diff --git a/package.json b/package.json index 61cb95a..2edb703 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,9 @@ ], "scripts": { "build": "ember build", - "lint": "tslint -p tsconfig.json", + "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\" --prefixColors auto", + "lint:tsc": "tsc --noEmit", + "lint:tslint": "tslint -p tsconfig.json", "prepare": "ember build", "test": "ember test && nyc qunit dist/tests/tests.js" }, @@ -32,6 +34,7 @@ "broccoli-rollup": "^2.0.0", "broccoli-tslinter": "^3.0.1", "broccoli-typescript-compiler": "^2.2.0", + "concurrently": "^9.2.5", "ember-cli": "^3.0.0", "got": "^8.2.0", "in-repo-commands": "link:./commands", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c9c1ec0..97d82f0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,6 +29,9 @@ importers: broccoli-typescript-compiler: specifier: ^2.2.0 version: 2.3.0 + concurrently: + specifier: ^9.2.5 + version: 9.2.5 ember-cli: specifier: ^3.0.0 version: 3.21.2(handlebars@4.7.6)(lodash@4.17.20)(underscore@1.11.0) @@ -926,6 +929,10 @@ packages: resolution: {integrity: sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==} engines: {node: '>=10'} + chalk@4.1.2: + resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} + engines: {node: '>=10'} + chalk@5.6.2: resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==} engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} @@ -1100,6 +1107,11 @@ packages: concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + concurrently@9.2.5: + resolution: {integrity: sha512-YMZlvWrTPQEhjKp60XSmMGt60+pffbv6DyRnOMvVO98+J7aF8w8Ui9FhdcOwvSixc/kyR6SoVvmejcn/2lZBqg==} + engines: {node: '>=18'} + hasBin: true + config-chain@1.1.13: resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==} @@ -3764,6 +3776,9 @@ packages: resolution: {integrity: sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==} engines: {npm: '>=2.0.0'} + rxjs@7.8.2: + resolution: {integrity: sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==} + safe-buffer@5.1.2: resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} @@ -3844,6 +3859,10 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} + shell-quote@1.12.0: + resolution: {integrity: sha512-PcByqNyT/38F2kDNi006HAMRJaULuBzq/FOsw3qdZvX/GA9W/jamDaRskgHjubHiftXK5sIFxLNkvrXUwcof6Q==} + engines: {node: '>= 0.4'} + shelljs@0.8.4: resolution: {integrity: sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==} engines: {node: '>=4'} @@ -4109,6 +4128,10 @@ packages: resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} engines: {node: '>=8'} + supports-color@8.1.1: + resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==} + engines: {node: '>=10'} + symlink-or-copy@1.3.1: resolution: {integrity: sha512-0K91MEXFpBUaywiwSSkmKjnGcasG/rVBXFLJz5DrgGabpYD6N+3yZrfD6uUIfpuTu65DZLHi7N8CizHc07BPZA==} @@ -4218,6 +4241,10 @@ packages: resolution: {integrity: sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==} engines: {node: '>=0.6'} + tree-kill@1.2.2: + resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} + hasBin: true + tree-sync@1.4.0: resolution: {integrity: sha512-YvYllqh3qrR5TAYZZTXdspnIhlKAYezPYw11ntmweoceu4VK+keN356phHRIIo1d+RDmLpHZrUlmxga2gc9kSQ==} @@ -4228,6 +4255,9 @@ packages: tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} + tslib@2.8.1: + resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} + tslint@5.20.1: resolution: {integrity: sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==} engines: {node: '>=4.8.0'} @@ -4579,6 +4609,10 @@ packages: resolution: {integrity: sha512-Nt9ZJjXTv5R8MHbqby/wXQ6Gi0Bb3TcYZkR1bzuL4yB2OxWPkXknz513gEF0GoA6tn00UpbPvERW8rzCuWCA6w==} engines: {node: '>=10'} + yargs@17.7.2: + resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} + engines: {node: '>=12'} + yargs@17.7.3: resolution: {integrity: sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==} engines: {node: '>=12'} @@ -4749,7 +4783,7 @@ snapshots: '@isaacs/cliui@8.0.2': dependencies: string-width: 5.1.2 - string-width-cjs: string-width@4.2.0 + string-width-cjs: string-width@4.2.3 strip-ansi: 7.2.0 strip-ansi-cjs: strip-ansi@6.0.1 wrap-ansi: 8.1.0 @@ -5878,6 +5912,11 @@ snapshots: ansi-styles: 4.3.0 supports-color: 7.2.0 + chalk@4.1.2: + dependencies: + ansi-styles: 4.3.0 + supports-color: 7.2.0 + chalk@5.6.2: {} changelog-filename-regex@1.1.2: {} @@ -5964,13 +6003,13 @@ snapshots: cliui@6.0.0: dependencies: - string-width: 4.2.0 - strip-ansi: 6.0.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 wrap-ansi: 6.2.0 cliui@7.0.4: dependencies: - string-width: 4.2.0 + string-width: 4.2.3 strip-ansi: 6.0.0 wrap-ansi: 7.0.0 @@ -6049,6 +6088,15 @@ snapshots: concat-map@0.0.1: {} + concurrently@9.2.5: + dependencies: + chalk: 4.1.2 + rxjs: 7.8.2 + shell-quote: 1.12.0 + supports-color: 8.1.1 + tree-kill: 1.2.2 + yargs: 17.7.2 + config-chain@1.1.13: dependencies: ini: 1.3.5 @@ -9003,6 +9051,10 @@ snapshots: dependencies: tslib: 1.14.1 + rxjs@7.8.2: + dependencies: + tslib: 2.8.1 + safe-buffer@5.1.2: {} safe-buffer@5.2.1: {} @@ -9093,6 +9145,8 @@ snapshots: shebang-regex@3.0.0: {} + shell-quote@1.12.0: {} + shelljs@0.8.4: dependencies: glob: 7.1.6 @@ -9328,7 +9382,7 @@ snapshots: dependencies: emoji-regex: 8.0.0 is-fullwidth-code-point: 3.0.0 - strip-ansi: 6.0.0 + strip-ansi: 6.0.1 string-width@4.2.3: dependencies: @@ -9410,6 +9464,10 @@ snapshots: dependencies: has-flag: 4.0.0 + supports-color@8.1.1: + dependencies: + has-flag: 4.0.0 + symlink-or-copy@1.3.1: {} sync-disk-cache@1.3.4: @@ -9614,6 +9672,8 @@ snapshots: toidentifier@1.0.0: {} + tree-kill@1.2.2: {} + tree-sync@1.4.0: dependencies: debug: 2.6.9 @@ -9636,6 +9696,8 @@ snapshots: tslib@1.14.1: {} + tslib@2.8.1: {} + tslint@5.20.1(typescript@2.9.2): dependencies: '@babel/code-frame': 7.10.4 @@ -9860,7 +9922,7 @@ snapshots: widest-line@3.1.0: dependencies: - string-width: 4.2.0 + string-width: 4.2.3 window-size@1.1.1: dependencies: @@ -9894,8 +9956,8 @@ snapshots: wrap-ansi@6.2.0: dependencies: ansi-styles: 4.3.0 - string-width: 4.2.0 - strip-ansi: 6.0.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 wrap-ansi@7.0.0: dependencies: @@ -9987,7 +10049,7 @@ snapshots: require-directory: 2.1.1 require-main-filename: 2.0.0 set-blocking: 2.0.0 - string-width: 4.2.0 + string-width: 4.2.3 which-module: 2.0.0 y18n: 4.0.0 yargs-parser: 18.1.3 @@ -10002,6 +10064,16 @@ snapshots: y18n: 5.0.8 yargs-parser: 20.2.9 + yargs@17.7.2: + dependencies: + cliui: 8.0.1 + escalade: 3.2.0 + get-caller-file: 2.0.5 + require-directory: 2.1.1 + string-width: 4.2.3 + y18n: 5.0.8 + yargs-parser: 21.1.1 + yargs@17.7.3: dependencies: cliui: 8.0.1 diff --git a/src/evented-tokenizer.ts b/src/evented-tokenizer.ts index 7cba512..12eaacf 100644 --- a/src/evented-tokenizer.ts +++ b/src/evented-tokenizer.ts @@ -1,4 +1,4 @@ -import { preprocessInput, isAlpha, isSpace } from './utils'; +import { preprocessInput, isSpace } from './utils'; import { EntityParser, TokenizerDelegate, TokenizerState } from './types'; export default class EventedTokenizer {