Merge pull request #387 from blocknetdx/dev

Merge dev to master
blocknetdx · Dec 7, 2023 · 77941c3 · 77941c3
2 parents a5c4751 + 9e711ce
commit 77941c3
Show file tree

Hide file tree

Showing 321 changed files with 23,729 additions and 18,525 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 12
+          node-version: lts/hydrogen
 
       - run: echo GIT_BRANCH="${{ github.ref_name }}" > electron-builder.env
       - run: npm install --no-audit
@@ -38,6 +38,7 @@ jobs:
             dist-native/*.tar.gz
             dist-native/*.AppImage
             dist-native/*.deb
+            dist-native/latest*.yml
 
       - uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/v')
@@ -49,6 +50,7 @@ jobs:
             dist-native/*.tar.gz
             dist-native/*.AppImage
             dist-native/*.deb
+            dist-native/latest*.yml
 
   build_mac:
     runs-on: macos-11
@@ -58,7 +60,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 12
+          node-version: lts/hydrogen
 
       - run: echo GIT_BRANCH="${{ github.ref_name }}" > electron-builder.env
       - run: npm install --no-audit
@@ -71,6 +73,7 @@ jobs:
             dist-native/*.dmg
             dist-native/*.dmg.blockmap
             dist-native/*.zip
+            dist-native/latest*.yml
 
       - uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/v')
@@ -82,6 +85,7 @@ jobs:
             dist-native/*.dmg
             dist-native/*.dmg.blockmap
             dist-native/*.zip
+            dist-native/latest*.yml
 
   build_win:
     runs-on: windows-2019
@@ -91,7 +95,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 12
+          node-version: lts/hydrogen
 
       - run: echo GIT_BRANCH="${{ github.ref_name }}" > electron-builder.env
       - run: npm install --no-audit
@@ -104,6 +108,7 @@ jobs:
             dist-native/*.exe
             dist-native/*.exe.blockmap
             dist-native/*.zip
+            dist-native/latest*.yml
 
       - uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/v')
@@ -115,3 +120,4 @@ jobs:
             dist-native/*.exe
             dist-native/*.exe.blockmap
             dist-native/*.zip
+            dist-native/latest*.yml
diff --git a/.gitignore b/.gitignore
@@ -47,3 +47,5 @@ Thumbs.db
 /docs
 /docker-builds
 /package-lock.json
+.history/
+.angular/
diff --git a/angular.json b/angular.json
@@ -51,7 +51,14 @@
             ],
             "allowedCommonJsDependencies": [
               "mathjs",
-              "rxjs"
+              "rxjs",
+              "typed-function",
+              "seed-random",
+              "javascript-natural-sort",
+              "complex.js",
+              "tiny-emitter",
+              "escape-latex",
+              "lodash/isBoolean"
             ]
           },
           "configurations": {
@@ -67,7 +74,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
@@ -176,11 +182,10 @@
       }
     }
   },
-  "defaultProject": "blocknet",
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "bn",
-      "styleext": "scss"
+      "style": "scss"
     },
     "@schematics/angular:directive": {
       "prefix": "bn"