Merge pull request #126 from qld-gov-au/develop

Dependabot fixes, also improve runtime for users who don't have premium package access

.github/workflows/compile.js.yml

@@ -7,9 +7,9 @@ on:
   push:
   pull_request:
 #
-#concurrency:
-#  group: compile-${{ github.workflow }}-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession.
-#  cancel-in-progress: true
+concurrency:
+  group: compile-${{ github.workflow }}-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession.
+  cancel-in-progress: true
 
 
 jobs:
@@ -122,25 +122,27 @@ jobs:
       - name: Publish
         uses: qld-gov-au/gha-publish-to-git@master
         with:
+          #repository: qld-gov-au/formio-qld ### if forked, change to your own binary repo for output tracking
           repository: ${{ secrets.TARGET_REPO }}
           git_ref: '${{ github.ref }}'
           branch: '${{ steps.extract_branch.outputs.branch }}'
           github_token: '${{ secrets.GH_TOKEN }}'
           github_pat: '${{ secrets.GH_PAT }}'
           source_folder: dist
           tag_branch: main
-        if: ${{ success() && ( github.actor != 'dependabot[bot]' ) }}
+        if: ${{ success() && ( github.actor != 'dependabot[bot]' ) && env.repository != ''  }}
 
       - name: Publish to formio-qld-cdn
         uses: qld-gov-au/gha-cdn-version-tree-by-tag-builder@main
         with:
-          repository: 'qld-gov-au/formio-qld-cdn'
+          #repository: 'qld-gov-au/formio-qld-cdn' ### if forked, change to your own binary cdn repo for output making when tagged
+          repository: ${{ secrets.TARGET_CDN_REPO }}
           git_ref: '${{ github.ref }}'
           branch: 'release'
           github_token: '${{ secrets.GH_TOKEN }}'
           github_pat: '${{ secrets.GH_PAT }}'
           source_folder: dist
-        if: ${{ success() && ( github.actor != 'dependabot[bot]' ) }}
+        if: ${{ success() && ( github.actor != 'dependabot[bot]' )  && env.repository != '' }}
 
 
 

.github/workflows/storybook-deploy.js.yml

@@ -11,9 +11,9 @@ on:
       inputs:
         description:
           description: 'Manual run of publish storybook'
-#concurrency:
-#  group: deploy-${{ github.workflow }}-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession.
-#  cancel-in-progress: true
+concurrency:
+  group: deploy-${{ github.workflow }}-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession.
+  cancel-in-progress: true
 
 jobs:
 
@@ -58,4 +58,4 @@ jobs:
           branch: gh-pages # The branch the action should deploy to.
           folder: storybook-static # The folder that the build-storybook script generates files.
           clean: true # Automatically remove deleted files from the deploy branch
-          target-folder: docs # The folder that we serve our Storybook files from
+          target-folder: / # The folder that we serve our Storybook files from

.npmrc

@@ -0,0 +1,4 @@
+# last modified: 29 July 2023
+registry=https://registry.npmjs.org
+; Set a new registry for a scoped package
+# @@formio/premium=nexus.tools.services.qld.gov.au/nexus/repository/npm_all/

.storybook/main.js

@@ -16,7 +16,11 @@ module.exports = {
     name: "@storybook/html-webpack5",
     options: {},
   },
-  staticDirs: ["../lib", { from: "../src/stories/assets", to: "./assets" }],
+  staticDirs: [
+    "static",
+    "../lib",
+    { from: "../src/stories/assets", to: "./assets" },
+  ],
   webpackFinal: async (config) => {
     // placeholder for custom webpack settings for storybook
     // config.externals = { ...config.externals, formiojs: "formiojs" };