Skip to content

Commit

Permalink
removing blockly (#262)
Browse files Browse the repository at this point in the history
* removing blockly

* removing azure iot, blocks

* fix paths

* more removals

* updated yarn.lock

* refresh build script

* remove vega

* removed vega

* typo
  • Loading branch information
pelikhan authored Apr 6, 2023
1 parent 23a9295 commit b480251
Show file tree
Hide file tree
Showing 120 changed files with 105 additions and 13,639 deletions.
61 changes: 31 additions & 30 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
name: Build
on:
push:
workflow_dispatch:
push:
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- uses: bahmutov/npm-install@v1
- run: yarn builddocsts
- run: yarn distdocs
env:
GATSBY_GITHUB_REPOSITORY: ${{ github.repository }}
GATSBY_GITHUB_REF: ${{ github.ref }}
GATSBY_GITHUB_SHA: ${{ github.sha }}
NODE_OPTIONS: --max-old-space-size=4096
- name: github pages
uses: peaceiris/actions-gh-pages@v3
if: ${{ github.ref == 'refs/heads/main' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./public
force_orphan: true
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: "yarn"
- run: yarn install --frozen-lockfile
- run: yarn builddocsts
- run: yarn distdocs
env:
GATSBY_GITHUB_REPOSITORY: ${{ github.repository }}
GATSBY_GITHUB_REF: ${{ github.ref }}
GATSBY_GITHUB_SHA: ${{ github.sha }}
NODE_OPTIONS: --max-old-space-size=4096
- name: github pages
uses: peaceiris/actions-gh-pages@v3
if: ${{ github.ref == 'refs/heads/main' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./public
force_orphan: true
1 change: 0 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
},
"cSpell.words": [
"Blinky",
"blockly",
"bootloader",
"bytecode",
"clsx",
Expand Down
2 changes: 1 addition & 1 deletion jacdac-ts
14 changes: 1 addition & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
"author": "Microsoft",
"dependencies": {
"@axe-core/react": "^4.6.0",
"@blockly/block-dynamic-connection": "^0.1.14",
"@blockly/continuous-toolbox": "^1.0.18",
"@blockly/disable-top-blocks": "^0.1.20",
"@blockly/field-slider": "^2.1.30",
"@blockly/theme-dark": "^2.0.6",
"@blockly/theme-modern": "^2.1.24",
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@gatsby-contrib/gatsby-plugin-elasticlunr-search": "^3.0.2",
Expand Down Expand Up @@ -40,7 +34,6 @@
"@typescript-eslint/parser": "^5.52.0",
"accessible-nprogress": "^2.1.2",
"assert": "^2.0.0",
"blockly": "^6.20210701.0",
"bowser": "^2.11.0",
"compare-versions": "^5.0.3",
"concurrently": "^7.4.0",
Expand Down Expand Up @@ -95,7 +88,6 @@
"puppeteer": "^19.7.0",
"qrcode": "^1.5.1",
"react": "^18.2.0",
"react-blockly": "^7.0.1",
"react-color": "^2.19.3",
"react-dom": "^18.2.0",
"react-draggable": "^4.4.5",
Expand All @@ -106,7 +98,6 @@
"react-piano": "^3.1.3",
"react-player": "^2.11.2",
"react-simple-keyboard": "^3.5.26",
"react-vega": "^7.6.0",
"react-virtualized-auto-sizer": "^1.0.7",
"react-window": "^1.8.8",
"regenerator-runtime": "^0.13.11",
Expand All @@ -120,8 +111,6 @@
"use-editable": "^2.3.3",
"use-sync-external-store": "^1.2.0",
"util": "^0.12.5",
"vega": "^5.22.1",
"vega-lite": "^5.6.1",
"ws": "^8.12.1",
"xmlhttprequest-ssl": "^2.1.0"
},
Expand All @@ -141,8 +130,7 @@
"pullsubmodules": "git submodule update --init --recursive",
"lint": "node node_modules/eslint/bin/eslint.js src/**/*.ts src/**/*.tsx",
"clean": "node node_modules/gatsby/cli.js clean",
"blocklymedia": "mkdir -p static/blockly && cp -r -f node_modules/blockly/media static/blockly",
"predistdocs": "yarn clean && yarn blocklymedia && cd jacdac-ts/tools && node ./prepare.js",
"predistdocs": "yarn clean && cd jacdac-ts/tools && node ./prepare.js",
"distdocs": "node ./node_modules/gatsby/cli.js build --prefix-paths --no-uglify --verbose",
"tools": "npx http-server . -c-1",
"watchdocs": "node node_modules/gatsby/cli.js develop",
Expand Down
2 changes: 1 addition & 1 deletion pxt-jacdac
Submodule pxt-jacdac updated 103 files
14 changes: 0 additions & 14 deletions src/components/HostedSimulatorsContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,27 +111,13 @@ export function hostedSimulatorDefinitions(): HostedSimulatorDefinition[] {
height: "17.5rem",
requiresDeviceScript: true,
},
{
id: "azureiotuploader",
name: "Azure IoT Uploader",
url: "https://microsoft.github.io/pxt-jacdac/",
width: "20rem",
height: "12rem",
},
Flags.diagnostics && {
id: "arcademultitool",
name: "MakeCode Arcade multitool",
url: "https://microsoft.github.io/pxt-jacdac/?tool=multitool",
width: "25vw",
height: "28.75vw",
},
UIFlags.localhost && {
id: "azureiotuploaderlocal",
name: "Azure IoT Uploader (localhost)",
url: "http://localhost:3232/index.html",
width: "20rem",
height: "12rem",
},
UIFlags.localhost && {
id: "makecodeserve",
name: "makecode serve (localhost)",
Expand Down
Loading

0 comments on commit b480251

Please sign in to comment.