Skip to content

build: switch to using mkdir.recursive #3184

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Mar 13, 2023
Merged

build: switch to using mkdir.recursive #3184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb3322d
build: switch to using mkdir.recursive
Mar 13, 2023
f7982c8
chore: remove mkdirp dep
Mar 13, 2023
26c4690
chore: add missing mkdirp
Mar 13, 2023
0e3a035
chore: fix build issue
Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
"devDependencies": {
"@compodoc/compodoc": "^1.1.10",
"@types/execa": "^0.9.0",
"@types/mkdirp": "^1.0.0",
"@types/mocha": "^9.0.0",
"@types/mv": "^2.1.0",
"@types/ncp": "^2.0.1",
Expand All @@ -81,7 +80,6 @@
"gts": "^3.1.0",
"js-green-licenses": "^4.0.0",
"linkinator": "^4.0.0",
"mkdirp": "^2.0.0",
"mocha": "^9.2.2",
"mv": "^2.1.1",
"ncp": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions src/generator/download.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
import * as minimist from 'yargs-parser';
import * as path from 'path';
import * as fs from 'fs';
const {mkdir} = require('fs').promises;
import Q from 'p-queue';
import {request, Headers} from 'gaxios';
import * as gapi from 'googleapis-common';
import * as mkdirp from 'mkdirp';

export type Schema = {[index: string]: {}};
export const DISCOVERY_URL = 'https://www.googleapis.com/discovery/v1/apis/';
Expand All @@ -41,7 +41,7 @@ export interface DownloadOptions {

// exported for mocking purposes
export const gfs = {
mkdir: async (dir: string) => mkdirp(dir),
mkdir: async (dir: string) => mkdir(dir, {recursive: true}),
writeFile: (path: string, obj: {}) => {
fs.writeFileSync(path, JSON.stringify(obj, null, 2));
},
Expand Down
4 changes: 2 additions & 2 deletions src/generator/generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
// limitations under the License.

import * as fs from 'fs';
const {mkdir} = require('fs').promises;
import {Schema, Schemas} from 'googleapis-common';
import * as mkdirp from 'mkdirp';
import * as nunjucks from 'nunjucks';
import * as path from 'path';
import * as util from 'util';
Expand Down Expand Up @@ -272,7 +272,7 @@ export class Generator {
this.logResult(apiDiscoveryUrl, 'Generating APIs...');
const apiPath = path.join(srcPath, 'apis', schema.name);
const exportFilename = path.join(apiPath, schema.version + '.ts');
await mkdirp(path.dirname(exportFilename));
await mkdir(path.dirname(exportFilename), {recursive: true});
// populate the `method.fragment` property with samples
addFragments(schema);
// generate the API (ex: src/apis/youtube/v3.ts)
Expand Down
4 changes: 2 additions & 2 deletions src/generator/samplegen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
// limitations under the License.

import * as path from 'path';
import * as mkdirp from 'mkdirp';
import * as prettier from 'prettier';
import {
Schema,
Expand All @@ -25,6 +24,7 @@ import {
import * as nunjucks from 'nunjucks';
import * as filters from './filters';
import * as fs from 'fs';
const {mkdir} = require('fs').promises;
import * as util from 'util';

const writeFile = util.promisify(fs.writeFile);
Expand Down Expand Up @@ -73,7 +73,7 @@ export async function addFragments(schema: Schema) {
*/
export async function generateSamples(apiPath: string, schema: Schema) {
const samplesPath = path.join(apiPath, 'samples', schema.version);
await mkdirp(samplesPath);
await mkdir(samplesPath, {recursive: true});
const methods = getAllMethods(schema);
for (const method of methods) {
const sampleData = getSample(schema, method);
Expand Down