Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x]
node-version: [20.x]
steps:
- uses: actions/checkout@v2

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
services
dist
**/node_modules
credentials.json
deployment
Expand Down
12 changes: 12 additions & 0 deletions babel.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"presets": [
[
"@babel/preset-env",
{
"targets": {
"node": "current"
}
}
]
]
}
16 changes: 9 additions & 7 deletions bin/bedrock
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
#!/usr/bin/env node

/* eslint-disable-next-line no-global-assign */
require = require('esm')(module);

const path = require('path');
const kleur = require('kleur');
const { program } = require('commander');
const { camelCase } = require('lodash');
const { promptFill } = require('../src/util/prompt');
const { restoreSnapshot } = require('../src/util/snapshot');
const { promptFill } = require('../dist/cjs/util/prompt');
const { restoreSnapshot } = require('../dist/cjs/util/snapshot');
const { version } = require('../package.json');
const descriptor = require('../command.json');

Expand Down Expand Up @@ -100,7 +97,7 @@ function getHandler(descriptor) {
const name = descriptor.functionName || camelCase(descriptor.name);
try {
// Prefer named functions in entrypoints to helper files that may share the same name.
const mod = require(path.resolve(__dirname, '../src', ...dirs.slice(0, -1)));
const mod = requireCompiled(dirs.slice(0, -1));
const handler = mod[name] || mod.default;
if (!handler) {
const err = new Error();
Expand All @@ -110,7 +107,7 @@ function getHandler(descriptor) {
return handler;
} catch (err) {
if (err.code === 'MODULE_NOT_FOUND') {
return require(path.resolve(__dirname, '../src', ...dirs)).default;
return requireCompiled(dirs).default;
} else {
throw err;
}
Expand All @@ -130,4 +127,9 @@ function getDescription(arg) {
return Array.isArray(arg) ? arg.join('\n') : arg;
}

function requireCompiled(dirs) {
const file = path.resolve(__dirname, '../dist/cjs', ...dirs);
return require(file);
}

program.parse(process.argv);
6 changes: 2 additions & 4 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
module.exports = {
moduleDirectories: ['node_modules', './src/'],
testPathIgnorePatterns: [
'node_modules',
'\\w+.ignore.js'
],
testPathIgnorePatterns: ['dist', 'node_modules', '\\w+.ignore.js'],
modulePathIgnorePatterns: ['dist'],
};
14 changes: 8 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
"license": "MIT",
"scripts": {
"test": "jest",
"lint": "eslint"
"lint": "eslint",
"build": "scripts/build",
"postinstall": "scripts/build"
},
"dependencies": {
"@yeongjet/joi-to-json-schema": "^1.0.4",
"commander": "^6.1.0",
"compare-versions": "^3.6.0",
"esm": "^3.2.25",
"execa": "^4.0.3",
"glob": "^7.1.6",
"js-yaml": "^4.1.0",
Expand All @@ -29,22 +30,23 @@
"tmp": "^0.2.1"
},
"devDependencies": {
"@babel/core": "^7.13.10",
"@babel/cli": "^7.26.4",
"@babel/core": "^7.26.0",
"@babel/plugin-transform-runtime": "^7.13.10",
"@babel/preset-env": "^7.13.12",
"@bedrockio/prettier-config": "^1.0.0",
"@koa/router": "^10.0.0",
"babel-jest": "^26.6.3",
"eslint": "^7.22.0",
"eslint-plugin-bedrock": "^1.0.26",
"jest": "^26.6.3",
"jest": "^29.7.0",
"joi": "^17.4.0"
},
"engines": {
"node": ">=16.0.0"
"node": ">=20.18.1"
},
"volta": {
"node": "22.2.0",
"node": "22.12.0",
"yarn": "1.22.22"
}
}
5 changes: 5 additions & 0 deletions scripts/build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
rm -rf dist
mkdir -p dist/cjs
echo "{ \"type\": \"commonjs\" }" > dist/cjs/package.json
babel src -d dist/cjs $@
Loading
Loading