From 7daf6fb6b82e2ce01e3693869c695fe77146238d Mon Sep 17 00:00:00 2001 From: Francisco Buceta Date: Mon, 10 Apr 2023 12:51:44 +0200 Subject: [PATCH] fix: use glob named import Signed-off-by: Francisco Buceta --- packages/boot/src/booters/booter-utils.ts | 3 +-- packages/build/bin/compile-package.js | 6 +++--- packages/cli/generators/copyright/fs.js | 3 +-- .../generators/clone-example.integration.js | 16 ++++++---------- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/packages/boot/src/booters/booter-utils.ts b/packages/boot/src/booters/booter-utils.ts index 19eb1074aac3..52fa5f58bff2 100644 --- a/packages/boot/src/booters/booter-utils.ts +++ b/packages/boot/src/booters/booter-utils.ts @@ -6,8 +6,7 @@ import {Constructor} from '@loopback/core'; import debugFactory from 'debug'; import path from 'path'; -import {promisify} from 'util'; -const glob = promisify(require('glob')); +import {glob} from 'glob'; const debug = debugFactory('loopback:boot:booter-utils'); diff --git a/packages/build/bin/compile-package.js b/packages/build/bin/compile-package.js index e3e34e531d39..36cbc163fc91 100755 --- a/packages/build/bin/compile-package.js +++ b/packages/build/bin/compile-package.js @@ -21,9 +21,9 @@ const debug = require('debug')('loopback:build'); const utils = require('./utils'); const path = require('path'); const fs = require('fs'); -const glob = require('glob'); +const {globSync} = require('glob'); const fse = require('fs-extra'); -const buildOptions = require('typescript').buildOpts; +const {buildOpts: buildOptions} = require('typescript'); function run(argv, options) { if (options === true) { @@ -265,7 +265,7 @@ function copyResources(rootDir, packageDir, tsConfigFile, outDir, options) { (tsConfig.compilerOptions && tsConfig.compilerOptions.rootDir) || ''; const pattern = `@(${dirs})/**/!(*.ts)`; - const files = glob.sync(pattern, {root: packageDir, nodir: true}); + const files = globSync(pattern, {root: packageDir, nodir: true}); for (const file of files) { /** * Trim path that matches tsConfig.compilerOptions.rootDir diff --git a/packages/cli/generators/copyright/fs.js b/packages/cli/generators/copyright/fs.js index 1f53ecdc161f..0ee9246ac12a 100644 --- a/packages/cli/generators/copyright/fs.js +++ b/packages/cli/generators/copyright/fs.js @@ -7,8 +7,7 @@ const fse = require('fs-extra'); const _ = require('lodash'); -const {promisify} = require('util'); -const glob = promisify(require('glob')); +const {glob} = require('glob'); const defaultFS = { write: fse.writeFile, diff --git a/packages/cli/test/integration/generators/clone-example.integration.js b/packages/cli/test/integration/generators/clone-example.integration.js index 2246f85e6570..24066b94d3c6 100644 --- a/packages/cli/test/integration/generators/clone-example.integration.js +++ b/packages/cli/test/integration/generators/clone-example.integration.js @@ -5,16 +5,12 @@ 'use strict'; -const promisify = require('util').promisify; - -const downloadAndExtractExample = require('../../../generators/example/downloader'); -const expect = require('@loopback/testlab').expect; -const fs = require('fs'); -const TestSandbox = require('@loopback/testlab').TestSandbox; -const glob = promisify(require('glob')); +const {expect} = require('@loopback/testlab'); +const fs = require('fs/promises'); +const {TestSandbox} = require('@loopback/testlab'); +const {glob} = require('glob'); const path = require('path'); - -const readFile = promisify(fs.readFile); +const downloadAndExtractExample = require('../../../generators/example/downloader'); const VALID_EXAMPLE = 'todo'; const sandbox = new TestSandbox(path.resolve(__dirname, '../.sandbox')); @@ -49,7 +45,7 @@ describe('cloneExampleFromGitHub (SLOW)', /** @this {Mocha.Suite} */ function () 'src/index.ts', ]); - const packageJson = JSON.parse(await readFile(`${outDir}/package.json`)); + const packageJson = JSON.parse(await fs.readFile(`${outDir}/package.json`)); expect(packageJson).to.have.properties({ name: `@loopback/example-${VALID_EXAMPLE}`, });