Skip to content

refactor: Migrate Blockly.ConnectionType to named exports #5533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cpcallen merged 2 commits into from
Sep 24, 2021
Merged

refactor: Migrate Blockly.ConnectionType to named exports #5533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b70e624
refactor: Migrate Blockly.ConnectionType to named exports
cpcallen Sep 24, 2021
19f4a13
Add additional information to renamings.js
cpcallen Sep 24, 2021
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 core/block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const Blocks = goog.require('Blockly.Blocks');
/* eslint-disable-next-line no-unused-vars */
const Comment = goog.requireType('Blockly.Comment');
const Connection = goog.require('Blockly.Connection');
const ConnectionType = goog.require('Blockly.ConnectionType');
const Coordinate = goog.require('Blockly.utils.Coordinate');
const Events = goog.require('Blockly.Events');
const Extensions = goog.require('Blockly.Extensions');
Expand All @@ -45,6 +44,7 @@ const inputTypes = goog.require('Blockly.inputTypes');
const object = goog.require('Blockly.utils.object');
const utils = goog.require('Blockly.utils');
const {ASTNode} = goog.require('Blockly.ASTNode');
const {ConnectionType} = goog.require('Blockly.ConnectionType');
/** @suppress {extraRequire} */
goog.require('Blockly.Events.BlockChange');
/** @suppress {extraRequire} */
Expand Down
2 changes: 1 addition & 1 deletion core/block_svg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ const blockAnimations = goog.require('Blockly.blockAnimations');
const blocks = goog.require('Blockly.serialization.blocks');
const browserEvents = goog.require('Blockly.browserEvents');
const common = goog.require('Blockly.common');
const ConnectionType = goog.require('Blockly.ConnectionType');
const constants = goog.require('Blockly.constants');
const dom = goog.require('Blockly.utils.dom');
const internalConstants = goog.require('Blockly.internalConstants');
Expand All @@ -66,6 +65,7 @@ const userAgent = goog.require('Blockly.utils.userAgent');
const utils = goog.require('Blockly.utils');
const {ASTNode} = goog.require('Blockly.ASTNode');
const {Block} = goog.require('Blockly.Block');
const {ConnectionType} = goog.require('Blockly.ConnectionType');
const {TabNavigateCursor} = goog.require('Blockly.TabNavigateCursor');
/** @suppress {extraRequire} */
goog.require('Blockly.Events.BlockMove');
Expand Down
2 changes: 1 addition & 1 deletion core/blockly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ const ComponentManager = goog.require('Blockly.ComponentManager');
const ConnectionChecker = goog.require('Blockly.ConnectionChecker');
const ConnectionDB = goog.require('Blockly.ConnectionDB');
const Connection = goog.require('Blockly.Connection');
const ConnectionType = goog.require('Blockly.ConnectionType');
const ContextMenu = goog.require('Blockly.ContextMenu');
const ContextMenuItems = goog.require('Blockly.ContextMenuItems');
const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry');
Expand Down Expand Up @@ -157,6 +156,7 @@ const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg');
const {BlockSvg} = goog.require('Blockly.BlockSvg');
const {ASTNode} = goog.require('Blockly.ASTNode');
const {BasicCursor} = goog.require('Blockly.BasicCursor');
const {ConnectionType} = goog.require('Blockly.ConnectionType');
const {Cursor} = goog.require('Blockly.Cursor');
/** @suppress {extraRequire} */
goog.require('Blockly.Events.BlockCreate');
Expand Down
2 changes: 1 addition & 1 deletion core/connection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

goog.module('Blockly.Connection');

const ConnectionType = goog.require('Blockly.ConnectionType');
const Events = goog.require('Blockly.Events');
/* eslint-disable-next-line no-unused-vars */
const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWithBlock');
Expand All @@ -25,6 +24,7 @@ const blocks = goog.require('Blockly.serialization.blocks');
const deprecation = goog.require('Blockly.utils.deprecation');
/* eslint-disable-next-line no-unused-vars */
const {Block} = goog.requireType('Blockly.Block');
const {ConnectionType} = goog.require('Blockly.ConnectionType');
/** @suppress {extraRequire} */
goog.require('Blockly.constants');
/** @suppress {extraRequire} */
Expand Down
2 changes: 1 addition & 1 deletion core/connection_checker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
/* eslint-disable-next-line no-unused-vars */
const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
const common = goog.require('Blockly.common');
const ConnectionType = goog.require('Blockly.ConnectionType');
const internalConstants = goog.require('Blockly.internalConstants');
const registry = goog.require('Blockly.registry');
const {ConnectionType} = goog.require('Blockly.ConnectionType');


/**
Expand Down
2 changes: 1 addition & 1 deletion core/connection_db.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const Coordinate = goog.requireType('Blockly.utils.Coordinate');
const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
/* eslint-disable-next-line no-unused-vars */
const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
const ConnectionType = goog.require('Blockly.ConnectionType');
const {ConnectionType} = goog.require('Blockly.ConnectionType');
/** @suppress {extraRequire} */
goog.require('Blockly.constants');

Expand Down
2 changes: 1 addition & 1 deletion core/connection_type.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ const ConnectionType = {
PREVIOUS_STATEMENT: 4
};

exports = ConnectionType;
exports.ConnectionType = ConnectionType;
2 changes: 1 addition & 1 deletion core/events/events_block_move.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ goog.module.declareLegacyNamespace();
const BlockBase = goog.require('Blockly.Events.BlockBase');
const Coordinate = goog.require('Blockly.utils.Coordinate');
const Events = goog.require('Blockly.Events');
const ConnectionType = goog.require('Blockly.ConnectionType');
const object = goog.require('Blockly.utils.object');
const registry = goog.require('Blockly.registry');
/* eslint-disable-next-line no-unused-vars */
const {Block} = goog.requireType('Blockly.Block');
const {ConnectionType} = goog.require('Blockly.ConnectionType');


/**
Expand Down
3 changes: 2 additions & 1 deletion core/input_types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@

goog.module('Blockly.inputTypes');

const ConnectionType = goog.require('Blockly.ConnectionType');
const {ConnectionType} = goog.require('Blockly.ConnectionType');


/**
* Enum for the type of a connection or input.
Expand Down
2 changes: 1 addition & 1 deletion core/insertion_marker_manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
goog.module('Blockly.InsertionMarkerManager');

const ComponentManager = goog.require('Blockly.ComponentManager');
const ConnectionType = goog.require('Blockly.ConnectionType');
/* eslint-disable-next-line no-unused-vars */
const Coordinate = goog.requireType('Blockly.utils.Coordinate');
const Events = goog.require('Blockly.Events');
Expand All @@ -31,6 +30,7 @@ const constants = goog.require('Blockly.constants');
const internalConstants = goog.require('Blockly.internalConstants');
/* eslint-disable-next-line no-unused-vars */
const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
const {ConnectionType} = goog.require('Blockly.ConnectionType');


/**
Expand Down
2 changes: 1 addition & 1 deletion core/internal_constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

goog.module('Blockly.internalConstants');

const ConnectionType = goog.require('Blockly.ConnectionType');
const {ConnectionType} = goog.require('Blockly.ConnectionType');


/**
Expand Down
2 changes: 1 addition & 1 deletion core/keyboard_nav/ast_node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ goog.module('Blockly.ASTNode');

/* eslint-disable-next-line no-unused-vars */
const Connection = goog.requireType('Blockly.Connection');
const ConnectionType = goog.require('Blockly.ConnectionType');
const Coordinate = goog.require('Blockly.utils.Coordinate');
/* eslint-disable-next-line no-unused-vars */
const Field = goog.requireType('Blockly.Field');
Expand All @@ -28,6 +27,7 @@ const Input = goog.requireType('Blockly.Input');
const Workspace = goog.requireType('Blockly.Workspace');
/* eslint-disable-next-line no-unused-vars */
const {Block} = goog.requireType('Blockly.Block');
const {ConnectionType} = goog.require('Blockly.ConnectionType');


/**
Expand Down
2 changes: 1 addition & 1 deletion core/rendered_connection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ goog.module('Blockly.RenderedConnection');
const Connection = goog.require('Blockly.Connection');
/* eslint-disable-next-line no-unused-vars */
const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
const ConnectionType = goog.require('Blockly.ConnectionType');
const Coordinate = goog.require('Blockly.utils.Coordinate');
const Events = goog.require('Blockly.Events');
const Svg = goog.require('Blockly.utils.Svg');
Expand All @@ -30,6 +29,7 @@ const utils = goog.require('Blockly.utils');
const {Block} = goog.requireType('Blockly.Block');
/* eslint-disable-next-line no-unused-vars */
const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
const {ConnectionType} = goog.require('Blockly.ConnectionType');


/**
Expand Down
2 changes: 1 addition & 1 deletion core/renderers/common/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ const Svg = goog.require('Blockly.utils.Svg');
/* eslint-disable-next-line no-unused-vars */
const Theme = goog.requireType('Blockly.Theme');
const colour = goog.require('Blockly.utils.colour');
const ConnectionType = goog.require('Blockly.ConnectionType');
const dom = goog.require('Blockly.utils.dom');
const object = goog.require('Blockly.utils.object');
const svgPaths = goog.require('Blockly.utils.svgPaths');
const userAgent = goog.require('Blockly.utils.userAgent');
const utils = goog.require('Blockly.utils');
const {ConnectionType} = goog.require('Blockly.ConnectionType');


/**
Expand Down
2 changes: 1 addition & 1 deletion core/renderers/common/debugger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
const Row = goog.requireType('Blockly.blockRendering.Row');
const Svg = goog.require('Blockly.utils.Svg');
const Types = goog.require('Blockly.blockRendering.Types');
const ConnectionType = goog.require('Blockly.ConnectionType');
const dom = goog.require('Blockly.utils.dom');
/* eslint-disable-next-line no-unused-vars */
const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
const {ConnectionType} = goog.require('Blockly.ConnectionType');


/**
Expand Down
2 changes: 1 addition & 1 deletion core/renderers/common/marker_svg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
const Svg = goog.require('Blockly.utils.Svg');
/* eslint-disable-next-line no-unused-vars */
const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
const ConnectionType = goog.require('Blockly.ConnectionType');
const dom = goog.require('Blockly.utils.dom');
const svgPaths = goog.require('Blockly.utils.svgPaths');
const {ASTNode} = goog.require('Blockly.ASTNode');
/* eslint-disable-next-line no-unused-vars */
const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
const {ConnectionType} = goog.require('Blockly.ConnectionType');
/* eslint-disable-next-line no-unused-vars */
const {Marker} = goog.requireType('Blockly.Marker');
/** @suppress {extraRequire} */
Expand Down
2 changes: 1 addition & 1 deletion core/renderers/common/renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
goog.module('Blockly.blockRendering.Renderer');

const Connection = goog.require('Blockly.Connection');
const ConnectionType = goog.require('Blockly.ConnectionType');
const ConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
/* eslint-disable-next-line no-unused-vars */
const Debug = goog.requireType('Blockly.blockRendering.Debug');
Expand All @@ -38,6 +37,7 @@ const object = goog.require('Blockly.utils.object');
const {Block} = goog.requireType('Blockly.Block');
/* eslint-disable-next-line no-unused-vars */
const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
const {ConnectionType} = goog.require('Blockly.ConnectionType');
/* eslint-disable-next-line no-unused-vars */
const {Marker} = goog.requireType('Blockly.Marker');

Expand Down
2 changes: 1 addition & 1 deletion core/renderers/zelos/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ goog.module('Blockly.zelos.ConstantProvider');

const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
const Svg = goog.require('Blockly.utils.Svg');
const ConnectionType = goog.require('Blockly.ConnectionType');
const dom = goog.require('Blockly.utils.dom');
const object = goog.require('Blockly.utils.object');
const svgPaths = goog.require('Blockly.utils.svgPaths');
const utilsColour = goog.require('Blockly.utils.colour');
const {ConnectionType} = goog.require('Blockly.ConnectionType');


/**
Expand Down
2 changes: 1 addition & 1 deletion core/renderers/zelos/renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ const Theme = goog.requireType('Blockly.Theme');
/* eslint-disable-next-line no-unused-vars */
const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
const blockRendering = goog.require('Blockly.blockRendering');
const ConnectionType = goog.require('Blockly.ConnectionType');
const object = goog.require('Blockly.utils.object');
/* eslint-disable-next-line no-unused-vars */
const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
const {ConnectionType} = goog.require('Blockly.ConnectionType');
/* eslint-disable-next-line no-unused-vars */
const {Marker} = goog.requireType('Blockly.Marker');

Expand Down
2 changes: 2 additions & 0 deletions scripts/migration/renamings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ const renamings = {
},
'Blockly.connectionTypes': {
module: 'Blockly.ConnectionType',
export: 'ConnectionType', // Previous default export now named.
path: 'Blockly.ConnectionType', // Type reexported directly.
},
'Blockly.utils': {
exports: {
Expand Down
Loading