Skip to content

Commit

Permalink
bump node support to >=18
Browse files Browse the repository at this point in the history
  • Loading branch information
paed01 committed Jun 14, 2024
1 parent b3ee49b commit 4238f73
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 25 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
Performance tweaks.

- major bump [`bpmn-elements@15`](https://github.com/paed01/bpmn-elements/blob/master/CHANGELOG.md)
- including major bump of [`smqp@9`](https://github.com/paed01/smqp/blob/default/CHANGELOG.md)
- major bump of [`smqp@9`](https://github.com/paed01/smqp/blob/default/CHANGELOG.md)

## Breaking

- drop support for node 14 and 16
- JavaScripts.Script property scripts is now a Map

# 21.1.0
Expand Down
16 changes: 8 additions & 8 deletions lib/index.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

Object.defineProperty(exports, '__esModule', { value: true });

var module$1 = require('module');
var events = require('events');
var url = require('url');
var node_module = require('node:module');
var node_events = require('node:events');
var node_url = require('node:url');
var BpmnModdle = require('bpmn-moddle');
var Elements = require('bpmn-elements');
var smqp = require('smqp');
var serializer = require('moddle-context-serializer');
var Debug = require('debug');
var vm = require('vm');
var node_vm = require('node:vm');

var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
function _interopNamespaceDefault(e) {
Expand Down Expand Up @@ -85,7 +85,7 @@ Scripts.prototype.getScript = function getScript(language, { id }) {

function JavaScript(language, filename, scriptBody, environment) {
this.id = filename;
this.script = new vm.Script(scriptBody, { filename });
this.script = new node_vm.Script(scriptBody, { filename });
this.language = language;
this.environment = environment;
}
Expand Down Expand Up @@ -161,7 +161,7 @@ ProcessOutputDataObject.prototype.write = function writeDataObject(broker, excha
return broker.publish(exchange, `${routingKeyPrefix}response`, { id, name, type, value }, messageProperties);
};

const nodeRequire = module$1.createRequire(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href))));
const nodeRequire = node_module.createRequire(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href))));
const { version: engineVersion } = nodeRequire('../package.json');

const kEngine = Symbol.for('engine');
Expand All @@ -178,7 +178,7 @@ const kTypeResolver = Symbol.for('type resolver');
function Engine(options = {}) {
if (!(this instanceof Engine)) return new Engine(options);

events.EventEmitter.call(this);
node_events.EventEmitter.call(this);

const opts = (this.options = {
Logger: Logger,
Expand Down Expand Up @@ -215,7 +215,7 @@ function defaultTypeResolver(elementTypes) {
elementTypes['bpmn:DataStoreReference'] = ProcessOutputDataObject;
}

Engine.prototype = Object.create(events.EventEmitter.prototype);
Engine.prototype = Object.create(node_events.EventEmitter.prototype);

Object.defineProperties(Engine.prototype, {
name: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"url": "https://github.com/paed01"
},
"engines": {
"node": ">=14"
"node": ">=18"
},
"files": [
"lib/",
Expand Down
2 changes: 1 addition & 1 deletion rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ export default {
footer: 'module.exports = Object.assign(exports.default, exports);',
},
],
external: ['module', 'url', 'vm', 'events', ...Object.keys(dependencies)],
external: ['node:module', 'node:url', 'node:vm', 'node:events', ...Object.keys(dependencies)],
};
2 changes: 1 addition & 1 deletion src/JavaScripts.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Script } from 'vm';
import { Script } from 'node:vm';

export default function Scripts(disableDummy) {
if (!(this instanceof Scripts)) return new Scripts(disableDummy);
Expand Down
6 changes: 3 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createRequire } from 'module';
import { EventEmitter } from 'events';
import { fileURLToPath } from 'url';
import { createRequire } from 'node:module';
import { EventEmitter } from 'node:events';
import { fileURLToPath } from 'node:url';

import BpmnModdle from 'bpmn-moddle';
import * as Elements from 'bpmn-elements';
Expand Down
2 changes: 1 addition & 1 deletion test/Engine-test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventEmitter } from 'events';
import { EventEmitter } from 'node:events';
import * as Bpmn from '../src/index.js';
import * as factory from './helpers/factory.js';
import * as testHelpers from './helpers/testHelpers.js';
Expand Down
2 changes: 1 addition & 1 deletion test/feature/Engine-feature.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventEmitter } from 'events';
import { EventEmitter } from 'node:events';
import { Engine } from '../../src/index.js';
import * as factory from '../helpers/factory.js';
import { camundaBpmnModdle as camunda } from '../helpers/testHelpers.js';
Expand Down
2 changes: 1 addition & 1 deletion test/feature/backward-compatibility-feature.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventEmitter } from 'events';
import { EventEmitter } from 'node:events';
import { Engine } from '../../src/index.js';

Feature('Backward compatability', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/feature/extend-feature.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventEmitter } from 'events';
import { EventEmitter } from 'node:events';
import { Activity } from 'bpmn-elements';
import { Engine } from '../../src/index.js';
import { camundaBpmnModdle as camunda } from '../helpers/testHelpers.js';
Expand Down
2 changes: 1 addition & 1 deletion test/feature/issues-feature.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventEmitter } from 'node:events';
import { Engine } from '../../src/index.js';
import { EventEmitter } from 'events';
import * as factory from '../helpers/factory.js';

Feature('Issues', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/feature/resume-feature.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventEmitter } from 'events';
import { EventEmitter } from 'node:events';
import * as testHelpers from '../helpers/testHelpers.js';
import { Engine } from '../../src/index.js';

Expand Down
4 changes: 2 additions & 2 deletions test/helpers/factory.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fs from 'fs';
import path from 'path';
import fs from 'node:fs';
import path from 'node:path';

export function valid(definitionId) {
if (!definitionId) definitionId = 'valid';
Expand Down
2 changes: 1 addition & 1 deletion test/issues-test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventEmitter } from 'node:events';
import { Engine } from '../src/index.js';
import { EventEmitter } from 'events';
import * as factory from './helpers/factory.js';

describe('issues', () => {
Expand Down
2 changes: 1 addition & 1 deletion types/bpmn-engine.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Author : Saeed Tabrizi
// Refactored by : Pål Edman

import { EventEmitter } from 'events';
import { EventEmitter } from 'node:events';
import { Definitions as BpmnModdleDefinitions } from 'bpmn-moddle';
import { extendFn, SerializableContext } from 'moddle-context-serializer';
import {
Expand Down

0 comments on commit 4238f73

Please sign in to comment.