Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '8'
node-version: '24'

- name: Install dependencies
run: npm install
Expand Down
2 changes: 1 addition & 1 deletion app/components/dialog/RunConfigDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div>
<fieldset style="margin-bottom: 1em">
<legend>Zone</legend>
<label v-for="color in zones" :key="n">
<label v-for="color in zones">
<input type="radio" :value="color" v-model="zone" />
{{ color }}
</label>
Expand Down
3 changes: 2 additions & 1 deletion app/components/editor/blockly/Blockly.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import {
MUTATION_UPDATE_PROJECT,
Project,
} from "../../../store";
const Blockly = require("node-blockly/browser");
const Blockly = require("blockly/browser");
import "blockly/python";
import loadBlocks from "./blocks";
import loadCustomBlocks from "./block-loader";
import toolbox from "./toolbox.xml";
Expand Down
2 changes: 1 addition & 1 deletion app/components/editor/monaco/json/language.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
schemas: [
{
uri: "http://robot.go/blocks-schema.json",
fileMatch: ["*.py"],
fileMatch: ["*.json"],
schema: schema,
},
],
Expand Down
1 change: 1 addition & 0 deletions app/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import PictureDialog from "./components/dialog/PictureDialog.vue";
import RunConfigDialog from "./components/dialog/RunConfigDialog.vue";
// @ts-ignore
import Prism from "vue-prism-component";
import "prismjs/components/prism-python";
// @ts-ignore
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";

Expand Down
18 changes: 0 additions & 18 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 1 addition & 7 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,31 +1,25 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs_1803 = {
url = "github:NixOS/nixpkgs/release-18.03";
flake = false;
};
utils.url = "github:numtide/flake-utils";
};

outputs =
{
self,
nixpkgs,
nixpkgs_1803,
utils,
}:
utils.lib.eachDefaultSystem (
system:
let
pkgs = import nixpkgs { inherit system; };
pkgs_1803 = import nixpkgs_1803 { inherit system; };
in
{
devShell = pkgs.mkShell {
nativeBuildInputs = with pkgs; [
prettier
pkgs_1803.nodejs-8_x
nodejs_24
];
};
}
Expand Down
Loading
Loading