Skip to content

Commit

Permalink
Merge pull request #255 from pylonide/development
Browse files Browse the repository at this point in the history
v2.8.0 Release
  • Loading branch information
exsilium authored Mar 13, 2022
2 parents 1fe4b83 + b1118d3 commit 33b5924
Show file tree
Hide file tree
Showing 10 changed files with 321 additions and 199 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x, 13.x, 14.x, 15.x, 16.x]
node-version: [12.x, 13.x, 14.x, 15.x, 16.x, 17.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
Expand Down
6 changes: 6 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
v2.8.0
======
* Remediates security vulnerabilities reported in 3rd party packages.
* Notable upgrades to: passport, engine.io, xterm, yargs, jsdav, vfs, ace, xmldom
* iOS: Preferences page is not scrollable #41

v2.7.0
======
* Cutting the support for Node.js v10 #192
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[![Build Status](https://travis-ci.org/pylonide/pylon.svg?branch=master)](https://travis-ci.org/pylonide/pylon)
[![Build Status](https://travis-ci.com/pylonide/pylon.svg?branch=master)](https://travis-ci.com/pylonide/pylon)
[![Master Dependency Status](https://snyk.io/test/github/pylonide/pylon/badge.svg)](https://snyk.io/test/github/pylonide/pylon)
[![Development Dependency Status](https://snyk.io/test/github/pylonide/pylon/development/badge.svg)](https://snyk.io/test/github/pylonide/pylon/development)
[![Bitcoin donate button](https://img.shields.io/badge/bitcoin-donate-yellow.svg)](https://commerce.coinbase.com/checkout/5f3b0455-32ba-4b85-b299-00fe739d8b10 "One-time donation to keep this project alive")
[![€ donate button](https://img.shields.io/badge/€-donate-brightgreen.svg)](http://warp.pylon.id "One-time donation to keep this project alive, choose the amount at checkout")

# Pylon IDE

Expand Down
460 changes: 287 additions & 173 deletions package-lock.json

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pln",
"description": "Pylon IDE",
"version": "2.7.0",
"version": "2.8.0",
"license": "GPL-3.0",
"homepage": "https://github.com/pylonide/pylon",
"engines": {
Expand Down Expand Up @@ -29,36 +29,36 @@
"urlrouter": "~0.5.4",
"qs": "~6.10.1",
"parseurl": "~1.3.2",
"passport": "~0.4.0",
"passport": "~0.5.0",
"passport-http": "~0.3.0",
"passport-local": "~1.0.0",
"msgpack-js-browser": "~0.1.4",
"engine.io": "~5.2.1",
"engine.io-client": "~5.1.1",
"engine.io": "~6.1.0",
"engine.io-client": "~6.1.0",
"amd-loader": "~0.0.8",
"http-error": "~0.0.6",
"simple-template": "~0.0.1",
"netutil": "~0.0.2",
"architect": "~0.1.13",
"node-pty": "0.10.1",
"xterm": "~4.13.0",
"xterm": "~4.18.0",
"xterm-addon-fit": "~0.5.0",
"vary": "^1.1.2",
"asyncjs": "~0.0.13",
"yargs": "~17.0.1",
"yargs": "~17.3.1",
"@pylonide/architect-build": "~0.1.3",
"@pylonide/dryice": "^0.5.2",
"@pylonide/jsdav": "~0.4.2",
"@pylonide/jsdav": "~0.6.0",
"@pylonide/smith": "~0.1.24",
"@pylonide/treehugger": "~0.1.0",
"@pylonide/v8debug": "~0.1.3",
"@pylonide/vfs-architect": "~0.2.0",
"@pylonide/vfs-nodefs-adapter": "~0.4.0",
"ace": "https://github.com/ajaxorg/ace/tarball/v1.4.12"
"@pylonide/vfs-architect": "~0.4.0",
"@pylonide/vfs-nodefs-adapter": "~0.5.0",
"ace": "https://github.com/ajaxorg/ace/tarball/v1.4.14"
},
"devDependencies": {
"rimraf": "~3.0.0",
"xmldom": "~0.6.0",
"@xmldom/xmldom": "~0.8.0",
"xpath": "~0.0.27"
},
"repository": {
Expand Down
5 changes: 2 additions & 3 deletions plugins-client/ext.settings/skin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
<a:bar name="bar-preferences">
<a:style><![CDATA[
.bar-preferences {
position : relative;
overflow-y : hidden;
overflow-x : hidden;
position : absolute;
overflow : auto;
color : #202020;
font-family : Tahoma, Arial;
font-size : 12px;
Expand Down
12 changes: 8 additions & 4 deletions plugins-client/ext.terminal/tty.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ define(function(require) {
* Open
*/

var ENGINE_IO = require("engine.io");
var ENGINE_IO_Socket = require("engine.io");

tty.open = function () {
if (document.location.pathname) {
Expand All @@ -81,9 +81,9 @@ define(function(require) {
server = 'ws://';

server = server + window.location.href.split("\/")[2];
tty.socket = new ENGINE_IO.Socket(server, {resource: resource});
tty.socket = new ENGINE_IO_Socket(server, {resource: resource});
} else {
tty.socket = new ENGINE_IO.Socket();
tty.socket = new ENGINE_IO_Socket();
}

tty.windows = [];
Expand Down Expand Up @@ -481,7 +481,9 @@ define(function(require) {

self.resize(x, y);

el.style.width = '';
// Starting with xterm.js v4.14.1 the viewport overflows with scroll-bar unless we correct the window size accordingly
el.style.width = el.getElementsByClassName('xterm-viewport')[0].clientWidth + 'px';

el.style.height = '';

el.style.overflow = '';
Expand Down Expand Up @@ -662,6 +664,8 @@ define(function(require) {
this.hookMouse();

win.tabs.push(this);
// Starting with xterm.js v4.14.1 the viewport overflows with scroll-bar part unless we correct the window size during creation
win.element.style.width = win.element.getElementsByClassName('xterm-viewport')[0].clientWidth + 15 + 'px';

if (!resume) {
this.socket.send(JSON.stringify({cmd: 'create', cols: cols, rows: rows}));
Expand Down
4 changes: 1 addition & 3 deletions plugins-client/ext.tree/tree.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,7 @@ module.exports = ext.register("ext/tree/tree", {
var _self = this;
trFiles.setAttribute("model", this.model);

if(ppc.isIphone) {
trFiles.$ext.style.overflow = "auto";
}
trFiles.$ext.style.overflow = "auto";

if (this.loadedSettings === 1) {
if (ide.inited) {
Expand Down
4 changes: 2 additions & 2 deletions plugins-server/pylon.smith.io/www/client.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

define(function(require, exports, module) {

var ENGINE_IO = require("engine.io");
var ENGINE_IO_Socket = require("engine.io");
var SMITH = require("smith");
var EVENTS = require("smith/events-amd");

Expand Down Expand Up @@ -141,7 +141,7 @@ define(function(require, exports, module) {
}, delay);
}

_self.socket = new ENGINE_IO.Socket(_self.options);
_self.socket = new ENGINE_IO_Socket(_self.options);

_self.socket.on("error", function (err) {
if (_self.debug) {
Expand Down
2 changes: 1 addition & 1 deletion ppc/ppc-package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// used by ppc-node below
XPath = require('xpath');
DOMParser = require('xmldom').DOMParser;
DOMParser = require('@xmldom/xmldom').DOMParser;

var Fs = require("fs");

Expand Down

0 comments on commit 33b5924

Please sign in to comment.