Skip to content

Commit bc850d3

Browse files
maribethbmaribethb
authored
chore: remove legacy lerna packagement from examples (#2662)
* chore: remove legacy lerna package management * chore: update all examples to use shared blockly libs * chore: fix lint and ignore generated
1 parent c8d0bd3 commit bc850d3

74 files changed

Lines changed: 26088 additions & 27814 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/update_gh_pages.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,8 @@ jobs:
3232

3333
- name: NPM install
3434
# Use CI so that we don't update dependencies in this step.
35-
# TODO(#1511): remove --force flag from installing examples
36-
# Until then, don't block updating just because some dependencies are out of date.
3735
run: |
3836
npm ci
39-
(cd examples && npm ci --force)
4037
4138
- name: Deploy to GH Pages
4239
env:

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ build/
1515
gh-pages/index.html
1616
gh-pages/plugins
1717
gh-pages/examples
18+
# Generated shared Blockly assets copied by "prepare-examples"
19+
examples/lib/
1820
.DS_Store
1921

2022
# TypeScript cache

‎.prettierignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ gh-pages/*
1212
**/build/*
1313
examples/blockly-svelte/public/bundle.js
1414
examples/blockly-angular/.angular
15+
examples/lib/*
1516
**/node_modules/*
1617
**/package-lock.json
1718
**/CHANGELOG.md

‎eslint.config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ module.exports = [
3838
'examples/theme-extension-codelab',
3939
'examples/turtle-field-demo',
4040
'examples/validation-and-warnings-codelab',
41+
'examples/lib/',
4142
'**/dist/',
4243
'**/build/',
4344
'examples/blockly-svelte/public/bundle.js',

‎examples/backpack-demo/index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<head>
44
<meta charset="utf-8" />
55
<title>Blockly Demo: Backpack</title>
6-
<script src="./node_modules/blockly/blockly_compressed.js"></script>
7-
<script src="./node_modules/blockly/blocks_compressed.js"></script>
8-
<script src="./node_modules/blockly/msg/en.js"></script>
9-
<script src="./node_modules/@blockly/workspace-backpack/dist/index.js"></script>
6+
<script src="../lib/blockly/blockly_compressed.js"></script>
7+
<script src="../lib/blockly/blocks_compressed.js"></script>
8+
<script src="../lib/blockly/msg/en.js"></script>
9+
<script src="../lib/@blockly/workspace-backpack/dist/index.js"></script>
1010
<script src="./notification_backpack.js"></script>
1111
<script src="./index.js"></script>
1212
<style>

‎examples/backpack-demo/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,13 @@ const toolbox = {
188188
function init() {
189189
// Inject primary workspace.
190190
const primaryWorkspace = Blockly.inject('primaryDiv', {
191-
media: './node_modules/blockly/media/',
191+
media: '../lib/blockly/media/',
192192
toolbox: toolbox,
193193
trashcan: true,
194194
});
195195
// Inject secondary workspace.
196196
const secondaryWorkspace = Blockly.inject('secondaryDiv', {
197-
media: './node_modules/blockly/media/',
197+
media: '../lib/blockly/media/',
198198
toolbox: toolbox,
199199
trashcan: true,
200200
});

‎examples/backpack-demo/package-lock.json‎

Lines changed: 4 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/backpack-demo/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"index.html",
1010
"index.js",
1111
"notification_backpack.js",
12-
"./node_modules/blockly/*_compressed.js",
13-
"./node_modules/blockly/*_compressed.js.map",
14-
"./node_modules/blockly/msg/en.js",
15-
"./node_modules/blockly/media/*",
16-
"./node_modules/@blockly/workspace-backpack/dist/index.js"
12+
"../lib/blockly/*_compressed.js",
13+
"../lib/blockly/*_compressed.js.map",
14+
"../lib/blockly/msg/en.js",
15+
"../lib/blockly/media/*",
16+
"../lib/@blockly/workspace-backpack/dist/index.js"
1717
]
1818
},
1919
"dependencies": {

‎examples/blockly-rtc/package-lock.json‎

Lines changed: 16 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/blockly-rtc/webpack.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ module.exports = {
4848
// Copy over media resources from the Blockly package
4949
new CopyPlugin([
5050
{
51-
from: path.resolve(__dirname, './node_modules/blockly/media'),
51+
from: path.resolve(__dirname, '../lib/blockly/media'),
5252
to: path.resolve(__dirname, 'build/media'),
5353
},
5454
]),

0 commit comments

Comments
 (0)