patch doctor script, and remove some other issues

Stuyk · Oct 12, 2023 · 9dbcc97 · 9dbcc97
1 parent 1c5b8d7
commit 9dbcc97
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/scripts/doctor/files.js b/scripts/doctor/files.js
@@ -1,8 +1,8 @@
-import { glob } from 'glob';
+import { globSync } from '../shared/fileHelpers';
 
 export async function fileChecker() {
  const fileList = await new Promise((resolve) => {
- glob('./{src,src-webviews,resources}/**/*', (err, files) => {
+ globSync('./{src,src-webviews,resources}/**/*', (err, files) => {
  if (err) {
  return resolve(files);
  }

diff --git a/scripts/doctor/index.js b/scripts/doctor/index.js
@@ -1,8 +1,8 @@
 import fs from 'fs';
-import { glob } from 'glob';
 import path from 'path';
 import { fileChecker } from './files.js';
 import { verifyFileNames } from '../fileChecker/index.js';
+import { globSync } from '../shared/fileHelpers.js';
 
 function sanitizePath(p) {
  return p.replace(/\\/g, '/');
@@ -56,7 +56,7 @@ async function cleanup() {
 
  let badFiles = [];
  badFiles = await new Promise((resolve) => {
- glob('./{src,src-webviews}/core/**/*.js', (err, files) => {
+ globSync('./{src,src-webviews}/core/**/*.js', (err, files) => {
  if (err) {
  return resolve(files);
  }
@@ -72,7 +72,7 @@ async function cleanup() {
  }
  }
 
- const badFileTypeDefs = glob.sync('./src/**/*.d.ts', { platform: 'linux' });
+ const badFileTypeDefs = globSync('./src/**/*.d.ts');
  for (const file of badFileTypeDefs) {
  if (fs.existsSync(file)) {
  console.log(`Removed File: ${file}`);

diff --git a/scripts/documentation/index.js b/scripts/documentation/index.js
@@ -1,11 +1,10 @@
 import path from 'path';
 import fs from 'fs';
-import { glob } from 'glob';
-import { writeFile } from '../shared/fileHelpers.js';
+import { globSync, writeFile } from '../shared/fileHelpers.js';
 
 const docsPath = join(process.cwd(), './docs');
 const filesToRemove = ['.nojekyll', 'modules.md', 'README.md'];
-const files = glob.sync(join(docsPath, '/**/*.md'), { platform: 'linux' });
+const files = globSync(join(docsPath, '/**/*.md'));
 
 /**
  *

diff --git a/scripts/plugins/shared.js b/scripts/plugins/shared.js
@@ -39,7 +39,7 @@ export function moveAssetsToWebview(folderName, extensions) {
  }
 
  const fullPath = sanitizePath(path.join(pluginFolder, `${folderName}/**/*.+(${extensions.join('|')})`));
- const allFiles = globSync(fullPath, { platform: 'linux' });
+ const allFiles = globSync(fullPath);
 
  for (let i = 0; i < allFiles.length; i++) {
  const filePath = allFiles[i];

diff --git a/scripts/runtime/index.js b/scripts/runtime/index.js
@@ -176,7 +176,7 @@ async function refreshFileWatching() {
  }
 
  // grab all new files
- const files = globSync('./src/**/*.ts', { platform: 'linux' });
+ const files = globSync('./src/**/*.ts');
 
  // ignore `/athena/server` && `/athena/client` directories
  previousGlobFiles = files.filter((fileName) => {