Merge branch 'feat/adding-type-module-to-package-json' of https://git…

…hub.com/Refinitiv/refinitiv-ui into feat/adding-type-module-to-package-json
Refinitiv · Oct 18, 2023 · a91c68c · a91c68c
2 parents cf130ef + 6c852d5
commit a91c68c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/packages/theme-compiler/bin/theme-compiler.js b/packages/theme-compiler/bin/theme-compiler.js
@@ -2,15 +2,13 @@
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'node:path';
-import url from 'node:url';
 
 import { getJSON } from '../../../scripts/helpers/index.js';
 import options from '../src/cli-options.js';
 import ThemeParser from '../src/themeParser.js';
 
 try {
-  const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
-  const { version } = await getJSON(path.resolve(__dirname, '../package.json'));
+  const { version } = await getJSON(path.resolve('./package.json'));
 
   const cssOutDir = path.join(options.outdir, 'css');
   const importsOutDir = path.join(options.outdir, 'imports');

diff --git a/packages/theme-compiler/src/helpers.js b/packages/theme-compiler/src/helpers.js
@@ -140,9 +140,7 @@ const generateOutput = (filename, output, variables) => {
 };
 
 const getThemeInfo = () => {
-  const packageJSON = JSON.parse(
-    fs.readFileSync(new URL(path.join(process.cwd(), './package.json'), import.meta.url))
-  );
+  const packageJSON = JSON.parse(fs.readFileSync(new URL(path.resolve('./package.json'), import.meta.url)));
   return {
     name: packageJSON['name'],
     version: packageJSON['version']

diff --git a/scripts/release/api-analyzer.cjs b/scripts/release/api-analyzer.cjs
@@ -239,7 +239,7 @@ const handler = async () => {
       }
 
       // Only write file if API is matched to element tag
-      if (await (isValidAPI(elementAPI, element))) {
+      if (await isValidAPI(elementAPI, element)) {
         success(`Generating API for ${element}`);
 
         // Create output directory path if not exist