pinokiod 3.3.5 → 3.3.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/kernel/bin/index.js +4 -2
  2. package/kernel/bin/playwright.js +41 -38
  3. package/kernel/index.js +2 -6
  4. package/package.json +1 -1
package/kernel/bin/index.js CHANGED
@@ -165,8 +165,10 @@ class Bin {
165
165
  if (this.kernel.homedir) {
166
166
  const bin_folder = this.path()
167
167
  await fs.promises.mkdir(bin_folder, { recursive: true }).catch((e) => { })
168
- const playwright_folder = path.resolve(bin_folder, "playwright/browsers")
169
- process.env.PLAYWRIGHT_BROWSERS_PATH = playwright_folder
168
+ if (this.platform !== "linux") {
169
+ const playwright_folder = path.resolve(bin_folder, "playwright/browsers")
170
+ process.env.PLAYWRIGHT_BROWSERS_PATH = playwright_folder
171
+ }
170
172
  // await fs.promises.mkdir(playwright_folder, { recursive: true }).catch((e) => { })
171
173
  }
172
174
  // ORDERING MATTERS.
package/kernel/bin/playwright.js CHANGED
@@ -6,14 +6,13 @@ class Playwright {
6
6
  let p = this.kernel.path("bin/playwright")
7
7
  await rimraf(p)
8
8
  await fs.promises.mkdir(p, { recursive: true }).catch((e) => { })
9
- let cmd
10
- let pwpath
9
+
11
10
  if (this.kernel.platform === "linux") {
12
- pwpath = this.kernel.bin.path("playwright/node_modules/playwright")
13
- cmd = {
11
+ await this.kernel.bin.exec({
14
12
  message: [
15
- "npm init -y",
16
- "npm install playwright@latest",
13
+ //"npm init -y",
14
+ //"npm install playwright@latest"
15
+ "npm init -y playwright@latest -- --quiet",
17
16
  //"npm install npm corepack playwright@1.49.1 --loglevel verbose",
18
17
  //"npm install playwright --loglevel verbose",
19
18
  //"playwright install firefox",
@@ -27,12 +26,18 @@ class Playwright {
27
26
  env: {
28
27
  PLAYWRIGHT_BROWSERS_PATH: this.kernel.bin.path("playwright/browsers")
29
28
  }
30
- }
29
+ }, ondata)
30
+ console.log("INSTALL FINISHED")
31
+ //let pwpath = this.kernel.bin.path("playwright/js/node_modules/playwright")
32
+ let pwpath = this.kernel.bin.path("playwright/node_modules/playwright")
33
+ this.kernel.playwright = (await this.kernel.loader.load(pwpath)).resolved
31
34
  } else {
32
- pwpath = this.kernel.bin.path("playwright/js/node_modules/playwright")
33
- cmd = {
35
+ await this.kernel.bin.exec({
34
36
  message: [
35
- "npm init -y playwright@latest -- --lang js --quiet --install-deps",
37
+ //"npm init -y",
38
+ //"npm install playwright@latest --quiet --install-deps"
39
+ //"npm init -y playwright@latest -- --lang js --quiet --install-deps",
40
+ "npm init -y playwright@latest -- --quiet --install-deps",
36
41
  //"npm install npm corepack playwright@1.49.1 --loglevel verbose",
37
42
  //"npm install playwright --loglevel verbose",
38
43
  //"playwright install firefox",
@@ -46,37 +51,35 @@ class Playwright {
46
51
  env: {
47
52
  PLAYWRIGHT_BROWSERS_PATH: this.kernel.bin.path("playwright/browsers")
48
53
  }
49
- }
54
+ }, ondata)
55
+ console.log("INSTALL FINISHED")
56
+ //let pwpath = this.kernel.bin.path("playwright/js/node_modules/playwright")
57
+ let pwpath = this.kernel.bin.path("playwright/node_modules/playwright")
58
+ this.kernel.playwright = (await this.kernel.loader.load(pwpath)).resolved
50
59
  }
51
- await this.kernel.bin.exec(cmd, ondata)
52
- console.log("INSTALL FINISHED")
53
- this.kernel.playwright = (await this.kernel.loader.load(pwpath)).resolved
54
60
  }
55
61
  async installed() {
56
- //let browsers = this.kernel.path("bin/playwright/browsers")
57
- //let e1 = await this.kernel.bin.exists(browsers)
58
- //let node_modules = this.kernel.path("bin/playwright/js/node_modules/playwright")
59
- //let e2 = await this.kernel.bin.exists(node_modules)
60
- //console.log({ e1, e2 })
61
- //return e1 && e2
62
- if (this.kernel.platform === "linux") {
63
- //let pwpath = this.kernel.path("bin/playwright")
64
- //let e1 = await this.kernel.bin.exists(pwpath)
65
- //return e1
66
- let browsers = this.kernel.path("bin/playwright/browsers")
67
- let e1 = await this.kernel.bin.exists(browsers)
68
- let node_modules = this.kernel.path("bin/playwright/node_modules/playwright")
69
- let e2 = await this.kernel.bin.exists(node_modules)
70
- console.log({ e1, e2 })
71
- return e1 && e2
72
- } else {
73
- let browsers = this.kernel.path("bin/playwright/browsers")
74
- let e1 = await this.kernel.bin.exists(browsers)
75
- let node_modules = this.kernel.path("bin/playwright/js/node_modules/playwright")
76
- let e2 = await this.kernel.bin.exists(node_modules)
77
- console.log({ e1, e2 })
78
- return e1 && e2
79
- }
62
+ let browsers = this.kernel.path("bin/playwright/browsers")
63
+ let node_modules = this.kernel.path("bin/playwright/node_modules/playwright")
64
+ let e1 = await this.kernel.bin.exists(browsers)
65
+ let e2 = await this.kernel.bin.exists(node_modules)
66
+ console.log({ e1, e2 })
67
+ return e1 && e2
68
+ //if (this.kernel.platform === "linux") {
69
+ // let browsers = this.kernel.path("bin/playwright/browsers")
70
+ // let node_modules = this.kernel.path("bin/playwright/node_modules/playwright")
71
+ // let e1 = await this.kernel.bin.exists(browsers)
72
+ // let e2 = await this.kernel.bin.exists(node_modules)
73
+ // console.log({ e1, e2 })
74
+ // return e1 && e2
75
+ //} else {
76
+ // let browsers = this.kernel.path("bin/playwright/browsers")
77
+ // let node_modules = this.kernel.path("bin/playwright/js/node_modules/playwright")
78
+ // let e1 = await this.kernel.bin.exists(browsers)
79
+ // let e2 = await this.kernel.bin.exists(node_modules)
80
+ // console.log({ e1, e2 })
81
+ // return e1 && e2
82
+ //}
80
83
  }
81
84
  async uninstall(req, ondata) {
82
85
  ondata({ raw: "cleaning up\r\n" })
package/kernel/index.js CHANGED
@@ -610,12 +610,8 @@ class Kernel {
610
610
  //await this.shell.init()
611
611
  }
612
612
 
613
- let pwpath
614
- if (this.platform === "linux") {
615
- pwpath = this.bin.path("playwright/node_modules/playwright")
616
- } else {
617
- pwpath = this.bin.path("playwright/js/node_modules/playwright")
618
- }
613
+ //let pwpath = this.bin.path("playwright/js/node_modules/playwright")
614
+ let pwpath = this.bin.path("playwright/node_modules/playwright")
619
615
  this.playwright = (await this.loader.load(pwpath)).resolved
620
616
 
621
617
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pinokiod",
3
- "version": "3.3.5",
3
+ "version": "3.3.7",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {