Skip to content

Commit def424d

Browse files
danhalsondanhalson
committed
Add postcss to ensure sass compiled correctly, remove unused function
1 parent c69f141 commit def424d

File tree

6 files changed

+15
-135
lines changed

6 files changed

+15
-135
lines changed

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@
175175
"postcss-normalize": "8.0.1",
176176
"postcss-preset-env": "6.7.0",
177177
"postcss-safe-parser": "5.0.2",
178+
"postcss-scss": "4.0.9",
178179
"postcss-simple-vars": "5.0.2",
179180
"prettier": "^2.8.8",
180181
"react-dev-utils": "^11.0.3",

‎src/assets/stylesheets/ExternalStyles.scss‎

Lines changed: 0 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -5,94 +5,3 @@
55
@use "../../../node_modules/prismjs/plugins/line-highlight/prism-line-highlight.css";
66
@use "../../../node_modules/material-symbols/sharp.scss";
77
@use "../../../node_modules/plotly.js/src/css/style.scss" as plotlyStyle;
8-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/oldtimey-mode/oldtimey-mode.css";
9-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/modal/modal.css";
10-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/menu-bar/account-nav.css";
11-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/menu-bar/login-dropdown.css";
12-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/menu-bar/settings-menu.css";
13-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/menu-bar/user-avatar.css";
14-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/menu-bar/menu-bar.css";
15-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/menu-bar/author-info.css";
16-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/menu-bar/share-button.css";
17-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/menu-bar/save-status.css";
18-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/menu-bar/community-button.css";
19-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/menu-bar/project-title-input.css";
20-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/nineties-mode/nineties-mode.css";
21-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/blocks/blocks.css";
22-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/prompt/prompt.css";
23-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/icon-button/icon-button.css";
24-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/question/question.css";
25-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/controls/controls.css";
26-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/sprite-selector/sprite-selector.css";
27-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/drag-layer/drag-layer.css";
28-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/connection-modal/connection-modal.css";
29-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/asset-panel/selector.css";
30-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/asset-panel/asset-panel.css";
31-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/spinner/spinner.css";
32-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/watermark/watermark.css";
33-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/sprite-info/sprite-info.css";
34-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/backpack/backpack.css";
35-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/library/library.css";
36-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/sound-editor/sound-editor.css";
37-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/close-button/close-button.css";
38-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/meter/meter.css";
39-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/stage-wrapper/stage-wrapper.css";
40-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/sprite-selector-item/sprite-selector-item.css";
41-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/extension-button/extension-button.css";
42-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/extension-button/extension-button.raw.css";
43-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/filter/filter.css";
44-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/prehistoric-mode/prehistoric-mode.css";
45-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/slider-prompt/slider-prompt.css";
46-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/loader/loader.css";
47-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/stop-all/stop-all.css";
48-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/play-button/play-button.css";
49-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/green-flag/green-flag.css";
50-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/menu/menu.css";
51-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/target-pane/target-pane.css";
52-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/library-item/library-item.raw.css";
53-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/library-item/library-item.css";
54-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/stage/stage.css";
55-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/toggle-buttons/toggle-buttons.css";
56-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/tag-button/tag-button.css";
57-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/crash-message/crash-message.css";
58-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/debug-modal/debug-modal.css";
59-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/action-menu/action-menu.css";
60-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/forms/label.css";
61-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/forms/input.css";
62-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/language-selector/language-selector.css";
63-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/gui/gui.css";
64-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/stage-header/stage-header.css";
65-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/record-modal/record-modal.css";
66-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/webgl-modal/webgl-modal.css";
67-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/button/button.css";
68-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/monitor-list/monitor-list.css";
69-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/browser-modal/browser-modal.css";
70-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/progress-ring/progress-ring.css";
71-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/delete-confirmation-prompt/delete-confirmation-prompt.css";
72-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/loupe/loupe.css";
73-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/divider/divider.css";
74-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/context-menu/context-menu.css";
75-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/waveform/waveform.css";
76-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/telemetry-modal/telemetry-modal.css";
77-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/audio-trimmer/audio-trimmer.css";
78-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/coming-soon/coming-soon.css";
79-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/box/box.css";
80-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/direction-picker/direction-picker.css";
81-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/direction-picker/dial.css";
82-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/mic-indicator/mic-indicator.css";
83-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/turbo-mode/turbo-mode.css";
84-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/alerts/alerts.css";
85-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/alerts/alert.css";
86-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/alerts/inline-message.css";
87-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/cards/card.css";
88-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/stage-selector/stage-selector.css";
89-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/monitor/monitor.css";
90-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/delete-button/delete-button.css";
91-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/components/custom-procedures/custom-procedures.css";
92-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/playground/player.css";
93-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/playground/blocks-only.css";
94-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/playground/index.css";
95-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/css/z-index.css";
96-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/css/typography.css";
97-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/css/units.css";
98-
@import "../../../node_modules/@RaspberryPiFoundation/scratch-gui/src/css/colors.css";

‎src/components/Editor/Project/Project.jsx‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,10 @@ const Project = (props) => {
9898
menuBarHidden: true,
9999
assetHost: "https://editor-scratch.raspberrypi.org/api/assets",
100100
basePath: scratchBasePath,
101-
// projectId: scratchProjectId,
101+
projectId: scratchProjectId,
102102
projectHost: scratchProjectHost,
103103
};
104104

105-
// projectId="blank-scratch-starter"
106-
// projectHost="http://localhost:3009/api/projects"
107-
// assetHost="https://editor-scratch.raspberrypi.org/api/assets"
108-
// assetHost="/api/assets"
109-
// basePath="https://editor-scratch.raspberrypi.org/scratch-gui/"
110-
111105
return (
112106
<div className="proj" data-testid="project">
113107
<div

‎src/web-component.js‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -192,40 +192,6 @@ class WebComponent extends HTMLElement {
192192
</React.StrictMode>,
193193
);
194194
}
195-
196-
copyScratchGuiStyles() {
197-
const allStylesText = Array.from(document.styleSheets)
198-
.map((sheet) => {
199-
try {
200-
// Only process stylesheets that contain scratch-gui related styles
201-
// or if we can't access the href, include all stylesheets since ExternalStyles.scss contains our scratch-gui imports
202-
const includeSheet =
203-
!sheet.href ||
204-
sheet.href.includes("scratch-gui") ||
205-
sheet.href.includes("main") ||
206-
sheet.href.includes("bundle");
207-
208-
if (!includeSheet) return "";
209-
210-
return Array.from(sheet.cssRules)
211-
.map((rule) => rule.cssText)
212-
.join("\n");
213-
} catch (e) {
214-
console.warn("Could not access stylesheet:", e);
215-
return "";
216-
}
217-
})
218-
.join("\n");
219-
220-
if (allStylesText && this.shadowRoot) {
221-
const styleSheet = new CSSStyleSheet();
222-
styleSheet.replaceSync(allStylesText);
223-
this.shadowRoot.adoptedStyleSheets = [
224-
...(this.shadowRoot.adoptedStyleSheets || []),
225-
styleSheet,
226-
];
227-
}
228-
}
229195
}
230196

231197
if (!window.customElements.get("editor-wc")) {

‎webpack.config.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const WorkerPlugin = require("worker-plugin");
66
const CopyWebpackPlugin = require("copy-webpack-plugin");
77
const postcssImport = require("postcss-import");
88
const postcssSimpleVars = require("postcss-simple-vars");
9+
const postcssScss = require("postcss-scss");
910

1011
let publicUrl = process.env.PUBLIC_URL || "/";
1112
if (!publicUrl.endsWith("/")) {
@@ -126,9 +127,8 @@ module.exports = {
126127
{
127128
loader: "postcss-loader",
128129
options: {
129-
postcssOptions: {
130-
plugins: [postcssImport(), postcssSimpleVars()],
131-
},
130+
parser: postcssScss,
131+
plugins: [postcssImport(), postcssSimpleVars()],
132132
},
133133
},
134134
],

‎yarn.lock‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3356,6 +3356,7 @@ __metadata:
33563356
postcss-normalize: 8.0.1
33573357
postcss-preset-env: 6.7.0
33583358
postcss-safe-parser: 5.0.2
3359+
postcss-scss: 4.0.9
33593360
postcss-simple-vars: 5.0.2
33603361
prettier: ^2.8.8
33613362
prismjs: ^1.29.0
@@ -16631,6 +16632,15 @@ __metadata:
1663116632
languageName: node
1663216633
linkType: hard
1663316634

16635+
"postcss-scss@npm:4.0.9":
16636+
version: 4.0.9
16637+
resolution: "postcss-scss@npm:4.0.9"
16638+
peerDependencies:
16639+
postcss: ^8.4.29
16640+
checksum: dc358bafc23d52ed3a9a29333808825deba213042be74ece6eae7a61c692f67d0e6691fa7005367b013c01c79562fbb9ef2fe4c0485075233931bd90715f5132
16641+
languageName: node
16642+
linkType: hard
16643+
1663416644
"postcss-selector-matches@npm:^4.0.0":
1663516645
version: 4.0.0
1663616646
resolution: "postcss-selector-matches@npm:4.0.0"

0 commit comments

Comments
 (0)