Skip to content

Commit f1d4ddb

Browse files
authored
Merge branch 'dev' into dependabot/pip/server/pip-d578abb6d7
2 parents 9e1f348 + caf5063 commit f1d4ddb

16 files changed

Lines changed: 17067 additions & 30996 deletions

.eslintrc.js

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
module.exports = {
2-
parser: 'babel-eslint',
2+
parser: '@babel/eslint-parser',
3+
parserOptions: {
4+
requireConfigFile: false, // allows using without a separate babel config
5+
babelOptions: {
6+
presets: ['@babel/preset-react'], // React JSX support
7+
},
8+
ecmaFeatures: {
9+
jsx: true,
10+
},
11+
ecmaVersion: 12,
12+
sourceType: 'module',
13+
},
314
env: {
415
browser: true,
516
es2021: true,
@@ -8,29 +19,13 @@ module.exports = {
819
'plugin:react/recommended',
920
'airbnb',
1021
],
11-
parserOptions: {
12-
ecmaFeatures: {
13-
jsx: true,
14-
},
15-
ecmaVersion: 12,
16-
sourceType: 'module',
17-
},
1822
plugins: [
1923
'react',
2024
],
2125
rules: {
22-
indent: [
23-
'error',
24-
4,
25-
],
26-
'react/jsx-indent': [
27-
'error',
28-
4,
29-
],
30-
'react/jsx-indent-props': [
31-
'error',
32-
4,
33-
],
26+
indent: ['error', 4],
27+
'react/jsx-indent': ['error', 4],
28+
'react/jsx-indent-props': ['error', 4],
3429
'max-len': [
3530
'error',
3631
{
@@ -54,14 +49,9 @@ module.exports = {
5449
},
5550
overrides: [
5651
{
57-
files: [
58-
'*ML.js',
59-
],
52+
files: ['*ML.js'],
6053
rules: {
61-
indent: [
62-
'error',
63-
2,
64-
],
54+
indent: ['error', 2],
6555
},
6656
},
6757
],

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
build:
1414
strategy:
1515
matrix:
16-
node-version: [14.x]
16+
node-version: [18.x]
1717
os: [ubuntu-latest]
1818
runs-on: ${{ matrix.os }}
1919

@@ -24,4 +24,4 @@ jobs:
2424
with:
2525
node-version: ${{ matrix.node-version }}
2626
- run: npm ci
27-
- run: npm run build --if-present
27+
- run: NODE_OPTIONS=--openssl-legacy-provider npm run build --if-present
Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,33 @@
11
name: Build and Deploy
22

33
on: workflow_dispatch
4+
45
jobs:
56
build-and-deploy:
67
runs-on: ubuntu-latest
78
strategy:
89
matrix:
9-
node-version: [16.x]
10+
node-version: [18.x]
1011
steps:
1112
- name: Checkout 🛎️
12-
uses: actions/checkout@v2.3.1
13+
uses: actions/checkout@v4
14+
1315
- name: Use Node.js ${{ matrix.node-version }}
1416
uses: actions/setup-node@v3
1517
with:
1618
node-version: ${{ matrix.node-version }}
19+
20+
- name: Clear npm cache
21+
run: npm cache clean --force
22+
1723
- name: Install and Build 🔧
1824
run: |
25+
export NODE_OPTIONS=--openssl-legacy-provider
1926
npm ci
2027
npm run build
2128
2229
- name: Deploy 🚀
23-
uses: JamesIves/github-pages-deploy-action@4.1.3
30+
uses: JamesIves/github-pages-deploy-action@v4
2431
with:
25-
branch: gh-pages # The branch the action should deploy to.
26-
folder: build # The folder the action should deploy.
32+
branch: gh-pages
33+
folder: build

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# The _concore_ Editor
22

3-
This is a fork of DHGWorkflow, visual Directed Hypergraph Workflow Composer, finetuned to operate as a frontend for _concore_.
3+
This is a Directed Hypergraph Workflow Composer, which operates as a visual frontend for _concore_.
44

55
Key Features of the _concore_ Editor:
66
* Export-import graph as a graphml file.
@@ -14,7 +14,7 @@ and many more!
1414

1515

1616
## Installing it locally
17-
This is a frontend tool built with React Js.
17+
This is a tool built with React Js.
1818
Steps to start it locally
1919
1. Clone the repository
2020
2. At the root of the repository, run the following commands:

craco.config.js

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
const webpack = require('webpack');
2+
3+
module.exports = {
4+
webpack: {
5+
configure: (webpackConfig) => {
6+
const newConfig = { ...webpackConfig }; // copy the original config
7+
8+
newConfig.resolve = {
9+
...newConfig.resolve,
10+
fallback: {
11+
...newConfig.resolve.fallback,
12+
timers: require.resolve('timers-browserify'),
13+
util: require.resolve('util/'),
14+
stream: require.resolve('stream-browserify'),
15+
buffer: require.resolve('buffer/'),
16+
process: require.resolve('process/browser.js'),
17+
},
18+
};
19+
20+
newConfig.plugins = [
21+
...newConfig.plugins,
22+
new webpack.ProvidePlugin({
23+
Buffer: ['buffer', 'Buffer'],
24+
process: 'process/browser.js',
25+
}),
26+
];
27+
28+
return newConfig;
29+
},
30+
},
31+
};

0 commit comments

Comments
 (0)