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 .plop/regexps-strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const RELATIVE_LAB_COLOR = `(?:[lab]|${NUMBER_WITH_DECIMALS}|${CALC_LAB_COLOR})`
const RELATIVE_LCH_COLOR = `(?:[lch]|${NUMBER_WITH_DECIMALS}|${CALC_LCH_COLOR})`;
const RELATIVE_ALPHA = `(?:${NUMBER_WITH_DECIMALS}%?|${CALC_ALPHA_COLOR}|alpha)`;

module.exports = {
export default {
COLOR_REGEXP_STRINGS: {
HEX: `
^#(?:
Expand Down
10 changes: 6 additions & 4 deletions aliases.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
const path = require('path');
const tsconfig = require('./tsconfig');
import path from 'node:path';
import tsconfig from './tsconfig.json' with { type: 'json' };

const { compilerOptions: { paths } } = tsconfig;

const aliasReg = (str) => str.replace(/^(.*)\/\*$/, '$1');
module.exports = Object.keys(paths).reduce(
(obj, a) => (obj[aliasReg(a)] = path.resolve(__dirname, aliasReg(paths[a][0])), obj),

export default Object.keys(paths).reduce(
(obj, a) => (obj[aliasReg(a)] = path.resolve(aliasReg(paths[a][0])), obj),
{}
);
8 changes: 4 additions & 4 deletions eslint.config.js → eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const tseslint = require('typescript-eslint');
const js = require('@eslint/js');
const globals = require('globals');
import tseslint from 'typescript-eslint';
import js from '@eslint/js';
import globals from 'globals';

module.exports = [
export default [
{
languageOptions: {
globals: {
Expand Down
6 changes: 3 additions & 3 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { pathsToModuleNameMapper } = require('ts-jest');
const tsconfig = require('./tsconfig');
import { pathsToModuleNameMapper } from 'ts-jest';
import tsconfig from './tsconfig.json' with { type: 'json' };

module.exports = {
export default {
roots: ['<rootDir>/tests'],
moduleNameMapper: pathsToModuleNameMapper(
tsconfig.compilerOptions.paths,
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "colortranslator",
"version": "6.1.1",
"description": "A JavaScript library, written in TypeScript, to convert among different color models",
"type": "module",
"main": "index.js",
"module": "esm/index.js",
"types": "index.d.ts",
Expand Down Expand Up @@ -30,7 +31,7 @@
"lint": "eslint \"src/**/*.{js,ts}\" \"tests/**/*.ts\"",
"clean": "./scripts/clean.sh",
"finish": "./scripts/finish.sh",
"build": "pnpm clean && rollup --config rollup.config.js --bundleConfigAsCjs && pnpm finish",
"build": "pnpm clean && rollup --config rollup.config.mjs && pnpm finish",
"demo": "webpack serve --open --config webpack.demo.config.js",
"docs": "webpack --config webpack.demo.publish.js --mode production && pnpm build",
"compile:regexps": "pnpm plop",
Expand Down Expand Up @@ -86,7 +87,7 @@
"postcss-calc": "^10.1.1",
"postcss-for": "^2.1.1",
"postcss-loader": "^8.2.1",
"postcss-nested": "^7.0.2",
"postcss-nested": "^8.0.0",
"postcss-simple-vars": "^7.0.1",
"rimraf": "^6.1.3",
"rollup": "^4.62.4",
Expand Down
6 changes: 4 additions & 2 deletions plopfile.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import regExpStrings from './.plop/regexps-strings.js';

const {
COLOR_REGEXP_STRINGS,
HSL_HUE,
CALC,
toRegExp
} = require('./.plop/regexps-strings');
} = regExpStrings;

module.exports = (plop) => {
export default (plop) => {
plop.setGenerator('Compile RegExps', {
description: 'Compile the regular library regular expressions from a template file',
prompts: [],
Expand Down
12 changes: 6 additions & 6 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions postcss.config.js

This file was deleted.

17 changes: 17 additions & 0 deletions postcss.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/** @type {import('postcss-load-config').Config} */

import postcssNested from 'postcss-nested';
import autoprefixer from 'autoprefixer';
import postcssSimpleVars from 'postcss-simple-vars';
import postcssCalc from 'postcss-calc';
import postcssFor from 'postcss-for';

export default {
plugins: [
postcssNested,
autoprefixer,
postcssSimpleVars,
postcssCalc,
postcssFor
]
};
2 changes: 1 addition & 1 deletion rollup.config.js → rollup.config.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import pkg from './package.json';
import pkg from './package.json' with { type: 'json' };
import ts from '@rollup/plugin-typescript';
import { dts } from 'rollup-plugin-dts';
import tsConfigPaths from 'rollup-plugin-tsconfig-paths';
Expand Down
2 changes: 0 additions & 2 deletions scripts/finish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@

mkdir -p dist/web/

rm web/colortranslator.d.ts
cp web/colortranslator.js dist/web/colortranslator.js
echo '{\n "type": "module"\n}' > esm/package.json
26 changes: 13 additions & 13 deletions src/@demo/demo.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import '../../node_modules/google-code-prettify/bin/run_prettify.min';
import '../../node_modules/google-code-prettify/bin/run_prettify.min.js';
import '../../node_modules/google-code-prettify/bin/prettify.min.css';
import '../../node_modules/google-code-prettify/styles/desert.css';
import 'whatwg-fetch';
import './styles.css';
import { ColorTranslator, Harmony, Mix } from '../';
import demo1 from './demo1';
import demo2 from './demo2';
import demo3 from './demo3';
import demo4 from './demo4';
import demo5 from './demo5';
import demo6 from './demo6';
import demo7 from './demo7';
import demo8 from './demo8';
import demo9 from './demo9';
import demo10 from './demo10';
import demo11 from './demo11';
import { ColorTranslator, Harmony, Mix } from '../index.ts';
import demo1 from './demo1/index.js';
import demo2 from './demo2/index.js';
import demo3 from './demo3/index.js';
import demo4 from './demo4/index.js';
import demo5 from './demo5/index.js';
import demo6 from './demo6/index.js';
import demo7 from './demo7/index.js';
import demo8 from './demo8/index.js';
import demo9 from './demo9/index.js';
import demo10 from './demo10/index.js';
import demo11 from './demo11/index.js';

const functioToString = (fn) => {
const article = document.createElement('article');
Expand Down
12 changes: 6 additions & 6 deletions webpack.demo.config.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
const path = require('path');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const aliases = require('./aliases');
import path from 'node:path';
import HtmlWebpackPlugin from 'html-webpack-plugin';
import CopyWebpackPlugin from 'copy-webpack-plugin';
import aliases from './aliases.js';

module.exports = {
export default {
mode: 'development',
entry: './src/@demo/demo.js',
output: {
filename: 'scripts/bundle.js',
path: path.resolve(__dirname, 'docs'),
path: path.resolve('docs'),
libraryTarget: 'window'
},
resolve: {
Expand Down
16 changes: 8 additions & 8 deletions webpack.demo.publish.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
const path = require('path');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const aliases = require('./aliases');
import path from 'node:path';
import HtmlWebpackPlugin from 'html-webpack-plugin';
import MiniCssExtractPlugin from 'mini-css-extract-plugin';
import CopyWebpackPlugin from 'copy-webpack-plugin';
import { CleanWebpackPlugin } from 'clean-webpack-plugin';
import aliases from './aliases.js';

module.exports = {
export default {
devtool: 'eval-source-map',
target: 'web',
entry: './src/@demo/demo.js',
output: {
filename: 'scripts/bundle.js',
path: path.resolve(__dirname, 'docs'),
path: path.resolve('docs'),
libraryTarget: 'window'
},
module: {
Expand Down
Loading