Skip to content

Commit

Permalink
fix: use pure ES modules at the monorepo top level
Browse files Browse the repository at this point in the history
  • Loading branch information
ehmicky committed Dec 20, 2021
1 parent 20e9e67 commit d654f03
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 51 deletions.
45 changes: 7 additions & 38 deletions .eslintrc.js → .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
'use strict'

const { overrides } = require('@netlify/eslint-config-node')

module.exports = {
extends: ['plugin:fp/recommended', '@netlify/eslint-config-node'],
parserOptions: {
sourceType: 'module',
},
rules: {
strict: 2,

Expand Down Expand Up @@ -54,29 +55,15 @@ module.exports = {
],
},
],
'import/extensions': [2, 'ignorePackages'],
},
overrides: [
...overrides,
{
files: ['**/tests.{cjs,mjs,js}', '**/tests/**/*.{cjs,mjs,js}'],
rules: {
'node/no-missing-import': 0,
},
},
{
files: ['**/fixtures/**/*.{cjs,mjs,js}'],
rules: {
'import/no-unresolved': 0,
},
},
{
files: ['**/fixtures/**/*edge-handlers*/**/*.js', '**/fixtures/*es_module*/**/*.js'],
parserOptions: {
sourceType: 'module',
},
rules: {
'node/no-unsupported-features/es-syntax': 0,
'ava/no-import-test-files': 0,
'node/no-missing-import': 0,
},
},

Expand All @@ -86,7 +73,7 @@ module.exports = {
{
files: ['packages/build/**/*.{cjs,mjs,js}'],
rules: {
'max-lines-per-function': 'off',
'max-lines-per-function': 0,
},
},
{
Expand Down Expand Up @@ -127,25 +114,7 @@ module.exports = {
{
files: ['packages/*/tests/**/*.{cjs,mjs,js}'],
rules: {
'no-magic-numbers': 'off',
},
},

// Those packages are using pure ES modules
{
files: [
'packages/build/**/*.{cjs,mjs,js}',
'packages/cache-utils/**/*.{cjs,mjs,js}',
'packages/config/**/*.{cjs,mjs,js}',
'packages/functions-utils/**/*.{cjs,mjs,js}',
'packages/git-utils/**/*.{cjs,mjs,js}',
'packages/run-utils/**/*.{cjs,mjs,js}',
],
parserOptions: {
sourceType: 'module',
},
rules: {
'import/extensions': [2, 'ignorePackages'],
'no-magic-numbers': 0,
},
},
],
Expand Down
2 changes: 0 additions & 2 deletions commitlint.config.js → commitlint.config.cjs
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
'use strict'

module.exports = { extends: ['@commitlint/config-conventional'] }
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"private": true,
"version": "0.0.0",
"description": "Netlify build module",
"main": "index.js",
"type": "module",
"author": "Netlify Inc.",
"scripts": {
"test": "run-s format test:dev",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import isPlainObj from 'is-plain-obj'

// eslint-disable-next-line ava/no-import-test-files
import data from './data.json'

export const onRequest = function (event) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[[plugins]]
package = "./plugin"
package = "./plugin.cjs"
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[[plugins]]
package = "./plugin"
package = "./plugin.cjs"
16 changes: 8 additions & 8 deletions packages/build/tests/plugins/snapshots/tests.mjs.md
Original file line number Diff line number Diff line change
Expand Up @@ -252,21 +252,21 @@ Generated by [AVA](https://avajs.dev).
plugins:␊
- inputs: {}␊
origin: config␊
package: ./plugin␊
package: ./plugin.cjs
> Context␊
production␊
> Loading plugins␊
- ./plugin@1.0.0 from netlify.toml␊
- ./plugin.cjs@1.0.0 from netlify.toml␊
────────────────────────────────────────────────────────────────␊
1. ./plugin (onPreBuild event)
1. ./plugin.cjs (onPreBuild event) ␊
────────────────────────────────────────────────────────────────␊
true␊
(./plugin onPreBuild completed in 1ms)␊
(./plugin.cjs onPreBuild completed in 1ms)␊
────────────────────────────────────────────────────────────────␊
Netlify Build Complete ␊
Expand Down Expand Up @@ -2564,21 +2564,21 @@ Generated by [AVA](https://avajs.dev).
plugins:␊
- inputs: {}␊
origin: config␊
package: ./plugin␊
package: ./plugin.cjs
> Context␊
production␊
> Loading plugins␊
- ./plugin@1.0.0 from netlify.toml␊
- ./plugin.cjs@1.0.0 from netlify.toml␊
────────────────────────────────────────────────────────────────␊
1. ./plugin (onPreBuild event)
1. ./plugin.cjs (onPreBuild event) ␊
────────────────────────────────────────────────────────────────␊
JavaScript␊
(./plugin onPreBuild completed in 1ms)␊
(./plugin.cjs onPreBuild completed in 1ms)␊
────────────────────────────────────────────────────────────────␊
Netlify Build Complete ␊
Expand Down
Binary file modified packages/build/tests/plugins/snapshots/tests.mjs.snap
Binary file not shown.

0 comments on commit d654f03

Please sign in to comment.