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
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "16.12"
- uses: pnpm/action-setup@v2.0.1
node-version: "20"
- uses: pnpm/action-setup@v2
with:
version: 6.20.3
version: 8.14.0
- run: pnpm install --frozen-lockfile
- run: pnpm test
- run: pnpm run check-format
Expand Down
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

pnpm exec pretty-quick -- --staged && pnpm test
pnpm exec lint-staged
2 changes: 1 addition & 1 deletion babel.config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"presets": [],
"presets": ["@babel/preset-typescript", "@babel/preset-react"],
"plugins": []
}
6 changes: 6 additions & 0 deletions lib/node-loader-babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ const supportedModuleFormats = ["module", "commonjs"];

export async function load(url, context, defaultLoad) {
if (useLoader(url)) {
if (url.endsWith(".ts") || url.endsWith(".tsx")) {
// defaultLoad throws ERR_UNKNOWN_FILE_EXTENSION unless we tell it a module format
// We assume typescript users are using ESM rather than CJS, for simplicity
context.format = "module";
}

const { source, format } = await defaultLoad(url, context, defaultLoad);

// NodeJS' implementation of defaultLoad returns a source of `null` for CommonJS modules.
Expand Down
23 changes: 15 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,24 @@
},
"homepage": "https://github.com/node-loaders/node-loader-babel#readme",
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/eslint-parser": "^7.14.7",
"@babel/plugin-transform-react-jsx": "^7.10.4",
"eslint": "^7.30.0",
"@babel/core": "^7.23.7",
"@babel/eslint-parser": "^7.23.3",
"@babel/plugin-transform-react-jsx": "^7.23.4",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"eslint": "^8.56.0",
"eslint-config-node-important-stuff": "^2.0.0",
"husky": "^7.0.0",
"mocha": "^9.0.2",
"prettier": "^2.1.2",
"pretty-quick": "^3.0.2"
"husky": "^8.0.3",
"lint-staged": "^15.2.0",
"mocha": "^10.2.0",
"prettier": "^3.1.1",
"react": "^18.2.0"
},
"publishConfig": {
"access": "public"
},
"lint-staged": {
"*.js": "eslint --cache --fix",
"*.{js,css,md,yml,json,eslintrc}": "prettier --write"
}
}
Loading