Fix packaging & development for diagram client

uqbar-project · Nov 11, 2023 · 92f9527 · 92f9527
1 parent 1867a92
commit 92f9527
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 25 deletions.
diff --git a/package.json b/package.json
@@ -25,15 +25,15 @@
     "wollok": "./build/src/index.js"
   },
   "pkg": {
-    "scripts": "build/src/**/*.js",
+    "scripts": "build/**/*.js",
     "targets": [
       "node18-linux-x64",
       "node18-macos-x64",
       "node18-macos-arm64",
       "node18-win-x64"
     ],
     "assets": [
-      "public/**/*"
+      "./build/public/**/*"
     ],
     "outputPath": "dist"
   },

diff --git a/src/commands/repl.ts b/src/commands/repl.ts
@@ -245,8 +245,6 @@ export async function initializeClient(options: Options, repl: Interface, interp
     socket.emit('updateDiagram', getDataDiagram(interpreter))
   })
 
-  console.info('PATTTTTTTTTTHHHHHHHHHHH', publicPath('diagram'), options.port)
-
   app.use(
     cors({ allowedHeaders: '*' }),
     express.static(publicPath('diagram'), { maxAge: '1d' }),

diff --git a/src/utils.ts b/src/utils.ts
@@ -103,25 +103,8 @@ export const problemDescription = (problem: Problem): string => {
 // RESOURCES
 // ══════════════════════════════════════════════════════════════════════════════════════════════════════════════════
 
-
-// NONONONONONO
-
-
-// HAY QUE VER ESTO...
-
-
-
-export const publicPath = (...paths: string[]): string => {
-  console.info('donde estoy', path.join(__dirname))
-  return path.join(__dirname, '..', 'public', ...paths)
-}
-
-// no va el '..' extra... hay que corregir el build
-
-
-
-
-
+export const publicPath = (...paths: string[]): string =>
+  path.join(__dirname, '..', 'public', ...paths)
 
 export const readPackageProperties = (pathProject: string): any | undefined => {
   const packagePath = path.join(pathProject, 'package.json')

diff --git a/test/diagram.test.ts b/test/diagram.test.ts
@@ -8,7 +8,6 @@ import { diagramAssertions } from './assertions'
 use(diagramAssertions)
 should()
 
-
 const projectPath = join('examples', 'diagram-examples')
 const simpleFile = join(projectPath, 'fish.wlk')
 const fileWithImports = join(projectPath, 'using-imports', 'base.wlk')

diff --git a/test/dynamicDiagramClient.test.ts b/test/dynamicDiagramClient.test.ts
@@ -37,7 +37,6 @@ describe('dynamic diagram client', () => {
     const { enabled, app } = await initializeClient(options, repl, interpreter)
     expect(enabled).to.be.true
     const result = await chai.request(app).get('/index.html')
-    console.info('result', result)
     expect(result).to.have.status(200)
   })