diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 8a9cb2dcf..0a4ff91ca 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -6,6 +6,10 @@ on: branches: - main +permissions: + contents: write + pull-requests: write + jobs: chromatic-deployment: runs-on: ubuntu-latest @@ -13,7 +17,7 @@ jobs: storybook-url: ${{ steps.chromatic-publish.outputs.storybookUrl}} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Version 3 of the actions/checkout action will only checkout a single commit without history by default. # Chromatic needs the full git history in order to track changes over time. # see https://www.chromatic.com/docs/github-actions#support-for-codeactionscheckoutv2code-and-above @@ -21,7 +25,7 @@ jobs: fetch-depth: 0 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 18.x cache: 'yarn' @@ -55,7 +59,7 @@ jobs: if: github.event_name == 'pull_request' && needs.chromatic-deployment.result == 'success' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b162f4bd4..4635b3f3b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,12 +12,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set Node.js version - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18.x + node-version-file: '.nvmrc' cache: 'yarn' registry-url: https://npm.pkg.github.com/ scope: '@eqworks' @@ -35,21 +35,21 @@ jobs: runs-on: ubuntu-latest if: contains(github.event_name, 'pull_request') steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: 18.x + node-version-file: '.nvmrc' - run: npx @eqworks/commit-watch -b ${{ github.event.pull_request.base.sha }} -h ${{ github.event.pull_request.head.sha }} -v scan-env: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 18.x - run: npx @eqworks/scan-env --strict diff --git a/.github/workflows/npm-alpha.yml b/.github/workflows/npm-alpha.yml index e5976bdad..b26e1377a 100644 --- a/.github/workflows/npm-alpha.yml +++ b/.github/workflows/npm-alpha.yml @@ -5,14 +5,18 @@ on: tags: - 'v*-alpha*' +permissions: + contents: read + packages: write + jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 18.x + node-version-file: '.nvmrc' cache: 'yarn' registry-url: https://npm.pkg.github.com/ scope: '@eqworks' @@ -24,9 +28,9 @@ jobs: env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: 18.x + node-version-file: '.nvmrc' registry-url: https://registry.npmjs.org/ scope: '@eqworks' - run: yarn publish --tag alpha diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml index a06a96a9f..983eb5db9 100644 --- a/.github/workflows/npm.yml +++ b/.github/workflows/npm.yml @@ -6,18 +6,22 @@ on: - 'v*' # proceeds eg: v1.0 - '!v*-*' # skips eg: v1.2.99-beta1, v3.5.0-test, etc. +permissions: + contents: read + packages: write + jobs: publish: runs-on: ubuntu-latest steps: - name: Checkout designated tagged commit - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: 18.x + node-version-file: '.nvmrc' cache: 'yarn' registry-url: https://npm.pkg.github.com/ scope: '@eqworks' @@ -28,9 +32,9 @@ jobs: - run: yarn publish env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: 18.x + node-version-file: '.nvmrc' registry-url: https://registry.npmjs.org/ scope: '@eqworks' - run: yarn publish diff --git a/.github/workflows/storybook-deploy.yml b/.github/workflows/storybook-deploy.yml index 8f6a173a5..ef131a3b5 100644 --- a/.github/workflows/storybook-deploy.yml +++ b/.github/workflows/storybook-deploy.yml @@ -10,12 +10,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18.x + node-version-file: '.nvmrc' cache: 'yarn' registry-url: https://npm.pkg.github.com/ scope: "@eqworks" diff --git a/.nvmrc b/.nvmrc index 3c032078a..2bd5a0a98 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18 +22 diff --git a/package.json b/package.json index 8bde86928..a33a406ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eqworks/widget-studio", - "version": "0.12.1", + "version": "0.12.3-alpha.2", "main": "dist/index.js", "source": "src/index.js", "files": [ @@ -15,7 +15,7 @@ "url": "https://github.com/EQWorks/widget-studio.git" }, "engines": { - "node": ">=14.0.0 <19.0.0" + "node": ">=14.0.0" }, "scripts": { "lint": "eslint .*.js *.js stories/ src/", @@ -30,14 +30,14 @@ }, "peerDependencies": { "@eqworks/lumen-labs": "^0.1.0-alpha.78", - "@eqworks/react-maps": "^0.13.0", + "@eqworks/react-maps": "^0.13.1-alpha.1", "@material-ui/core": "^4.11.0", "@tailwindcss/forms": "^0.5.0", "@tailwindcss/postcss7-compat": "^2.1.2", "autoprefixer": "^9.8.6", "postcss": "^7", - "react": "^16.13.1", - "react-dom": "^16.13.1", + "react": "^18.2.0", + "react-dom": "^18.2.0", "tailwindcss": "yarn:@tailwindcss/postcss7-compat@^2.1.2" }, "devDependencies": { @@ -46,9 +46,9 @@ "@babel/eslint-parser": "^7.11.5", "@babel/preset-env": "^7.11.5", "@babel/preset-react": "^7.10.4", - "@eqworks/common-login": "^0.9.0-alpha.20", + "@eqworks/common-login": "^0.9.1-alpha.0", "@eqworks/lumen-labs": "^0.1.0-alpha.78", - "@eqworks/react-maps": "^0.13.0", + "@eqworks/react-maps": "^0.13.1-alpha.1", "@material-ui/core": "^4.11.0", "@size-limit/preset-small-lib": "^4.5.7", "@storybook/addon-actions": "^6.5.16", @@ -71,8 +71,8 @@ "postcss": "^7", "postcss-cli": "^7", "re-resizable": "^6.9.1", - "react": "^16.13.1", - "react-dom": "^16.13.1", + "react": "^18.2.0", + "react-dom": "^18.2.0", "react-router-dom": "~5.2.0", "size-limit": "^4.5.7", "tailwindcss": "yarn:@tailwindcss/postcss7-compat@^2.1.2", diff --git a/yarn.lock b/yarn.lock index 3efcc7140..c1d814788 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1331,11 +1331,9 @@ regenerator-runtime "^0.13.4" "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13": - version "7.17.2" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941" - integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw== - dependencies: - regenerator-runtime "^0.13.4" + version "7.28.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.2.tgz#2ae5a9d51cc583bd1f5673b3bb70d6d819682473" + integrity sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA== "@babel/runtime@^7.12.0": version "7.21.5" @@ -1592,10 +1590,10 @@ prop-types "^15.7.2" react-resize-detector "^7.0.0" -"@eqworks/common-login@^0.9.0-alpha.20": - version "0.9.0-alpha.20" - resolved "https://npm.pkg.github.com/download/@EQWorks/common-login/0.9.0-alpha.20/3249421d3902ec4f7b03c48dcf02c09a56c531d4#3249421d3902ec4f7b03c48dcf02c09a56c531d4" - integrity sha512-VZ/zWylz/uPSug5+6CQenCN0vsBJDpD+u6tKBvnvgwNlah/mPNlCHp5K/S5qjVZ2C0AD7B54IUDRCYT40Flu5A== +"@eqworks/common-login@^0.9.1-alpha.0": + version "0.9.1-alpha.0" + resolved "https://npm.pkg.github.com/download/@EQWorks/common-login/0.9.1-alpha.0/61a47907e85c52ab6463b4405806ddfd67ad1203#61a47907e85c52ab6463b4405806ddfd67ad1203" + integrity sha512-1xTsQ8PQWnRHGlWUpymbS3exAXLl+3DM+prlUEV/N44H8T4xnnSzOLNTYa5nzw1klPDIrSEBXjaRA+W5l/dwaA== dependencies: "@eqworks/lumen-labs" "^0.1.0-alpha.59" cross-domain-storage "^2.0.5" @@ -1606,9 +1604,9 @@ react-router-prop-types "^1.0.4" "@eqworks/lumen-labs@^0.1.0-alpha.59": - version "0.1.0-alpha.94" - resolved "https://npm.pkg.github.com/download/@EQWorks/lumen-labs/0.1.0-alpha.94/9394c9a5a2cc1712dc3578456bf90db6d02adeef#9394c9a5a2cc1712dc3578456bf90db6d02adeef" - integrity sha512-zcyjReae9+zsjITaVmDi/2p/Z3bNPdh5/PqEbGJPbrBVPUNaNUE37TAQrFWMn9jblK2KU6jroXefvayRz7crEg== + version "0.1.0-alpha.134" + resolved "https://npm.pkg.github.com/download/@EQWorks/lumen-labs/0.1.0-alpha.134/8034db8b3ba7eaea0110872180c1b7b1d85a8b73#8034db8b3ba7eaea0110872180c1b7b1d85a8b73" + integrity sha512-hgRsqv5Yo1AqaucLqFUtw1MY3HX2uU8VfktWzKCmc1T3ouXxsG59upyBRcSvGEIlyAI5/h4bV7gaOUS/iugJAA== dependencies: "@headlessui/react" "^1.4.0" clsx "^1.1.1" @@ -1660,10 +1658,10 @@ react-table "^7.6.0" use-cached "^2.0.0" -"@eqworks/react-maps@^0.13.0": - version "0.13.0" - resolved "https://npm.pkg.github.com/download/@EQWorks/react-maps/0.13.0/da2fad3a2316ba1cd3d1ff998a904f0811eca284#da2fad3a2316ba1cd3d1ff998a904f0811eca284" - integrity sha512-e9uHZyv+/YGSS3EuVwYZerio8dF6qx8XxNqiTisLxBRXpTzN7CwJW84yLrVvyR6UTp1AzNjep1zVqVsrca2qPA== +"@eqworks/react-maps@^0.13.1-alpha.1": + version "0.13.1-alpha.1" + resolved "https://npm.pkg.github.com/download/@EQWorks/react-maps/0.13.1-alpha.1/75be8eca87c66b49a4f9be4e3528e85f7c7df6d0#75be8eca87c66b49a4f9be4e3528e85f7c7df6d0" + integrity sha512-eaIC6p44MILTCLrzQFn7y2KRWQQcsSDFL+QUwLBQWn0CMYS/Xg3RYQSZhK8fD5r/Y5drowoH7++SaicWT/4i3g== dependencies: "@deck.gl/aggregation-layers" "^8.7.5" "@deck.gl/core" "^8.7.5" @@ -4272,11 +4270,16 @@ resolved "https://registry.yarnpkg.com/@types/pretty-hrtime/-/pretty-hrtime-1.0.1.tgz#72a26101dc567b0d68fd956cf42314556e42d601" integrity sha512-VjID5MJb1eGKthz2qUerWT8+R4b9N+CHvGCzg9fn4kWZgaF9AhdYikQio3R7wV8YY1NsQKPaCwKz1Yff+aHNUQ== -"@types/prop-types@*", "@types/prop-types@^15.7.3": +"@types/prop-types@*": version "15.7.4" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== +"@types/prop-types@^15.7.3": + version "15.7.15" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.15.tgz#e6e5a86d602beaca71ce5163fadf5f95d70931c7" + integrity sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw== + "@types/qs@^6.9.5": version "6.9.7" resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" @@ -9663,7 +9666,7 @@ is-wsl@^2.1.1, is-wsl@^2.2.0: isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" @@ -11750,9 +11753,9 @@ path-to-regexp@0.1.7: integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= path-to-regexp@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" - integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== + version "1.9.0" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.9.0.tgz#5dc0753acbf8521ca2e0f137b4578b917b10cf24" + integrity sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g== dependencies: isarray "0.0.1" @@ -12703,15 +12706,13 @@ react-docgen@^5.0.0: node-dir "^0.1.10" strip-indent "^3.0.0" -react-dom@^16.13.1: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" - integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw== +react-dom@^18.2.0: + version "18.3.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4" + integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.19.1" + scheduler "^0.23.2" react-dropzone@^11.0.2: version "11.7.1" @@ -12922,14 +12923,12 @@ react-window@^1.8.6: "@babel/runtime" "^7.0.0" memoize-one ">=3.1.1 <6" -react@^16.13.1: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" - integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g== +react@^18.2.0: + version "18.3.1" + resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891" + integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" read-cache@^1.0.0: version "1.0.0" @@ -13485,13 +13484,12 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -scheduler@^0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" - integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== +scheduler@^0.23.2: + version "0.23.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3" + integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" schema-utils@2.7.0: version "2.7.0" @@ -14427,9 +14425,9 @@ timsort@^0.3.0: integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= tiny-invariant@^1.0.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" - integrity sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg== + version "1.3.3" + resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127" + integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg== tiny-warning@^1.0.0, tiny-warning@^1.0.2, tiny-warning@^1.0.3: version "1.0.3"