sandstone-cli 1.0.2 → 1.0.4

package/lib/build/index.js

@@ -1,6 +1,7 @@
 import path from 'path';
 import * as os from 'os';
 import crypto from 'crypto';
+import { pathToFileURL } from 'url';
 import fs from 'fs-extra';
 import PrettyError from 'pretty-error';
 import walk from 'klaw';
@@ -82,10 +83,10 @@ async function getClientPath() {
  *
  * @param projectFolder The folder of the project. It needs a sandstone.config.ts, and it or one of its parent needs a package.json.
  */
-async function _buildProject(cliOptions, { absProjectFolder, rootFolder, sandstoneConfigFolder }) {
+async function _buildProject(cliOptions, { absProjectFolder, projectFolder, rootFolder, sandstoneConfigFolder }) {
     var _a, _b, _c, _d, _e, _f, _g;
     // First, read sandstone.config.ts to get all properties
-    const sandstoneConfig = (await import(path.join(sandstoneConfigFolder, 'sandstone.config.ts'))).default;
+    const sandstoneConfig = (await import(pathToFileURL(path.join(sandstoneConfigFolder, 'sandstone.config.ts')).toString())).default;
     const { scripts } = sandstoneConfig;
     let { saveOptions } = sandstoneConfig;
     if (saveOptions === undefined)
@@ -167,11 +168,11 @@ async function _buildProject(cliOptions, { absProjectFolder, rootFolder, sandsto
     // Finally, let's import from the index.
     let error = false;
     let sandstonePack;
-    const filePath = path.join(absProjectFolder, 'index.ts');
+    const filePath = path.join(projectFolder, 'index.ts');
     try {
         // Sometimes, a file might not exist because it has been deleted.
         if (await fs.pathExists(filePath)) {
-            sandstonePack = (await import(filePath)).default;
+            sandstonePack = (await import(pathToFileURL(filePath).toString())).default;
         }
     }
     catch (e) {

package/lib/utils.d.ts

@@ -23,6 +23,7 @@ export declare function getWorldPath(worldName: string, minecraftPath?: string |
 export declare function getFileFolder(filename: string, from?: string): string | null;
 export type ProjectFolders = {
     absProjectFolder: string;
+    projectFolder: string;
     rootFolder: string;
     sandstoneConfigFolder: string;
 };

package/lib/utils.js

@@ -104,7 +104,7 @@ export function getProjectFolders(projectFolder) {
         throw new Error(chalk `{red Failed to find {bold sandstone.config.ts} in the "${absProjectFolder}" folder, or in any parent folder.}`);
     }
     return {
-        absProjectFolder, rootFolder, sandstoneConfigFolder
+        absProjectFolder, projectFolder, rootFolder, sandstoneConfigFolder
     };
 }
 export const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandstone-cli",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "The CLI for Sandstone - the minecraft pack creation library.",
   "type": "module",
   "exports": "./lib/index.js",

package/src/build/index.ts

@@ -1,6 +1,7 @@
 import path from 'path'
 import * as os from 'os'
 import crypto from 'crypto'
+import { pathToFileURL } from 'url'
 import fs from 'fs-extra'
 import PrettyError from 'pretty-error'
 import walk from 'klaw'
@@ -131,10 +132,10 @@ async function getClientPath() {
  *
  * @param projectFolder The folder of the project. It needs a sandstone.config.ts, and it or one of its parent needs a package.json.
  */
-async function _buildProject(cliOptions: BuildOptions, { absProjectFolder, rootFolder, sandstoneConfigFolder }: ProjectFolders) {
+async function _buildProject(cliOptions: BuildOptions, { absProjectFolder, projectFolder, rootFolder, sandstoneConfigFolder }: ProjectFolders) {
 
   // First, read sandstone.config.ts to get all properties
-  const sandstoneConfig = (await import(path.join(sandstoneConfigFolder, 'sandstone.config.ts'))).default
+  const sandstoneConfig = (await import(pathToFileURL(path.join(sandstoneConfigFolder, 'sandstone.config.ts')).toString())).default
 
   const { scripts } = sandstoneConfig
 
@@ -236,12 +237,12 @@ async function _buildProject(cliOptions: BuildOptions, { absProjectFolder, rootF
 
   let sandstonePack: any
 
-  const filePath = path.join(absProjectFolder, 'index.ts')
+  const filePath = path.join(projectFolder, 'index.ts')
 
   try {
     // Sometimes, a file might not exist because it has been deleted.
     if (await fs.pathExists(filePath)) {
-      sandstonePack = (await import(filePath)).default
+      sandstonePack = (await import(pathToFileURL(filePath).toString())).default
     }
   }
   catch (e: any) {

package/src/utils.ts

@@ -109,7 +109,7 @@ export function getFileFolder(filename: string, from = '.'): string | null {
   return fileFolder
 }
 
-export type ProjectFolders = { absProjectFolder: string, rootFolder: string, sandstoneConfigFolder: string }
+export type ProjectFolders = { absProjectFolder: string, projectFolder: string, rootFolder: string, sandstoneConfigFolder: string }
 
 export function getProjectFolders(projectFolder: string): ProjectFolders {
   const absProjectFolder = path.resolve(projectFolder)
@@ -128,7 +128,7 @@ export function getProjectFolders(projectFolder: string): ProjectFolders {
   }
 
   return {
-    absProjectFolder, rootFolder, sandstoneConfigFolder
+    absProjectFolder, projectFolder, rootFolder, sandstoneConfigFolder
   }
 }