Consume icons from @enterprisedb/icons (EnterpriseDB#1539)

Author: Francisco González

.devcontainer/Dockerfile

@@ -24,15 +24,13 @@ RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/shar
 # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 #     && apt-get -y install --no-install-recommends <your-package-list-here>
 
-# latest gatsby, yarn
+# latest gatsby
 RUN su vscode -c "source /usr/local/share/nvm/nvm.sh \
-    && npm install -g gatsby-cli \
-    && npm install -g yarn" 2>&1
+    && npm install -g gatsby-cli" 2>&1
 
 # Enable docker-in-docker (see: https://github.com/microsoft/vscode-dev-containers/blob/master/script-library/docs/docker-in-docker.md)
 COPY library-scripts/*.sh /tmp/library-scripts/
-RUN wget -O- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && apt-get update \ 
+RUN apt-get update \
     && /bin/bash /tmp/library-scripts/docker-in-docker-debian.sh
 ENTRYPOINT ["/usr/local/share/docker-init.sh"]
 VOLUME [ "/var/lib/docker" ]

.devcontainer/devcontainer.json

@@ -21,7 +21,7 @@
   "appPort": [8000],
 
   // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "yarn install",
+  "postCreateCommand": "npm install",
 
   // docker in docker (https://github.com/microsoft/vscode-dev-containers/blob/master/script-library/docs/docker-in-docker.md)
   "runArgs": ["--init", "--privileged"],

.dockerignore

@@ -1 +1,5 @@
 *
+!icons-pkg/
+!scripts/
+!gatsby*.js
+!package*.json

.envrc

@@ -0,0 +1,2 @@
+layout node
+dotenv_if_exists .env.development

.github/workflows/deploy-develop.yml

@@ -21,10 +21,8 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: "14.x"
-      - name: Install yarn
-        run: sudo npm -g install yarn
-      - name: Yarn install
-        run: yarn install --immutable
+      - name: npm install
+        run: npm install
         env:
           NODE_ENV: ${{ secrets.NODE_ENV }}
 
@@ -54,9 +52,9 @@ jobs:
             ${{ runner.os }}-gatsby-build-develop-
 
       - name: Fix mtimes
-        run: yarn fix-mtimes --force
+        run: npm run fix-mtimes --force
       - name: Gatsby build
-        run: yarn build
+        run: npm run build
         env:
           APP_ENV: staging
           NODE_ENV: ${{ secrets.NODE_ENV }}
@@ -68,7 +66,7 @@ jobs:
 
       - name: Netlify deploy
         run: |
-          sudo yarn global add netlify-cli
+          sudo npm install -g netlify-cli
           netlify deploy --dir=public --prod
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}

.github/workflows/deploy-draft.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
     types: [labeled, opened, synchronize]
 
-concurrency: 
+concurrency:
   group: ${{ github.head_ref }}
   cancel-in-progress: true
 
@@ -19,7 +19,7 @@ jobs:
 
     - name: compose a name for the build environment
       run: echo "BUILD_ENV_NAME=pr-${{ github.event.number }}-${{ env.GITHUB_HEAD_REF_SLUG }}" >> $GITHUB_ENV
-        
+
     - uses: actions/checkout@v2
       with:
         ref: ${{ github.event.pull_request.head.sha }}
@@ -33,21 +33,20 @@ jobs:
       with:
         node-version: '14.x'
 
-    # ref: https://github.com/actions/cache/blob/main/examples.md#node---yarn
-    - name: Get yarn cache directory
-      id: yarn-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn cache dir)"    
-
-    - name: Checking Yarn cache
-      uses: actions/cache@v2
+    - name: Get npm cache directory
+      id: npm-cache-dir
+      run: |
+        echo "::set-output name=dir::$(npm config get cache)"
+    - uses: actions/cache@v2
+      id: npm-cache # use this to check for `cache-hit` ==> if: steps.npm-cache.outputs.cache-hit != 'true'
       with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+        path: ${{ steps.npm-cache-dir.outputs.dir }}
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
         restore-keys: |
-          ${{ runner.os }}-yarn-
-  
-    - name: Yarn install
-      run: npx yarn install --immutable
+          ${{ runner.os }}-node-
+
+    - name: Install dependencies
+      run: npm install --immutable
       env:
         NODE_ENV: ${{ secrets.NODE_ENV }}
 
@@ -61,10 +60,10 @@ jobs:
         key: ${{ runner.os }}-gatsby-build-draft-${{ github.head_ref }}
 
     - name: Fix mtimes
-      run: yarn fix-mtimes --force
-      
+      run: npm run fix-mtimes --force
+
     - name: Gatsby build
-      run: yarn build
+      run: npm run build
       env:
         APP_ENV: staging
         NODE_ENV: ${{ secrets.NODE_ENV }}
@@ -85,5 +84,5 @@ jobs:
         github-deployment-environment: ${{ env.BUILD_ENV_NAME }}
       env:
         NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-        NETLIFY_SITE_ID: ${{ secrets.NETLIFY_DEVELOP_SITE_ID }}        
+        NETLIFY_SITE_ID: ${{ secrets.NETLIFY_DEVELOP_SITE_ID }}
 

.github/workflows/deploy-main.yml

@@ -15,17 +15,15 @@ jobs:
           ref: main
           fetch-depth: 0 # fetch whole repo so git-restore-mtime can work
           lfs: true
-          
+
       - name: Adjust file watchers limit
         run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
 
       - uses: actions/setup-node@v2
         with:
           node-version: "14.x"
-      - name: Install yarn
-        run: sudo npm -g install yarn
-      - name: Yarn install
-        run: yarn install --immutable
+      - name: npm install
+        run: npm install
         env:
           NODE_ENV: ${{ secrets.NODE_ENV }}
 
@@ -43,7 +41,6 @@ jobs:
       - name: Build all pdfs
         run: npm run build-all-pdfs-ci
 
-
       - name: Checking Gatsby cache
         id: gatsby-cache-build
         uses: actions/cache@v2
@@ -56,9 +53,9 @@ jobs:
             ${{ runner.os }}-gatsby-build-main-
 
       - name: Fix mtimes
-        run: yarn fix-mtimes --force
+        run: npm run fix-mtimes --force
       - name: Gatsby build
-        run: yarn build
+        run: npm run build
         env:
           APP_ENV: production
           NODE_ENV: ${{ secrets.NODE_ENV }}
@@ -71,7 +68,7 @@ jobs:
 
       - name: Netlify deploy
         run: |
-          sudo yarn global add netlify-cli
+          sudo npm install -g netlify-cli
           netlify deploy --dir=public --prod
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}

.gitignore

@@ -1,6 +1,3 @@
-# yarn is preferred for us (and heroku)
-package-lock.json
-
 # Logs
 logs
 *.log
@@ -45,6 +42,9 @@ typings/
 # Optional npm cache directory
 .npm
 
+# npm config file
+.npmrc
+
 # Optional eslint cache
 .eslintcache
 
@@ -81,4 +81,7 @@ product_docs/content/
 product_docs/content_build/
 static/nginx_redirects.generated
 temp_kubernetes/
-temp_bdr/
+temp_bdr/
+
+# Track base direnv file
+!.envrc

.husky/_/husky.sh

@@ -1,7 +1,9 @@
 #!/bin/sh
 if [ -z "$husky_skip_init" ]; then
   debug () {
-    [ "$HUSKY_DEBUG" = "1" ] && echo "husky (debug) - $1"
+    if [ "$HUSKY_DEBUG" = "1" ]; then
+      echo "husky (debug) - $1"
+    fi
   }
 
   readonly hook_name="$(basename "$0")"

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn pretty-quick --staged --pattern 'src/**/*.js' --pattern 'gatsby-*.js'
+npx pretty-quick --staged --pattern 'src/**/*.js' --pattern 'gatsby-*.js'