Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into node_version_bump
Browse files Browse the repository at this point in the history
  • Loading branch information
tonycoco committed Mar 26, 2024
2 parents 374d151 + 7e60e38 commit 1323be8
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 24 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [18, 20, 21]
node: [14, 16, 18, 20, 21]
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
Expand All @@ -29,7 +29,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
- run: npm ci
- run: npm run system-test
system_test:
Expand All @@ -38,7 +38,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
- run: npm ci
- run: npm run system-test
lint:
Expand All @@ -47,7 +47,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
- run: npm ci
- run: npm run lint
license_check:
Expand All @@ -56,6 +56,6 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
- run: npm ci
- run: npm run license-check
15 changes: 4 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"fix": "eslint --fix '**/*.ts'"
},
"engines": {
"node": ">=18"
"node": ">=14"
},
"keywords": ["typescript", "linter", "formatter", "google"],
"author": "Google Inc.",
Expand All @@ -50,7 +50,7 @@
"json5": "^2.1.3",
"meow": "^9.0.0",
"ncp": "^2.0.0",
"prettier": "3.1.1",
"prettier": "3.2.5",
"rimraf": "3.0.2",
"write-file-atomic": "^4.0.0"
},
Expand All @@ -64,7 +64,6 @@
"@types/mocha": "^10.0.0",
"@types/ncp": "^2.0.4",
"@types/node": "20.11.30",
"@types/prettier": "^2.1.1",
"@types/rimraf": "^3.0.0",
"@types/sinon": "^17.0.0",
"@types/tmp": "^0.2.0",
Expand Down
6 changes: 3 additions & 3 deletions src/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import * as inquirer from 'inquirer';
import * as path from 'path';
import {ncp} from 'ncp';
import * as util from 'util';
import * as writeFileAtomic from 'write-file-atomic';

import {
getPkgManagerCommand,
readFilep as read,
readJsonp as readJson,
writeFileAtomicp as write,
Bag,
DefaultPackage,
} from './util';
Expand Down Expand Up @@ -168,7 +168,7 @@ async function writePackageJson(
): Promise<void> {
options.logger.log('Writing package.json...');
if (!options.dryRun) {
await write('./package.json', formatJson(packageJson));
await writeFileAtomic('./package.json', formatJson(packageJson));
}
const preview = {
scripts: packageJson.scripts,
Expand Down Expand Up @@ -216,7 +216,7 @@ async function generateConfigFile(
if (writeFile) {
options.logger.log(`Writing ${filename}...`);
if (!options.dryRun) {
await write(filename, contents);
await writeFileAtomic(filename, contents);
}
options.logger.log(contents);
}
Expand Down
2 changes: 0 additions & 2 deletions src/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ import * as path from 'path';
import * as rimraf from 'rimraf';
import {promisify} from 'util';
import * as ncp from 'ncp';
import * as writeFileAtomic from 'write-file-atomic';
import * as JSON5 from 'json5';

export const readFilep = promisify(fs.readFile);
export const rimrafp = promisify(rimraf);
export const writeFileAtomicp = promisify(writeFileAtomic);
export const ncpp = promisify(ncp.ncp);

export interface Bag<T> {
Expand Down

0 comments on commit 1323be8

Please sign in to comment.