Skip to content

Commit

Permalink
Merge pull request #4208 from GordonSmith/BUMP_VERSIONS
Browse files Browse the repository at this point in the history
chore: Bump versions
  • Loading branch information
GordonSmith authored Jul 2, 2024
2 parents a1485bf + a087e61 commit 431ebd9
Show file tree
Hide file tree
Showing 134 changed files with 10,190 additions and 8,297 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ module.exports = {
],
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-namespace": "off",
"@typescript-eslint/no-var-require": "off"
"@typescript-eslint/no-var-require": "off",
"@typescript-eslint/no-unsafe-declaration-merging": "off"
}
};
2 changes: 1 addition & 1 deletion .github/workflows/testPullRequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
node: ["20", "18", "16"]
node: ["22", "20", "18"]
fail-fast: false

steps:
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.eclcc
.nx
node_modules
dist/
build/
Expand Down Expand Up @@ -33,4 +34,5 @@ tmp*.json
/website/api
/demos/gym/data/**/*
/demos/rwc2019
demos/h3/data
demos/h3/data
.nx/cache
8 changes: 4 additions & 4 deletions apps/CustomGraph/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"private": true,
"name": "@hpcc-js/demo-customgraph",
"scripts": {
"clean": "rimraf lib* types dist *.tsbuildinfo",
"clean": "rimraf --glob lib* types dist *.tsbuildinfo",
"copy-res-local": "copyfiles -u 6 \"../../node_modules/@hpcc-js/graph/dist/graphvizlib.wasm\" ./dist/",
"copy-res": "copyfiles -u 4 \"./node_modules/@hpcc-js/graph/dist/graphvizlib.wasm\" ./dist/",
"compile-es6": "tsc --module es6 --outDir ./lib-es6",
Expand All @@ -13,7 +13,7 @@
"bundle-watch": "npm run bundle -- -w",
"build": "run-s copy-res-local copy-res compile-es6 bundle",
"watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
"rm-hpcc": "rimraf ./node_modules/@hpcc-js",
"rm-hpcc": "rimraf --glob ./node_modules/@hpcc-js",
"serve": "ws",
"update": "npx --yes npm-check-updates -u -t minor",
"update-major": "npx --yes npm-check-updates -u"
Expand All @@ -29,8 +29,8 @@
"copyfiles": "2.4.1",
"npm-run-all": "4.1.5",
"local-web-server": "5.2.1",
"rimraf": "3.0.2",
"source-map-loader": "4.0.0",
"rimraf": "5.0.7",
"source-map-loader": "5.0.0",
"webpack": "5.76.0",
"webpack-cli": "4.10.0"
}
Expand Down
6 changes: 3 additions & 3 deletions apps/WeCare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"private": true,
"name": "@hpcc-js/demo-wecare",
"scripts": {
"clean": "rimraf lib* types dist *.tsbuildinfo",
"clean": "rimraf --glob lib* types dist *.tsbuildinfo",
"compile-es6": "tsc --module es6 --outDir ./lib-es6",
"compile-es6-watch": "npm run compile-es6 -- -w",
"compile-umd": "tsc --module umd --outDir ./lib-umd",
Expand Down Expand Up @@ -31,8 +31,8 @@
"devDependencies": {
"@types/d3": "4.9.0",
"npm-run-all": "4.1.5",
"rimraf": "2.6.3",
"source-map-loader": "0.2.4",
"rimraf": "5.0.7",
"source-map-loader": "5.0.0",
"webpack": "4.41.5",
"webpack-cli": "3.3.10"
}
Expand Down
6 changes: 3 additions & 3 deletions apps/dashPOC/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"private": true,
"name": "dashpoc",
"scripts": {
"clean": "rimraf lib* types dist *.tsbuildinfo",
"clean": "rimraf --glob lib* types dist *.tsbuildinfo",
"compile-es6": "tsc --module es6 --outDir ./lib-es6",
"compile-es6-watch": "npm run compile-es6 -- -w",
"compile-umd": "tsc --module umd --outDir ./lib-umd",
Expand All @@ -23,8 +23,8 @@
"tslib": "2.3.0"
},
"devDependencies": {
"rimraf": "2.6.3",
"rollup": "0.59.2",
"rimraf": "5.0.7",
"rollup": "4.18.0",
"webpack": "4.41.5",
"webpack-cli": "3.3.10"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/react-next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"autoprefixer": "^10.0.1",
"postcss": "^8",
"tailwindcss": "^3.3.0",
"eslint": "^8",
"eslint": "9.6.0",
"eslint-config-next": "14.0.4"
}
}
2 changes: 1 addition & 1 deletion apps/react-widget/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"typescript": "^4.9.5"
},
"scripts": {
"clean": "rimraf ./node_modules/.cache",
"clean": "rimraf --glob ./node_modules/.cache",
"build": "npx --yes react-scripts build",
"eject": "npx react-scripts eject",
"start": "npm run clean && npx react-scripts start",
Expand Down
4 changes: 2 additions & 2 deletions components/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"types/*"
],
"scripts": {
"clean": "rimraf build dist lib* types temp tmp *.tsbuildinfo",
"clean": "rimraf --glob build dist lib* types temp tmp *.tsbuildinfo",
"compile-es6": "tsc -p ./tsconfig.json",
"compile-es6-watch": "npm run compile-es6 -- -w",
"bundle": "rollup -c ../rollup.config.js --folder=core",
Expand Down Expand Up @@ -60,4 +60,4 @@
"url": "https://github.com/hpcc-systems/Visualization/issues"
},
"homepage": "https://github.com/hpcc-systems/Visualization#readme"
}
}
16 changes: 8 additions & 8 deletions components/editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"types/*"
],
"scripts": {
"clean": "rimraf build dist lib* types temp tmp *.tsbuildinfo",
"clean": "rimraf --glob build dist lib* types temp tmp *.tsbuildinfo",
"compile-es6": "tsc -p ./tsconfig.json",
"compile-es6-watch": "npm run compile-es6 -- -w",
"bundle": "rollup -c ../rollup.config.js --folder=editor",
Expand All @@ -29,18 +29,18 @@
"update": "npx --yes npm-check-updates -u -t minor"
},
"dependencies": {
"@codemirror/autocomplete": "6.15.0",
"@codemirror/commands": "6.3.3",
"@codemirror/lang-html": "6.4.8",
"@codemirror/autocomplete": "6.16.3",
"@codemirror/commands": "6.6.0",
"@codemirror/lang-html": "6.4.9",
"@codemirror/lang-javascript": "6.2.2",
"@codemirror/lang-json": "6.0.1",
"@codemirror/lint": "6.5.0",
"@codemirror/lint": "6.8.1",
"@codemirror/search": "6.5.6",
"@codemirror/state": "6.4.1",
"@codemirror/theme-one-dark": "6.1.2",
"@codemirror/view": "6.26.0",
"@codemirror/view": "6.28.2",
"@hpcc-js/wc-core": "^0.4.12",
"tslib": "2.6.2"
"tslib": "2.6.3"
},
"repository": {
"type": "git",
Expand All @@ -55,4 +55,4 @@
"url": "https://github.com/hpcc-systems/Visualization/issues"
},
"homepage": "https://github.com/hpcc-systems/Visualization#readme"
}
}
6 changes: 3 additions & 3 deletions components/layout/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"types/*"
],
"scripts": {
"clean": "rimraf build dist lib* types temp tmp *.tsbuildinfo",
"clean": "rimraf --glob build dist lib* types temp tmp *.tsbuildinfo",
"compile-es6": "tsc -p ./tsconfig.json",
"compile-es6-watch": "npm run compile-es6 -- -w",
"bundle": "rollup -c ../rollup.config.js --folder=layout",
Expand All @@ -34,7 +34,7 @@
"@lumino/messaging": "1.10.3",
"@lumino/widgets": "1.37.2",
"d3": "7.9.0",
"tslib": "2.6.2"
"tslib": "2.6.3"
},
"repository": {
"type": "git",
Expand All @@ -49,4 +49,4 @@
"url": "https://github.com/hpcc-systems/Visualization/issues"
},
"homepage": "https://github.com/hpcc-systems/Visualization#readme"
}
}
6 changes: 3 additions & 3 deletions components/observable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"types/*"
],
"scripts": {
"clean": "rimraf build dist lib* types temp tmp *.tsbuildinfo",
"clean": "rimraf --glob build dist lib* types temp tmp *.tsbuildinfo",
"compile-es6": "tsc -p ./tsconfig.json",
"compile-es6-watch": "npm run compile-es6 -- -w",
"bundle": "rollup -c ../rollup.config.js --folder=observable",
Expand All @@ -32,7 +32,7 @@
"@hpcc-js/observablehq-compiler": "^1.2.12",
"@hpcc-js/wc-core": "^0.4.12",
"@observablehq/runtime": "5.9.8",
"tslib": "2.6.2"
"tslib": "2.6.3"
},
"repository": {
"type": "git",
Expand All @@ -47,4 +47,4 @@
"url": "https://github.com/hpcc-systems/Visualization/issues"
},
"homepage": "https://github.com/hpcc-systems/Visualization#readme"
}
}
6 changes: 3 additions & 3 deletions components/preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"types/*"
],
"scripts": {
"clean": "rimraf build dist lib* types temp tmp *.tsbuildinfo",
"clean": "rimraf --glob build dist lib* types temp tmp *.tsbuildinfo",
"compile-es6": "tsc -p ./tsconfig.json",
"compile-es6-watch": "npm run compile-es6 -- -w",
"bundle": "rollup -c ../rollup.config.js --folder=preview",
Expand All @@ -32,7 +32,7 @@
"@hpcc-js/wc-core": "^0.4.12",
"@hpcc-js/wc-editor": "^0.4.13",
"@hpcc-js/wc-layout": "^0.4.12",
"tslib": "2.6.2"
"tslib": "2.6.3"
},
"repository": {
"type": "git",
Expand All @@ -47,4 +47,4 @@
"url": "https://github.com/hpcc-systems/Visualization/issues"
},
"homepage": "https://github.com/hpcc-systems/Visualization#readme"
}
}
103 changes: 54 additions & 49 deletions components/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import alias from "@rollup/plugin-alias";
import resolve from "@rollup/plugin-node-resolve";
import commonJS from "@rollup/plugin-commonjs";
import transformTaggedTemplate from "rollup-plugin-transform-tagged-template";
import sourcemaps from "rollup-plugin-sourcemaps";
import { terser } from "rollup-plugin-terser";
const alias = require("@rollup/plugin-alias");
const commonJS = require("@rollup/plugin-commonjs");
const resolve = require("@rollup/plugin-node-resolve");
const transformTaggedTemplateMod = require("rollup-plugin-transform-tagged-template");
const sourcemaps = require("rollup-plugin-sourcemaps");
const terser = require("@rollup/plugin-terser");

function transformHTMLFragment(data) {
data = data.replace(/\s*([<>])\s*/g, "$1"); // remove spaces before and after angle brackets
Expand All @@ -28,71 +28,76 @@ const parserOptions = {
sourceType: "module",
};

export const plugins = [
console.log(Object.keys(terser));

const plugins = [
alias({
entries: [
]
}),
resolve(),
commonJS(),
transformTaggedTemplate({
transformTaggedTemplateMod.default({
tagsToProcess: ["css"],
transformer: transformCSSFragment,
parserOptions,
}),
transformTaggedTemplate({
transformTaggedTemplateMod.default({
tagsToProcess: ["html"],
transformer: transformHTMLFragment,
parserOptions,
}),
sourcemaps()
];

export const treeshake = {
const treeshake = {
moduleSideEffects: (id, _external) => {
if (id.indexOf(".css") >= 0) return true;
return false;
}
};

export default async commandLineArgs => {
const pkg = await import(`./${commandLineArgs.folder}/package.json`);
module.exports = {
default: async (commandLineArgs) => {
const pkg = require(`./${commandLineArgs.folder}/package.json`);


return [
{
input: "dist/esm/index.js",
output: [
{
file: pkg.exports.script.split(".min").join(""),
format: "umd",
sourcemap: true,
plugins: [],
name: pkg.name
},
{
file: pkg.exports.script,
format: "umd",
sourcemap: true,
plugins: [terser()],
name: pkg.name
},
{
file: pkg.main,
format: "es",
sourcemap: true,
plugins: [],
name: pkg.name
},
{
file: pkg.main.split(".esm").join(".esm.min"),
format: "es",
sourcemap: true,
plugins: [terser()],
name: pkg.name
},
],
treeshake,
plugins,
},
];
return [
{
input: "dist/esm/index.js",
output: [
{
file: pkg.exports.script.split(".min").join(""),
format: "umd",
sourcemap: true,
plugins: [],
name: pkg.name
},
{
file: pkg.exports.script,
format: "umd",
sourcemap: true,
plugins: [terser()],
name: pkg.name
},
{
file: pkg.main,
format: "es",
sourcemap: true,
plugins: [],
name: pkg.name
},
{
file: pkg.main.split(".esm").join(".esm.min"),
format: "es",
sourcemap: true,
plugins: [terser()],
name: pkg.name
},
],
treeshake,
plugins,
},
];
}
};
Loading

0 comments on commit 431ebd9

Please sign in to comment.