Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,12 @@ export default defineConfig(
'packages/plugins/dev-tools/**',
'packages/plugins/field-colour/**',
'packages/plugins/field-colour-hsv-sliders/**',
'packages/plugins/field-date/**',
'packages/plugins/field-dependent-dropdown/**',
'packages/plugins/field-grid-dropdown/**',
'packages/plugins/field-multilineinput/**',
'packages/plugins/field-slider/**',
'packages/plugins/fixed-edges/**',
'packages/plugins/modal/**',
'packages/plugins/theme-modern/**',
'packages/plugins/typed-variable-modal/**',
Expand Down
17 changes: 14 additions & 3 deletions packages/plugins/field-date/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@
"start": "blockly-scripts start",
"test": "blockly-scripts test"
},
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"unpkg": "./dist/index.js",
"main": "./dist/cjs/index.js",
"module": "./dist/esm/index.js",
"unpkg": "./dist/esm/index.js",
"type": "module",
"engines": {
"node": ">=24"
},
"author": "Blockly Team",
"keywords": [
"blockly",
Expand Down Expand Up @@ -41,6 +45,13 @@
"dist",
"src"
],
"exports": {
".": {
"node": {"types": "./dist/cjs/index.d.ts", "default": "./dist/cjs/index.js"},
"import": {"types": "./dist/esm/index.d.ts", "default": "./dist/esm/index.js"},
"require": {"types": "./dist/cjs/index.d.ts", "default": "./dist/cjs/index.js"}
}
},
"devDependencies": {
"@blockly/dev-scripts": "^13.4.0",
"@blockly/dev-tools": "^13.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/field-date/src/field_date.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @fileoverview Plugin overview.
*/
import * as Blockly from 'blockly/core';
import {getLocaleDateString} from './utils';
import {getLocaleDateString} from './utils.js';

/**
* Class for a date input field.
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/field-date/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
* SPDX-License-Identifier: Apache-2.0
*/

export * from './field_date';
export * from './field_date.js';
4 changes: 2 additions & 2 deletions packages/plugins/field-date/test/field_date_test.mocha.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import {assert} from 'chai';
import {testHelpers} from '@blockly/dev-tools';
import {FieldDate} from '../src/index';
import {getLocaleDateString} from '../src/utils';
import {FieldDate} from '../src/index.js';
import {getLocaleDateString} from '../src/utils.js';

const {
assertFieldValue,
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/field-date/test/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import * as Blockly from 'blockly';
import {createPlayground} from '@blockly/dev-tools';
import '../src/index';
import '../src/index.js';

/**
* An array of blocks that are defined only for the purposes of
Expand Down
10 changes: 2 additions & 8 deletions packages/plugins/field-date/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
{
"extends": "@blockly/dev-scripts/config/tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"outDir": "dist",
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"module": "es2015",
"moduleResolution": "bundler",
"target": "es6",
"strict": true
"outDir": "dist/esm"
},
// NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
// Only src matters for production builds.
Expand Down
17 changes: 14 additions & 3 deletions packages/plugins/field-dependent-dropdown/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@
"start": "blockly-scripts start",
"test": "blockly-scripts test"
},
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"unpkg": "./dist/index.js",
"main": "./dist/cjs/index.js",
"module": "./dist/esm/index.js",
"unpkg": "./dist/esm/index.js",
"type": "module",
"engines": {
"node": ">=24"
},
"author": "Blockly Team",
"keywords": [
"blockly",
Expand All @@ -40,6 +44,13 @@
"dist",
"src"
],
"exports": {
".": {
"node": {"types": "./dist/cjs/index.d.ts", "default": "./dist/cjs/index.js"},
"import": {"types": "./dist/esm/index.d.ts", "default": "./dist/esm/index.js"},
"require": {"types": "./dist/cjs/index.d.ts", "default": "./dist/cjs/index.js"}
}
},
"devDependencies": {
"@blockly/dev-scripts": "^13.4.0",
"@blockly/dev-tools": "^13.4.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/

import * as Blockly from 'blockly/core';
import type {FieldDependentDropdown} from './field_dependent_dropdown';
import type {FieldDependentDropdown} from './field_dependent_dropdown.js';

/**
* A deep equality comparison between the two provided arrays recursively
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/

import * as Blockly from 'blockly/core';
import {DependentDropdownOptionsChange} from './dependent_dropdown_options_change';
import {DependentDropdownOptionsChange} from './dependent_dropdown_options_change.js';

/** The type of the mapping from parent value to child options. */
export interface ChildOptionMapping {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/field-dependent-dropdown/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
* SPDX-License-Identifier: Apache-2.0
*/

export * from './field_dependent_dropdown';
export * from './field_dependent_dropdown.js';
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

const chai = require('chai');
const sinon = require('sinon');
const Blockly = require('blockly');
require('./field_dependent_dropdown_test_block');

const assert = chai.assert;
import {assert} from 'chai';
import sinon from 'sinon';
import * as Blockly from 'blockly';
import './field_dependent_dropdown_test_block.js';

suite('fieldDependentDropdown', function () {
setup(function () {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as Blockly from 'blockly';
import {ChildOptionMapping, FieldDependentDropdown} from '../src/index';
import {ChildOptionMapping, FieldDependentDropdown} from '../src/index.js';

Blockly.defineBlocksWithJsonArray([
{
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/field-dependent-dropdown/test/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import * as Blockly from 'blockly';
import {createPlayground} from '@blockly/dev-tools';
import './field_dependent_dropdown_test_block';
import './field_dependent_dropdown_test_block.js';

const toolbox: Blockly.utils.toolbox.ToolboxDefinition = {
kind: 'flyoutToolbox',
Expand Down
10 changes: 2 additions & 8 deletions packages/plugins/field-dependent-dropdown/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
{
"extends": "@blockly/dev-scripts/config/tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"outDir": "dist",
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"module": "es2015",
"moduleResolution": "bundler",
"target": "es6",
"strict": true
"outDir": "dist/esm"
},
// NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
// Only src matters for production builds.
Expand Down
17 changes: 14 additions & 3 deletions packages/plugins/field-multilineinput/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@
"start": "blockly-scripts start",
"test": "blockly-scripts test"
},
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"unpkg": "./dist/index.js",
"main": "./dist/cjs/index.js",
"module": "./dist/esm/index.js",
"unpkg": "./dist/esm/index.js",
"type": "module",
"engines": {
"node": ">=24"
},
"author": "Blockly Team",
"keywords": [
"blockly",
Expand All @@ -39,6 +43,13 @@
"dist",
"src"
],
"exports": {
".": {
"node": {"types": "./dist/cjs/index.d.ts", "default": "./dist/cjs/index.js"},
"import": {"types": "./dist/esm/index.d.ts", "default": "./dist/esm/index.js"},
"require": {"types": "./dist/cjs/index.d.ts", "default": "./dist/cjs/index.js"}
}
},
"devDependencies": {
"@blockly/dev-scripts": "^13.4.0",
"@blockly/dev-tools": "^13.4.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import {DartGenerator, Order as DartOrder} from 'blockly/dart';
import {LuaGenerator, Order as LuaOrder} from 'blockly/lua';
import {PhpGenerator, Order as PhpOrder} from 'blockly/php';
import {PythonGenerator, Order as PythonOrder} from 'blockly/python';
import {registerFieldMultilineInput} from '../field_multilineinput';
import {Generators} from './generatorsType';
import {registerFieldMultilineInput} from '../field_multilineinput.js';
import {Generators} from './generatorsType.js';

/** The name this block is registered under. */
export const BLOCK_NAME = 'text_multiline';
Expand Down
6 changes: 3 additions & 3 deletions packages/plugins/field-multilineinput/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
* SPDX-License-Identifier: Apache-2.0
*/

import * as textMultiline from './blocks/textMultiline';
import * as textMultiline from './blocks/textMultiline.js';

export * from './field_multilineinput';
export * from './field_multilineinput.js';

// Re-export all parts of the block definition.
export * as textMultiline from './blocks/textMultiline';
export * as textMultiline from './blocks/textMultiline.js';

// This package currently exports a single block. More may
// be added later.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {dartGenerator} from 'blockly/dart';
import {phpGenerator} from 'blockly/php';
import {pythonGenerator} from 'blockly/python';
import {luaGenerator} from 'blockly/lua';
import {installAllBlocks} from '../src/index';
import {installAllBlocks} from '../src/index.js';
import {assert} from 'chai';

const blockJson = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
* SPDX-License-Identifier: Apache-2.0
*/

const {testHelpers} = require('@blockly/dev-tools');
const {
import jsdomGlobal from 'jsdom-global';
import {assert} from 'chai';
import sinon from 'sinon';
import * as Blockly from 'blockly';
import {testHelpers} from '@blockly/dev-tools';
import {
FieldMultilineInput,
registerFieldMultilineInput,
} = require('../src/index');
const Blockly = require('blockly');
const {assert} = require('chai');
const sinon = require('sinon');
} from '../src/index.js';

const {
assertFieldValue,
Expand Down Expand Up @@ -150,7 +151,7 @@ suite('FieldMultilineInput', function () {
};

setup(function () {
this.jsdomCleanup = require('jsdom-global')(
this.jsdomCleanup = jsdomGlobal(
'<!DOCTYPE html><div id="blocklyDiv"></div>',
);
// See https://github.com/RaspberryPiFoundation/blockly-samples/issues/2528.
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/field-multilineinput/test/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {phpGenerator} from 'blockly/php';
import {pythonGenerator} from 'blockly/python';
import {luaGenerator} from 'blockly/lua';
import {createPlayground} from '@blockly/dev-tools';
import {FieldMultilineInput, textMultiline} from '../src/index';
import {FieldMultilineInput, textMultiline} from '../src/index.js';

/**
* An array of blocks that are defined only for the purposes of
Expand Down
10 changes: 2 additions & 8 deletions packages/plugins/field-multilineinput/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
{
"extends": "@blockly/dev-scripts/config/tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"outDir": "dist",
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"module": "es2015",
"moduleResolution": "bundler",
"target": "es6",
"strict": true
"outDir": "dist/esm"
},
// NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
// Only src matters for production builds.
Expand Down
17 changes: 14 additions & 3 deletions packages/plugins/field-slider/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@
"start": "blockly-scripts start",
"test": "blockly-scripts test"
},
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"unpkg": "./dist/index.js",
"main": "./dist/cjs/index.js",
"module": "./dist/esm/index.js",
"unpkg": "./dist/esm/index.js",
"type": "module",
"engines": {
"node": ">=24"
},
"author": "Blockly Team",
"keywords": [
"blockly",
Expand All @@ -38,6 +42,13 @@
"dist",
"src"
],
"exports": {
".": {
"node": {"types": "./dist/cjs/index.d.ts", "default": "./dist/cjs/index.js"},
"import": {"types": "./dist/esm/index.d.ts", "default": "./dist/esm/index.js"},
"require": {"types": "./dist/cjs/index.d.ts", "default": "./dist/cjs/index.js"}
}
},
"devDependencies": {
"@blockly/dev-scripts": "^13.4.0",
"@blockly/dev-tools": "^13.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/field-slider/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
* SPDX-License-Identifier: Apache-2.0
*/

export * from './field_slider';
export * from './field_slider.js';
12 changes: 6 additions & 6 deletions packages/plugins/field-slider/test/field_slider_test.mocha.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
* SPDX-License-Identifier: Apache-2.0
*/

const {assert} = require('chai');
const sinon = require('sinon');
const {
import {assert} from 'chai';
import sinon from 'sinon';
import {
assertSliderField,
assertSliderFieldDefault,
} = require('./field_slider_test_helpers.mocha');
const {testHelpers} = require('@blockly/dev-tools');
const {FieldSlider} = require('../src/index');
} from './field_slider_test_helpers.mocha.js';
import {testHelpers} from '@blockly/dev-tools';
import {FieldSlider} from '../src/index.js';

const {
assertFieldValue,
Expand Down
Loading
Loading