Skip to content

Commit

Permalink
ngx-graph 9.0.0 (#555)
Browse files Browse the repository at this point in the history
* Updated and tested against Angular 18
* Fixed issues with the way nodes gain dimension
* Fixed misc bugs to allow for cleaner experience on load
* Replaced DocSPA with Storybook
* Migrated tslint to eslint
* Now built with yarn and Node 20

---------

Co-authored-by: Marjan Georgiev <[email protected]>
  • Loading branch information
steveblue and marjan-georgiev authored Nov 4, 2024
1 parent 863fafc commit 9944495
Show file tree
Hide file tree
Showing 98 changed files with 21,095 additions and 35,963 deletions.
30 changes: 30 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"root": true,
"extends": ["@swimlane", "prettier"],
"overrides": [
{
"files": ["*.ts"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": ["./tsconfig.json"]
},
"extends": [
"@swimlane/eslint-config/typescript",
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates",
"prettier"
],
"rules": {
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": "off",
"@angular-eslint/directive-class-suffix": "off",
"@angular-eslint/component-class-suffix": "off",
"@typescript-eslint/no-inferrable-types": "off",
"@angular-eslint/no-input-rename": "off",
"@angular-eslint/no-output-native": "off",
"@typescript-eslint/consistent-type-imports": "off",
"@typescript-eslint/no-duplicate-enum-values": "off"
}
}
]
}
29 changes: 0 additions & 29 deletions .eslintrc.yaml

This file was deleted.

30 changes: 20 additions & 10 deletions .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,38 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 14.x
node-version: 20.17.0

- name: Enable Corepack
run: corepack enable

- name: Install
run: npm install --legacy-peer-deps
- name: Install Yarn
run: corepack prepare [email protected] --activate

- name: Install dependencies
run: yarn install --immutable

- name: Build
run: |
node --max-old-space-size=4096 `which npm` run build --if-present
run: yarn build:storybook
env:
CI: true

- name: Test
run: |
node --max-old-space-size=4096 `which npm` run ci --if-present
run: yarn ci
env:
CI: true

- name: Prepare and deploy
run: |
npm run deploy-docs -- --name="Swimlane" --email="[email protected]"
if: ${{ github.ref == 'refs/heads/master' }}
uses: JamesIves/github-pages-deploy-action@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
folder: ./dist/storybook/@swimlane/ngx-graph
clean: true
env:
CI: true
GH_TOKEN: ${{ secrets.GH_TOKEN }}
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ dist/
build/
coverage/
.idea
yarn.lock
/ngx-charts.iml
ngx-charts.iml
__ngcc_entry_points__.json

*storybook.log
.yarn/
.yarn/install-state.gz
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
documentation.json
.vscode/
.angular/
dist/
File renamed without changes.
134 changes: 21 additions & 113 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,117 +3,6 @@
"version": 1,
"newProjectRoot": "projects",
"projects": {
"ngxGraph": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"prefix": "app",
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": false,
"outputPath": "dist/ngxGraph",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": ["src/favicon.ico", "src/assets", "src/docs", "src/.nojekyll"],
"styles": ["src/styles.css"],
"scripts": [],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "ngxGraph:build"
},
"configurations": {
"production": {
"browserTarget": "ngxGraph:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "ngxGraph:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": ["src/styles.css"],
"scripts": [],
"assets": ["src/favicon.ico", "src/assets"]
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": ["src/**/*.ts"]
}
}
}
},
"ngxGraph-e2e": {
"root": "e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "ngxGraph:serve"
},
"configurations": {
"production": {
"devServerTarget": "ngxGraph:serve:production"
}
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": ["e2e/**/*.ts"]
}
}
}
},
"@swimlane/ngx-graph": {
"root": "projects/swimlane/ngx-graph",
"sourceRoot": "projects/swimlane/ngx-graph/src",
Expand Down Expand Up @@ -146,9 +35,28 @@
"options": {
"lintFilePatterns": ["projects/swimlane/ngx-graph/**/*.ts"]
}
},
"storybook": {
"builder": "@storybook/angular:start-storybook",
"options": {
"configDir": "projects/swimlane/ngx-graph/.storybook",
"browserTarget": "@swimlane/ngx-graph:build",
"compodoc": true,
"compodocArgs": ["-e", "json", "-d", ".", "projects/swimlane/ngx-graph"],
"port": 6006
}
},
"build-storybook": {
"builder": "@storybook/angular:build-storybook",
"options": {
"configDir": "projects/swimlane/ngx-graph/.storybook",
"browserTarget": "@swimlane/ngx-graph:build",
"compodoc": true,
"compodocArgs": ["-e", "json", "-d", ".", "projects/swimlane/ngx-graph"],
"outputDir": "dist/storybook/@swimlane/ngx-graph"
}
}
}
}
},
"defaultProject": "ngxGraph"
}
}
18 changes: 18 additions & 0 deletions documentation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"pipes": [],
"interfaces": [],
"injectables": [],
"guards": [],
"interceptors": [],
"classes": [],
"directives": [],
"components": [],
"modules": [],
"miscellaneous": [],
"routes": [],
"coverage": {
"count": 0,
"status": "low",
"files": []
}
}
Loading

0 comments on commit 9944495

Please sign in to comment.