Skip to content

Commit

Permalink
fixes processing#785, update node, and everything else that comes alo…
Browse files Browse the repository at this point in the history
…ng with that (processing#810)
  • Loading branch information
catarak authored Jan 16, 2019
1 parent bc863f2 commit 7bd016b
Show file tree
Hide file tree
Showing 13 changed files with 10,645 additions and 23,892 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sudo: required
language: node_js
node_js:
- "8.11.1"
- "10.15.0"

cache:
directories:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:8.11.1 as base
FROM node:10.15.0 as base
ENV APP_HOME=/usr/src/app \
TERM=xterm
RUN mkdir -p $APP_HOME
Expand Down
4 changes: 1 addition & 3 deletions client/components/Nav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import InlineSVG from 'react-inlinesvg';
import classNames from 'classnames';
import * as IDEActions from '../modules/IDE/actions/ide';

import {
metaKeyName,
} from '../utils/metaKey';
import { metaKeyName, } from '../utils/metaKey';

const triangleUrl = require('../images/down-filled-triangle.svg');
const logoUrl = require('../images/p5js-logo-small.svg');
Expand Down
6 changes: 4 additions & 2 deletions client/modules/IDE/actions/project.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ import each from 'async/each';
import { isEqual, pick } from 'lodash';
import * as ActionTypes from '../../../constants';
import { showToast, setToastText } from './toast';
import { setUnsavedChanges,
import {
setUnsavedChanges,
justOpenedProject,
resetJustOpenedProject,
showErrorModal } from './ide';
showErrorModal
} from './ide';
import { clearState, saveState } from '../../../persistState';

const __process = (typeof global !== 'undefined' ? global : window).process;
Expand Down
1 change: 1 addition & 0 deletions client/modules/IDE/components/CopyableInput.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class CopyableInput extends React.Component {
{hasPreviewLink &&
<a
target="_blank"
rel="noopener noreferrer"
href={value}
className="copyable-input__preview"
title={`open ${label.toLowerCase()} view in new tab`}
Expand Down
4 changes: 1 addition & 3 deletions client/modules/IDE/components/Editor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ import '../../../utils/p5-javascript';
import '../../../utils/webGL-clike';
import Timer from '../components/Timer';
import EditorAccessibility from '../components/EditorAccessibility';
import {
metaKey,
} from '../../../utils/metaKey';
import { metaKey, } from '../../../utils/metaKey';

import search from '../../../utils/codemirror-search';

Expand Down
4 changes: 1 addition & 3 deletions client/modules/IDE/components/KeyboardShortcutModal.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import React from 'react';
import {
metaKeyName,
} from '../../../utils/metaKey';
import { metaKeyName, } from '../../../utils/metaKey';

function KeyboardShortcutModal() {
return (
Expand Down
4 changes: 1 addition & 3 deletions client/utils/consoleUtils.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import {
EXTERNAL_LINK_REGEX
} from '../../server/utils/fileUtils';
import { EXTERNAL_LINK_REGEX } from '../../server/utils/fileUtils';

export const hijackConsoleErrorsScript = (offs) => {
const s = `
Expand Down
Loading

0 comments on commit 7bd016b

Please sign in to comment.