Do not add license header to SA files

These notices were added when it was ambiguous what was GPL and what wasn't. As this ambiguity no longer exists, they can be removed.
2021-03-25 16:36:38 -05:00
1 parent 50e1bdbe6d
commit d15d2ca9bd
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default async ({ addon, console }) => {
  if (!addon.tab.redux.state) return console.warn("Redux is not available!");
  addon.tab.redux.initialize();
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 /* inserted by pull.js */
 import _twAsset0 from "./icons/block_icon.svg";
 import _twAsset1 from "./icons/control_icon.svg";
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 import blockToDom from "./blockToDom.js";

 export default async function ({ addon, global, console, msg }) {
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default async function ({ addon, global, console }) {
  // TODO: Switch completely to Blockly?
  // Well anyway future self, here you go: https://github.com/LLK/scratch-blocks/compare/hotfix/totally-normal-2020
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 .clone-container-container {
  display: -webkit-box;
  display: -webkit-flex;
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default async function ({ addon, global, console, msg }) {
  const vm = addon.tab.traps.vm;

@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 import { normalizeHex, getHexRegex } from "../../libraries/normalize-color.js";
 import RateLimiter from "../../libraries/rate-limiter.js";
 import tinycolor from "../../libraries/tinycolor-min.js";
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 import { normalizeHex, getHexRegex } from "../../libraries/normalize-color.js";
 import RateLimiter from "../../libraries/rate-limiter.js";
 import tinycolor from "../../libraries/tinycolor-min.js";
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 .sa-color-picker {
  display: flex;
 }
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 import codeEditorHandler from "./code-editor.js";
 import paintEditorHandler from "./paint-editor.js";

@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default async function ({ addon, global, console, msg, safeMsg }) {
  // This needs to be stored in a separate variable updated in getBlocksXML
  // because addon.settings and actual workspace state do not necessarily match.
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 .u-contextmenu-colored .blocklyContextMenu {
  background-color: var(--u-contextmenu-bg);
  border-color: #0003;
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default async function ({ addon, global, console }) {
  document.body.addEventListener("mousedown", handleClick, true);
 }
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 /**
 * Encapsulates a block (either in this sprite or another / Blockly, or native JSON block
 */
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default class BlockItem {
  constructor(cls, procCode, labelID, y) {
    this.cls = cls;
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 // import ShowBroadcast from "./show-broadcast.js";
 import Utils from "./blockly/Utils.js";
 import DomHelpers from "./DomHelpers.js";
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default class DomHelpers {
  constructor(addon) {
    this.addon = addon;
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 /**
 * A fake XML class to use in place of the real XML for faking things?
 */
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 /**
 * Helper class to flash a Blockly scratch block in the users workspace
 */
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 /**
 * This class is dedicated to maintaining the Undo stack of Blockly
 * It allows us to initiate an undo group such that all subsequent operations are recorded as a single
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 import BlockInstance from "../BlockInstance.js";
 import BlockFlasher from "./BlockFlasher.js";

@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 // A file to split Editor Devtools by features.
 // Unlike userscript.js, this file mainly interacts with VM.
 export default class ShowBroadcast {
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 #s3devToolBar {
  display: flex;
  white-space: nowrap;
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 /* inserted by pull.js */
 import _twAsset0 from "./icon--close.svg";
 const _twGetAsset = (path) => {
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 .u-dropdown-searchbar {
  width: 100%;
  box-sizing: border-box;
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default async function ({ addon, global, console }) {
  // The hierarchy is:
  // blocklyDropDownDiv (position, background color, etc.) -> blocklyDropDownContent (scrollbar) -> blocklyDropdownMenu (items)
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default function ({ addon, global, console }) {
  window.dispatchEvent(new Event("resize"));

@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 /* sa-autoupdate-theme-ignore */
 /* Userscript handles whether this style should be enabled until dynamicEnable is a thing */
 /* If we didn't add autoupdate-ignore, loading the editor with the addon disabled, then
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 /* sa-autoupdate-theme-ignore */

 path.blocklyBlockBackground[fill="#FF6680"],
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default async function ({ addon, global, console }) {
  var stylesheet = `path.blocklyBlockBackground[fill="#FF6680"],
    path.blocklyBlockBackground[fill="#5CB1D6"],
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default async function ({ addon, global, console }) {
  const originalFileReader = window.FileReader;
  window.FileReader = function () {
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 .sa-folders-contextmenu-container {
 }

@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 /* inserted by pull.js */
 import _twAsset0 from "./folder.svg";
 const _twGetAsset = (path) => {
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 .blocklyFlyout.sa-flyoutClose {
  transform: translateX(-200px) !important;
 }
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 /* inserted by pull.js */
 import _twAsset0 from "./lock.svg";
 import _twAsset1 from "./unlock.svg";
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default async function ({ addon, global, console }) {
  // IDs are taken from https://github.com/LLK/scratch-vm/blob/ffa78b91b8645b6a8c80f698a3637bb73abf2931/src/extension-support/extension-manager.js#L11
  const Extensions = ["music", "pen", "text2speech", "translate"];
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 .mediaRecorderPopup {
  box-sizing: border-box;
  width: 700px;
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 import downloadBlob from "../../libraries/download-blob.js";

 export default async ({ addon, console, msg }) => {
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 .pos-container-container {
  display: -webkit-box;
  display: -webkit-flex;
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default async function ({ addon, global, console }) {
  let pos = null;

@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 /* inserted by pull.js */
 import _twAsset0 from "./icon--mute.svg";
 const _twGetAsset = (path) => {
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 .sa-onion-controls-container {
  display: flex;
  flex-direction: row;
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 /* inserted by pull.js */
 import _twAsset0 from "./decrement.svg";
 import _twAsset1 from "./increment.svg";
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 .pause-btn {
  width: 2rem;
  height: 2rem;
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 /* inserted by pull.js */
 import _twAsset0 from "./pause.svg";
 import _twAsset1 from "./play.svg";
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default async ({ addon, console, msg }) => {
  if (!addon.tab.redux.state) return console.warn("Redux is not available!");
  const vm = addon.tab.traps.vm;
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 [class^="backpack_backpack-container"] {
  display: none;
 }
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default async function () {
  // Trigger a resize so that Blockly knows that the backpack is gone
  window.dispatchEvent(new Event("resize"));
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default async function ({ addon }) {
  addon.tab.redux.initialize();
  const close = () =>
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 export default async function ({ addon, console, msg }) {
  const vm = addon.tab.traps.vm;

@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 /* Change z-indexes to allow more than 3 tabs */
 .gui_tab_27Unf.gui_is-selected_sHAiu {
  z-index: 10 !important;
@@ -1,8 +1,3 @@
-/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */
-
 /* inserted by pull.js */
 import _twAsset0 from "./icon.svg";
 import _twAsset1 from "./search.svg";
@@ -62,11 +62,6 @@ const commitHash = childProcess.execSync('git rev-parse --short HEAD')
    .toString()
    .trim();

-const JS_HEADER = `/**!
- * Imported from SA
- * @license GPLv3.0 (see LICENSE or https://www.gnu.org/licenses/ for more information)
- */\n\n`;
-
 const includeImportedLibraries = contents => {
    // Parse things like:
    // import { normalizeHex, getHexRegex } from "../../libraries/normalize-color.js";
@@ -141,11 +136,6 @@ request('https://raw.githubusercontent.com/ScratchAddons/contributors/master/.al
                }
            }

-            // Add a license notice, unless one already exists.
-            if ((file.endsWith('.js') || file.endsWith('.css')) && !contents.includes('@license')) {
-                contents = JS_HEADER + contents;
-            }
-
            fs.writeFileSync(newPath, contents);
        }
    }