diff --git a/.github/jsonnet/GIT_VERSION b/.github/jsonnet/GIT_VERSION index f0a00a6a..d67c1599 100644 --- a/.github/jsonnet/GIT_VERSION +++ b/.github/jsonnet/GIT_VERSION @@ -1 +1 @@ -5985c99fa9e401a6a47e10cd49e141524cf63d4d +12cd23dc5e40255f190d7d2aebabfaaebc639b41 diff --git a/.github/jsonnet/actions.jsonnet b/.github/jsonnet/actions.jsonnet index e1ce7b83..b8dd50b2 100644 --- a/.github/jsonnet/actions.jsonnet +++ b/.github/jsonnet/actions.jsonnet @@ -7,7 +7,7 @@ * human-readable version that the SHA corresponds to at the time of pinning. */ { - checkout_action: 'actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd', // v6 + checkout_action: 'actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0', // v7 gcp_auth_action: 'google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093', // v3 gcp_setup_gcloud_action: 'google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db', // v3 pulumi_action: 'pulumi/actions@cd99a7f8865434dd3532b586a26f9ebea596894f', // v5 diff --git a/.github/jsonnet/pnpm.jsonnet b/.github/jsonnet/pnpm.jsonnet index fc38a6c5..f092cc1c 100644 --- a/.github/jsonnet/pnpm.jsonnet +++ b/.github/jsonnet/pnpm.jsonnet @@ -20,7 +20,7 @@ local yarn = import 'yarn.jsonnet'; install(args=[], with={}, prod=false, storeDir=null, ifClause=null, workingDirectory=null):: base.action( 'Install pnpm tool', - 'pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320', // v5 + 'pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271', // v6.0.9 with=with + if workingDirectory != null then { package_json_file: workingDirectory + '/package.json' } else {}, diff --git a/.github/jsonnet/pulumi.jsonnet b/.github/jsonnet/pulumi.jsonnet index ecf96c4b..4e1eef17 100644 --- a/.github/jsonnet/pulumi.jsonnet +++ b/.github/jsonnet/pulumi.jsonnet @@ -156,6 +156,8 @@ local pulumiDefaultEnvironment(stack) = { * @param {array} [additionalSetupSteps=[]] - Extra setup steps before Pulumi preview * @param {boolean} [ignoreEngines=false] - Whether to ignore Node.js engine requirements * @param {string} [runsOn=null] - GitHub Actions runner to use for the job + * @param {string} [packageManager='yarn'] - Package manager to use ('yarn' or 'pnpm') + * @param {array} [pnpmInstallArgs=[]] - Additional arguments for pnpm install * @param {boolean} [blobless=null] - Whether to perform a blobless clone (--filter=blob:none); null uses checkout default * @param {number} [retryAttempts=null] - Number of additional checkout attempts on failure; null uses checkout default * @param {number} [cloneTimeout=null] - Timeout for git clone operation in minutes; null uses checkout default @@ -175,6 +177,11 @@ local pulumiDefaultEnvironment(stack) = { ignoreEngines=false, runsOn=null, pulumiVersion=defaultPulumiVersion, + packageManager='yarn', + pnpmInstallArgs=[], + blobless=null, + retryAttempts=null, + cloneTimeout=null, ):: base.ghJob( 'pulumi-preview-' + stack, @@ -182,7 +189,10 @@ local pulumiDefaultEnvironment(stack) = { image=image, useCredentials=false, steps=[ - yarn.checkoutAndYarn(ref=gitCloneRef, cacheName=cacheName, fullClone=false, workingDirectory=yarnDir, source=yarnNpmSource, ignoreEngines=ignoreEngines), + ( + if packageManager == 'yarn' then yarn.checkoutAndYarn(ref=gitCloneRef, cacheName=cacheName, fullClone=false, workingDirectory=yarnDir, source=yarnNpmSource, ignoreEngines=ignoreEngines, blobless=blobless, retryAttempts=retryAttempts, cloneTimeout=cloneTimeout) + else if packageManager == 'pnpm' then pnpm.checkoutAndPnpm(ref=gitCloneRef, cacheName=cacheName, fullClone=false, workingDirectory=yarnDir, source=yarnNpmSource, pnpmInstallArgs=pnpmInstallArgs, blobless=blobless, retryAttempts=retryAttempts, cloneTimeout=cloneTimeout) + ), pulumiSetupSteps(pulumiVersion), additionalSetupSteps, self.pulumiPreview(stack, pulumiDir=pulumiDir, environmentVariables=environmentVariables), @@ -201,6 +211,13 @@ local pulumiDefaultEnvironment(stack) = { * @param {string} [image=images.default_pulumi_node_image] - Container image * @param {object} [environmentVariables={}] - Additional environment variables * @param {array} [additionalSetupSteps=[]] - Extra setup steps + * @param {string} [packageManager='yarn'] - Package manager to use ('yarn' or 'pnpm') + * @param {array} [pnpmInstallArgs=[]] - Additional arguments for pnpm install + * @param {boolean} [ignoreEngines=false] - Whether to ignore Node.js engine requirements + * @param {string} [runsOn=null] - GitHub Actions runner to use for the job + * @param {boolean} [blobless=null] - Whether to perform a blobless clone (--filter=blob:none); null uses checkout default + * @param {number} [retryAttempts=null] - Number of additional checkout attempts on failure; null uses checkout default + * @param {number} [cloneTimeout=null] - Timeout for git clone operation in minutes; null uses checkout default * @param {string} [pulumiVersion=defaultPulumiVersion] - Pulumi CLI version to install * @returns {jobs} - GitHub Actions job for test environment Pulumi preview */ @@ -215,6 +232,13 @@ local pulumiDefaultEnvironment(stack) = { environmentVariables={}, additionalSetupSteps=[], pulumiVersion=defaultPulumiVersion, + packageManager='yarn', + pnpmInstallArgs=[], + ignoreEngines=false, + runsOn=null, + blobless=null, + retryAttempts=null, + cloneTimeout=null, ):: self.pulumiPreviewJob( stack, @@ -227,6 +251,13 @@ local pulumiDefaultEnvironment(stack) = { environmentVariables=environmentVariables, additionalSetupSteps=additionalSetupSteps, pulumiVersion=pulumiVersion, + packageManager=packageManager, + pnpmInstallArgs=pnpmInstallArgs, + ignoreEngines=ignoreEngines, + runsOn=runsOn, + blobless=blobless, + retryAttempts=retryAttempts, + cloneTimeout=cloneTimeout, ), /** diff --git a/.github/jsonnet/yarn.jsonnet b/.github/jsonnet/yarn.jsonnet index 43bec7d2..99d6be91 100644 --- a/.github/jsonnet/yarn.jsonnet +++ b/.github/jsonnet/yarn.jsonnet @@ -48,7 +48,6 @@ local misc = import 'misc.jsonnet'; cat < .npmrc @gynzy:registry=https://npm.gynzy.net/ "//npm.gynzy.net/:_authToken"="${NPM_TOKEN}" - public-hoist-pattern[]=@pulumi/pulumi EOF |||, env={ @@ -74,7 +73,6 @@ local misc = import 'misc.jsonnet'; cat < .npmrc @gynzy:registry=https://npm.pkg.github.com //npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN} - public-hoist-pattern[]=@pulumi/pulumi EOF |||, env={ diff --git a/.github/workflows/misc.yml b/.github/workflows/misc.yml index d6707a0e..e9e9b006 100644 --- a/.github/workflows/misc.yml +++ b/.github/workflows/misc.yml @@ -74,7 +74,7 @@ "if": "${{ ( steps.check-binaries.outputs.sshBinaryExists == 'true' && steps.check-binaries.outputs.gitBinaryExists == 'true' ) }}" "name": "Check out repository code via ssh" "timeout-minutes": 10 - "uses": "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" + "uses": "actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0" "with": "ref": "${{ github.event.pull_request.head.sha }}" "ssh-key": "${{ secrets.VIRKO_GITHUB_SSH_KEY }}" @@ -83,7 +83,7 @@ "if": "${{ ( steps.check-binaries.outputs.sshBinaryExists == 'false' || steps.check-binaries.outputs.gitBinaryExists == 'false' ) }}" "name": "Check out repository code via https" "timeout-minutes": 10 - "uses": "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" + "uses": "actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0" "with": "ref": "${{ github.event.pull_request.head.sha }}" "submodules": "recursive" diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 001e041b..4e6f8c52 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -75,7 +75,7 @@ "if": "${{ ( steps.check-binaries.outputs.sshBinaryExists == 'true' && steps.check-binaries.outputs.gitBinaryExists == 'true' ) }}" "name": "Check out repository code via ssh" "timeout-minutes": 10 - "uses": "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" + "uses": "actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0" "with": "ref": "${{ github.event.pull_request.head.sha }}" "ssh-key": "${{ secrets.VIRKO_GITHUB_SSH_KEY }}" @@ -84,7 +84,7 @@ "if": "${{ ( steps.check-binaries.outputs.sshBinaryExists == 'false' || steps.check-binaries.outputs.gitBinaryExists == 'false' ) }}" "name": "Check out repository code via https" "timeout-minutes": 10 - "uses": "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" + "uses": "actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0" "with": "ref": "${{ github.event.pull_request.head.sha }}" "submodules": "recursive" @@ -97,10 +97,9 @@ cat < .npmrc @gynzy:registry=https://npm.pkg.github.com //npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN} - public-hoist-pattern[]=@pulumi/pulumi EOF - "name": "Install pnpm tool" - "uses": "pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320" + "uses": "pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271" - "name": "Run pnpm install" "run": "pnpm config set store-dir .pnpm-store && pnpm install --frozen-lockfile" - "name": "check-version-bump" @@ -116,7 +115,6 @@ cat < .npmrc @gynzy:registry=https://npm.pkg.github.com //npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN} - public-hoist-pattern[]=@pulumi/pulumi EOF - "env": "PR_NUMBER": "${{ github.event.number }}" diff --git a/.github/workflows/publish-prod.yml b/.github/workflows/publish-prod.yml index 0e0524ea..2f18f67c 100644 --- a/.github/workflows/publish-prod.yml +++ b/.github/workflows/publish-prod.yml @@ -75,7 +75,7 @@ "if": "${{ ( steps.check-binaries.outputs.sshBinaryExists == 'true' && steps.check-binaries.outputs.gitBinaryExists == 'true' ) }}" "name": "Check out repository code via ssh" "timeout-minutes": 10 - "uses": "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" + "uses": "actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0" "with": "ref": "${{ github.sha }}" "ssh-key": "${{ secrets.VIRKO_GITHUB_SSH_KEY }}" @@ -84,7 +84,7 @@ "if": "${{ ( steps.check-binaries.outputs.sshBinaryExists == 'false' || steps.check-binaries.outputs.gitBinaryExists == 'false' ) }}" "name": "Check out repository code via https" "timeout-minutes": 10 - "uses": "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" + "uses": "actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0" "with": "ref": "${{ github.sha }}" "submodules": "recursive" @@ -97,10 +97,9 @@ cat < .npmrc @gynzy:registry=https://npm.pkg.github.com //npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN} - public-hoist-pattern[]=@pulumi/pulumi EOF - "name": "Install pnpm tool" - "uses": "pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320" + "uses": "pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271" - "name": "Run pnpm install" "run": "pnpm config set store-dir .pnpm-store && pnpm install --frozen-lockfile" - "name": "build" @@ -112,7 +111,6 @@ cat < .npmrc @gynzy:registry=https://npm.pkg.github.com //npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN} - public-hoist-pattern[]=@pulumi/pulumi EOF - "env": {} "name": "publish" diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 1d55bdd5..00000000 --- a/.npmrc +++ /dev/null @@ -1 +0,0 @@ -@gynzy:registry=https://npm.pkg.github.com diff --git a/package.json b/package.json index 3472058c..4541249a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@gynzy/ember-sortable", - "version": "4.0.14", - "packageManager": "pnpm@10.33.4", + "version": "4.0.15", + "packageManager": "pnpm@11.13.0", "description": "Sortable UI primitives for Ember.", "keywords": [ "ember-addon", diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml new file mode 100644 index 00000000..64fe23bd --- /dev/null +++ b/pnpm-workspace.yaml @@ -0,0 +1,6 @@ +allowBuilds: + core-js: true + highlight.js: true + +registries: + "@gynzy": https://npm.pkg.github.com