Skip to content

Commit

Permalink
Merge pull request #12 from JuliaPluto/dev
Browse files Browse the repository at this point in the history
Many new features and bug fixes!
  • Loading branch information
Illusion47586 committed Aug 5, 2022
2 parents de93506 + 804ac64 commit e456523
Show file tree
Hide file tree
Showing 24 changed files with 1,687 additions and 1,007 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Expand Up @@ -6,6 +6,7 @@ module.exports = {
'import/no-unresolved': 'error',
// Since React 17 and typescript 4.1 you can safely disable the rule
'react/react-in-jsx-scope': 'off',
'no-underscore-dangle': 'off',
semi: ['error', 'always'],
},
parserOptions: {
Expand Down
10 changes: 9 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Expand Up @@ -73,7 +73,15 @@ body:
id: config
attributes:
label: Relevant output from C:\Users\{USER_NAME}\AppData\Roaming\pluto\config.json
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. If no file created, please type NA.
description: This will be automatically formatted into code, so no need for backticks. If no file created, please type NA.
render: json
validations:
required: true
- type: textarea
id: userConfig
attributes:
label: Relevant output from C:\Users\{USER_NAME}\AppData\Roaming\pluto\userConfig.json
description: This will be automatically formatted into code, so no need for backticks. If no file created, please type NA.
render: json
validations:
required: true
16 changes: 0 additions & 16 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Expand Up @@ -40,19 +40,3 @@ body:
- 0.0.1-alpha
validations:
required: true
- type: textarea
id: logs
attributes:
label: Relevant log output from C:\Users\{USER_NAME}\AppData\Roaming\pluto\logs\main.log
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
validations:
required: false
- type: textarea
id: config
attributes:
label: Relevant output from C:\Users\{USER_NAME}\AppData\Roaming\pluto\config.json
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. If no file created, please type NA.
render: json
validations:
required: false
5 changes: 3 additions & 2 deletions .gitignore
Expand Up @@ -15,8 +15,6 @@ coverage
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules

package-lock.json

# OSX
.DS_Store

Expand All @@ -34,6 +32,9 @@ npm-debug.log.*
*.toml
project
assets/julia*
assets/pluto-sysimage.so
assets/pluto_precompile.jl

# ENV
.env.local
temp.txt
6 changes: 4 additions & 2 deletions assets/pluto_no_update.jl
@@ -1,8 +1,10 @@
import Logging, Pkg;
import Logging, Pkg, Base;

Logging.global_logger(Logging.ConsoleLogger(stdout));

using Pluto;
Pkg.activate(Base.active_project());

import Pluto;

if isempty(ARGS)
Pluto.run(; launch_browser=false)
Expand Down
8 changes: 8 additions & 0 deletions assets/precompile.jl
@@ -0,0 +1,8 @@
import Pkg;

Pkg.add("PackageCompiler")

using PackageCompiler;

PackageCompiler.create_sysimage(["Pluto"]; sysimage_path=ARGS[1],
precompile_statements_file=ARGS[2])
6 changes: 5 additions & 1 deletion assets/script.jl
@@ -1,7 +1,9 @@
import Logging, Pkg;
import Logging, Pkg, Base;

Logging.global_logger(Logging.ConsoleLogger(stdout));

Pkg.activate(Base.active_project());

# if haskey(Pkg.dependencies(), "Pluto")
# Pkg.update("Pluto")
# else
Expand All @@ -14,6 +16,8 @@ else
Pkg.add(url="https://github.com/Illusion47586/Pluto.jl", rev="desktop-support")
end

Pkg.resolve();

using Pluto;

if isempty(ARGS)
Expand Down

0 comments on commit e456523

Please sign in to comment.