Merge pull request airgap-it#334 from airgap-it/develop

Develop

.devcontainer/Dockerfile

@@ -1,5 +1,7 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.138.0/containers/typescript-node/.devcontainer/base.Dockerfile
-ARG VARIANT="14-buster"
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.205.2/containers/typescript-node/.devcontainer/base.Dockerfile
+
+# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster
+ARG VARIANT="16-bullseye"
 FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}
 
 # [Optional] Uncomment this section to install additional OS packages.
@@ -11,4 +13,4 @@ FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}
 # RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
 
 # [Optional] Uncomment if you want to install more global node packages
-RUN sudo -u node npm install -g ts-node
+# RUN su node -c "npm install -g <your-package-list -here>"

.devcontainer/devcontainer.json

@@ -1,33 +1,33 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.138.0/containers/typescript-node
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.205.2/containers/typescript-node
 {
-  "name": "Node.js 14 & TypeScript",
+  "name": "Node.js & TypeScript",
   "build": {
     "dockerfile": "Dockerfile",
-    // Update 'VARIANT' to pick a Node version: 10, 12, 14
+    // Update 'VARIANT' to pick a Node version: 16, 14, 12.
+    // Append -bullseye or -buster to pin to an OS version.
+    // Use -bullseye variants on local on arm64/Apple Silicon.
     "args": {
-      "VARIANT": "14"
+      "VARIANT": "16-bullseye"
     }
   },
-  //
+
   // Set *default* container specific settings.json values on container create.
-  "settings": {
-    "terminal.integrated.shell.linux": "/bin/zsh"
-  },
-  //
+  "settings": {},
+
   // Add the IDs of extensions you want installed when the container is created.
   "extensions": [
     "dbaeumer.vscode-eslint",
     "ms-vscode.vscode-typescript-tslint-plugin",
     "esbenp.prettier-vscode"
-  ]
-  //
+  ],
+
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   // "forwardPorts": [],
-  //
+
   // Use 'postCreateCommand' to run commands after the container is created.
   // "postCreateCommand": "yarn install",
-  //
-  // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
-  // "remoteUser": "node"
+
+  // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+  "remoteUser": "node"
 }

.github/workflows/build.yml

@@ -39,18 +39,15 @@ jobs:
           # errors especially on GitHub-hosted macos machines.
           token: ${{ secrets.GITHUB_TOKEN }}
         id: setup-ffmpeg
-
-      - name: Test E2E
-        run: npm run e2e:all
-
-      - name: Upload
-        uses: actions/upload-artifact@v1
-        with:
-          name: video
-          path: e2e/output/combined.webm
-
-      - name: Analyze with SonarCloud
-        uses: sonarsource/sonarcloud-github-action@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      # - name: Test E2E
+      #   run: npm run e2e:all
+      # - name: Upload
+      #   uses: actions/upload-artifact@v1
+      #   with:
+      #     name: video
+      #     path: e2e/output/combined.webm
+      # - name: Analyze with SonarCloud
+      #   uses: sonarsource/sonarcloud-github-action@master
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.gitignore

@@ -73,8 +73,15 @@ combined.webm
 
 examples/walletbeacon.min.js
 
+lib
 docs
 
-src/ui/alert/alert-templates.ts
-src/ui/toast/toast-templates.ts
-src/ui/alert/wallet-lists.ts
+packages/beacon-blockchain-tezos/src/ui/alert/alert-templates.ts
+packages/beacon-blockchain-tezos/src/ui/alert/wallet-lists.ts
+packages/beacon-blockchain-tezos/src/ui/toast/toast-templates.ts
+packages/beacon-blockchain-substrate/src/ui/alert/alert-templates.ts
+packages/beacon-blockchain-substrate/src/ui/alert/wallet-lists.ts
+packages/beacon-blockchain-substrate/src/ui/toast/toast-templates.ts
+packages/beacon-ui/src/ui/alert/alert-templates.ts
+packages/beacon-ui/src/ui/alert/wallet-lists.ts
+packages/beacon-ui/src/ui/toast/toast-templates.ts

.gitlab-ci.yml

@@ -75,9 +75,8 @@ publish_beta:
 
 publish:
   stage: publish
-  # TODO: Enable again
-  # only:
-  #   - master
+  only:
+    - master
   when: manual
   script:
     - docker run --env NPM_AUTH_TOKEN --name unit-$CI_COMMIT_SHA $GOOGLE_TAG ./npm-ci-publish.sh