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
12 changes: 5 additions & 7 deletions browser/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import globals from "globals";
import babelParser from "babel-eslint";
import babelParser from "@babel/eslint-parser";
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
Expand Down Expand Up @@ -52,15 +52,13 @@ export default [{
},

parser: babelParser,
ecmaVersion: 6,
ecmaVersion: 2020,
sourceType: "module",

parserOptions: {
ecmaFeatures: {
globalReturn: false,
impliedStrict: true,
jsx: false,
experimentalObjectRestSpread: true,
requireConfigFile: false,
babelOptions: {
presets: ["@babel/preset-env"],
},
},
},
Expand Down
12 changes: 10 additions & 2 deletions browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,15 @@
"dateformat": "3.0.3"
},
"devDependencies": {
"eslint": "9.7.0",
"rollup": "0.68.2"
"@babel/core": "^7.23.0",
"@babel/preset-env": "^7.23.0",
"@rollup/plugin-babel": "^6.0.0",
"@rollup/plugin-commonjs": "^25.0.0",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.2.0",
"@rollup/plugin-terser": "^0.4.0",
"eslint": "9.34.0",
"rollup": "^4.0.0",
"rollup-plugin-visualizer": "^5.9.0"
}
}
42 changes: 22 additions & 20 deletions browser/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
// eslint-disable-next-line no-undef
const babel = require("rollup-plugin-babel");
const babel = require("@rollup/plugin-babel");
// eslint-disable-next-line no-undef
const commonjs = require("rollup-plugin-commonjs");
const commonjs = require("@rollup/plugin-commonjs");
// eslint-disable-next-line no-undef
const conditional = require("rollup-plugin-conditional");
const json = require("@rollup/plugin-json");
// eslint-disable-next-line no-undef
const json = require("rollup-plugin-json");
const resolve = require("@rollup/plugin-node-resolve");
// eslint-disable-next-line no-undef
const resolve = require("rollup-plugin-node-resolve");
const terser = require("@rollup/plugin-terser");
// eslint-disable-next-line no-undef
const size = require("rollup-plugin-bundle-size");
// eslint-disable-next-line no-undef
const uglify = require("rollup-plugin-uglify");
const { visualizer } = require("rollup-plugin-visualizer");

// eslint-disable-next-line no-undef
module.exports = {
Expand All @@ -30,9 +28,9 @@ module.exports = {
plugins: [
json(),
resolve({
jsnext: true,
exportConditions: ["browser"],
browser: true,
preferBuiltins: true,
preferBuiltins: false,
extensions: [
".js",
".json",
Expand All @@ -43,24 +41,25 @@ module.exports = {
"node_modules/**",
"src/**",
],
requireReturnsDefault: "auto",
}),
babel({
babelrc: false,
babelHelpers: "bundled",
exclude: "node_modules/**",
presets: [
[
"env", {
"@babel/preset-env", {
"modules": false,
"targets": {
"browsers": ["last 2 versions", "ie >= 11"],
},
},
],
],
plugins: [
"external-helpers",
"transform-object-rest-spread",
],
}),
// eslint-disable-next-line no-undef
conditional(process.env.NODE_ENV === "production", [
uglify({
...(process.env.NODE_ENV === "production" ? [
terser({
compress: {
pure_getters: true, // eslint-disable-line camelcase
unsafe: true,
Expand All @@ -69,7 +68,10 @@ module.exports = {
},
mangle: false,
}),
]),
size(),
] : []),
visualizer({
filename: "../dist/bundle-analysis.html",
open: false,
}),
],
};
8 changes: 7 additions & 1 deletion browser/src/high-console/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import { config } from "./config";
import dateFormat from "dateformat";
// Using require() instead of ES6 import because dateformat is a legacy CommonJS module
// that doesn't support ES6 exports. The package uses module.exports = dateFormat
// which creates { [Function], masks: {...}, i18n: {...} } instead of { default: dateFormat }
// that ES6 import expects. This causes rollup's CommonJS plugin to fail with
// "default is not exported" error. Using require() bypasses this conversion issue.
// eslint-disable-next-line no-undef
const dateFormat = require("dateformat");

export function debug(options) {
print("debug", options.msg, options.obj, options.timestamp);
Expand Down
12 changes: 5 additions & 7 deletions nodejs/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import globals from "globals";
import babelParser from "babel-eslint";
import babelParser from "@babel/eslint-parser";
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
Expand Down Expand Up @@ -52,15 +52,13 @@ export default [{
},

parser: babelParser,
ecmaVersion: 6,
ecmaVersion: 2020,
sourceType: "module",

parserOptions: {
ecmaFeatures: {
globalReturn: false,
impliedStrict: true,
jsx: false,
experimentalObjectRestSpread: true,
requireConfigFile: false,
babelOptions: {
presets: ["@babel/preset-env"],
},
},
},
Expand Down
12 changes: 10 additions & 2 deletions nodejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,15 @@
"winston-transport": "4.3.0"
},
"devDependencies": {
"eslint": "9.7.0",
"rollup": "0.68.2"
"@babel/core": "^7.23.0",
"@babel/preset-env": "^7.23.0",
"@rollup/plugin-babel": "^6.0.0",
"@rollup/plugin-commonjs": "^25.0.0",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.2.0",
"@rollup/plugin-terser": "^0.4.0",
"eslint": "9.34.0",
"rollup": "^4.0.0",
"rollup-plugin-visualizer": "^5.9.0"
}
}
46 changes: 21 additions & 25 deletions nodejs/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,23 @@
// eslint-disable-next-line no-undef
const babel = require("rollup-plugin-babel");
const babel = require("@rollup/plugin-babel");
// eslint-disable-next-line no-undef
const builtins = require("rollup-plugin-node-builtins");
const commonjs = require("@rollup/plugin-commonjs");
// eslint-disable-next-line no-undef
const commonjs = require("rollup-plugin-commonjs");
const json = require("@rollup/plugin-json");
// eslint-disable-next-line no-undef
const conditional = require("rollup-plugin-conditional");
const resolve = require("@rollup/plugin-node-resolve");
// eslint-disable-next-line no-undef
const globals = require("rollup-plugin-node-globals");
const terser = require("@rollup/plugin-terser");
// eslint-disable-next-line no-undef
const json = require("rollup-plugin-json");
// eslint-disable-next-line no-undef
const resolve = require("rollup-plugin-node-resolve");
// eslint-disable-next-line no-undef
const size = require("rollup-plugin-bundle-size");
// eslint-disable-next-line no-undef
const uglify = require("rollup-plugin-uglify");
const { visualizer } = require("rollup-plugin-visualizer");

// eslint-disable-next-line no-undef
module.exports = {
input: "src/index.js",
output: {
file: "../dist/shd-logger.cjs.js",
format: "cjs",
exports: "default",
},
external: [
"signale",
Expand All @@ -32,10 +27,8 @@ module.exports = {
],
plugins: [
json(),
globals(),
builtins(),
resolve({
jsnext: true,
exportConditions: ["node"],
preferBuiltins: true,
extensions: [
".js",
Expand All @@ -49,22 +42,22 @@ module.exports = {
],
}),
babel({
babelrc: false,
babelHelpers: "bundled",
exclude: "node_modules/**",
presets: [
[
"env", {
"@babel/preset-env", {
"modules": false,
"targets": {
"node": "14",
},
},
],
],
plugins: [
"external-helpers",
"transform-object-rest-spread",
],
}),
// eslint-disable-next-line no-undef
conditional(process.env.NODE_ENV === "production", [
uglify({
...(process.env.NODE_ENV === "production" ? [
terser({
compress: {
pure_getters: true, // eslint-disable-line camelcase
unsafe: true,
Expand All @@ -73,7 +66,10 @@ module.exports = {
},
mangle: false,
}),
]),
size(),
] : []),
visualizer({
filename: "../dist/bundle-analysis.html",
open: false,
}),
],
};
9 changes: 8 additions & 1 deletion nodejs/src/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import { config } from "./config";
import { createLogger, transports } from "winston";
import "winston-daily-rotate-file";
import dateFormat from "dateformat";
// Using require() instead of ES6 import because dateformat is a legacy CommonJS module
// that doesn't support ES6 exports. The package uses module.exports = dateFormat
// which creates { [Function], masks: {...}, i18n: {...} } instead of { default: dateFormat }
// that ES6 import expects. This causes current implementation of conf
// rollup's CommonJS plugin to fail with
// "default is not exported" error. Using require() bypasses this conversion issue.
// eslint-disable-next-line no-undef
const dateFormat = require("dateformat");
import { Signale } from "signale";
import { SignaleTransport } from "./signale";

Expand Down
Loading