Merge pull request #30360 from storybookjs/valentin/remove-build-sand…

…boxes-step

Build: Update CircleCI configuration to remove build-sandboxes job

.nvmrc

@@ -1 +1,2 @@
-22.6.0
+22.13.1
+

.yarnrc.yml

@@ -8,4 +8,4 @@ nodeLinker: node-modules
 
 npmPublishAccess: public
 
-yarnPath: .yarn/releases/yarn-4.3.0.cjs
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

code/.yarnrc.yml

@@ -22,7 +22,6 @@ plugins:
   - path: ../.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: '@yarnpkg/plugin-workspace-tools'
 
-# See https://github.com/nrwl/nx/issues/22177
 supportedArchitectures:
   cpu:
     - current
@@ -36,6 +35,4 @@ supportedArchitectures:
 unsafeHttpWhitelist:
   - localhost
 
-yarnPath: ../.yarn/releases/yarn-4.3.0.cjs
-# Sometimes you get a "The remote archive doesn't match the expected checksum" error, uncommenting this line will fix it
-# checksumBehavior: 'update'
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

code/package.json

@@ -42,8 +42,9 @@
     "lint:js": "yarn lint:js:cmd .  --quiet",
     "lint:js:cmd": "cross-env NODE_ENV=production eslint --cache --cache-location=../.cache/eslint --ext .js,.jsx,.json,.html,.ts,.tsx,.mjs --report-unused-disable-directives",
     "lint:md": "../scripts/node_modules/.bin/remark -q .",
-    "lint:other": "prettier --write '**/*.{css,html,json,md,yml}'",
-    "lint:package": "sort-package-json",
+    "lint:other": "yarn lint:prettier '**/*.{css,html,json,md,yml}'",
+    "lint:package": "yarn --cwd ../scripts lint:package",
+    "lint:prettier": "prettier --write",
     "local-registry": "yarn --cwd ../scripts local-registry",
     "publish-sandboxes": "yarn --cwd ../scripts publish",
     "storybook:ui": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.cjs dev --port 6006 --config-dir ./.storybook",
@@ -64,14 +65,14 @@
     "*.{html,js,json,jsx,mjs,ts,tsx}": [
       "yarn lint:js:cmd --fix"
     ],
-    "package.json": [
-      "yarn lint:package"
-    ],
     "*.ejs": [
       "../scripts/node_modules/.bin/ejslint"
     ],
     "*.{css,html,json,md,yml}": [
-      "../scripts/node_modules/.bin/prettier --write"
+      "yarn lint:prettier"
+    ],
+    "package.json": [
+      "yarn lint:package"
     ]
   },
   "browserslist": [
@@ -216,6 +217,7 @@
     "semver": "^7.3.7",
     "serve-static": "^1.14.1",
     "slash": "^5.0.0",
+    "sort-package-json": "^2.14.0",
     "storybook": "workspace:^",
     "svelte": "^5.0.0-next.268",
     "ts-dedent": "^2.0.0",
@@ -250,6 +252,7 @@
       "built": false
     }
   },
+  "packageManager": "[email protected]",
   "engines": {
     "node": ">=18.0.0"
   },

code/yarn.lock

@@ -8865,6 +8865,7 @@ __metadata:
     semver: "npm:^7.3.7"
     serve-static: "npm:^1.14.1"
     slash: "npm:^5.0.0"
+    sort-package-json: "npm:^2.14.0"
     storybook: "workspace:^"
     svelte: "npm:^5.0.0-next.268"
     ts-dedent: "npm:^2.0.0"
@@ -15605,6 +15606,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"detect-newline@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "detect-newline@npm:4.0.1"
+  checksum: 10c0/1cc1082e88ad477f30703ae9f23bd3e33816ea2db6a35333057e087d72d466f5a777809b71f560118ecff935d2c712f5b59e1008a8b56a900909d8fd4621c603
+  languageName: node
+  linkType: hard
+
 "detect-node-es@npm:^1.1.0":
   version: 1.1.0
   resolution: "detect-node-es@npm:1.1.0"
@@ -18658,6 +18666,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-stdin@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "get-stdin@npm:9.0.0"
+  checksum: 10c0/7ef2edc0c81a0644ca9f051aad8a96ae9373d901485abafaabe59fd347a1c378689d8a3d8825fb3067415d1d09dfcaa43cb9b9516ecac6b74b3138b65a8ccc6b
+  languageName: node
+  linkType: hard
+
 "get-stream@npm:^4.0.0":
   version: 4.1.0
   resolution: "get-stream@npm:4.1.0"
@@ -18753,6 +18768,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"git-hooks-list@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "git-hooks-list@npm:3.1.0"
+  checksum: 10c0/f1b93dd11b80b2a687b99a8bb553c0d07f344532d475b3ac2a5ff044d40fa71567ddcfa5cb39fae0b4e43a670a33f02f71ec3b24b7263233f3a3df89deddfb5a
+  languageName: node
+  linkType: hard
+
 "github-release-from-changelog@npm:^2.1.1":
   version: 2.1.1
   resolution: "github-release-from-changelog@npm:2.1.1"
@@ -29298,6 +29320,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sort-package-json@npm:^2.14.0":
+  version: 2.14.0
+  resolution: "sort-package-json@npm:2.14.0"
+  dependencies:
+    detect-indent: "npm:^7.0.1"
+    detect-newline: "npm:^4.0.0"
+    get-stdin: "npm:^9.0.0"
+    git-hooks-list: "npm:^3.0.0"
+    is-plain-obj: "npm:^4.1.0"
+    semver: "npm:^7.6.0"
+    sort-object-keys: "npm:^1.1.3"
+    tinyglobby: "npm:^0.2.9"
+  bin:
+    sort-package-json: cli.js
+  checksum: 10c0/bcc114a3b5e11d4539ba46dd4eeda6d6909202cb1a9526c230850f1edfdfcf8712e9479b71f98d8f6cb8554740294acdfcaae84461dcecd90592867e1ba90924
+  languageName: node
+  linkType: hard
+
 "source-list-map@npm:^2.0.0":
   version: 2.0.1
   resolution: "source-list-map@npm:2.0.1"
@@ -30424,7 +30464,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tinyglobby@npm:^0.2.10":
+"tinyglobby@npm:^0.2.10, tinyglobby@npm:^0.2.9":
   version: 0.2.10
   resolution: "tinyglobby@npm:0.2.10"
   dependencies:
@@ -31038,11 +31078,11 @@ __metadata:
 
 "typescript@patch:typescript@npm%3A^5.3.2#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A~5.6.2#optional!builtin<compat/typescript>":
   version: 5.6.3
-  resolution: "typescript@patch:typescript@npm%3A5.6.3#optional!builtin<compat/typescript>::version=5.6.3&hash=b45daf"
+  resolution: "typescript@patch:typescript@npm%3A5.6.3#optional!builtin<compat/typescript>::version=5.6.3&hash=8c6c40"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/ac8307bb06bbfd08ae7137da740769b7d8c3ee5943188743bb622c621f8ad61d244767480f90fbd840277fbf152d8932aa20c33f867dea1bb5e79b187ca1a92f
+  checksum: 10c0/7c9d2e07c81226d60435939618c91ec2ff0b75fbfa106eec3430f0fcf93a584bc6c73176676f532d78c3594fe28a54b36eb40b3d75593071a7ec91301533ace7
   languageName: node
   linkType: hard
 

package.json

@@ -4,6 +4,7 @@
     "ci-tests": "cd code; yarn ci-tests",
     "get-report-message": "cd scripts; yarn get-report-message",
     "get-template": "cd scripts; yarn get-template",
+    "get-sandbox-dir": "cd scripts; yarn get-sandbox-dir",
     "i": "yarn --cwd scripts && yarn --cwd code",
     "knip": "cd code; yarn knip",
     "lint": "cd code; yarn lint",
@@ -17,5 +18,5 @@
     "vite-ecosystem-ci:build": "yarn task --task sandbox --template react-vite/default-ts --start-from=install",
     "vite-ecosystem-ci:test": "yarn task --task test-runner-dev --template react-vite/default-ts --start-from=dev && yarn task --task test-runner --template react-vite/default-ts --start-from=build"
   },
-  "packageManager": "yarn@4.4.0+sha512.91d93b445d9284e7ed52931369bc89a663414e5582d00eea45c67ddc459a2582919eece27c412d6ffd1bd0793ff35399381cb229326b961798ce4f4cc60ddfdb"
-}
+  "packageManager": "yarn@4.6.0"
+}

scripts/.yarnrc.yml

@@ -2,7 +2,7 @@ compressionLevel: 0
 
 enableGlobalCache: true
 
-installStatePath: '../.yarn/scripts-install-state.gz'
+installStatePath: ../.yarn/scripts-install-state.gz
 
 logFilters:
   - code: YN0005
@@ -12,17 +12,16 @@ logFilters:
 
 nodeLinker: node-modules
 
-npmRegistryServer: 'https://registry.yarnpkg.com'
+npmRegistryServer: "https://registry.yarnpkg.com"
 
 plugins:
   - path: ../.yarn/plugins/@yarnpkg/plugin-typescript.cjs
-    spec: '@yarnpkg/plugin-typescript'
+    spec: "@yarnpkg/plugin-typescript"
   - path: ../.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: '@yarnpkg/plugin-interactive-tools'
+    spec: "@yarnpkg/plugin-interactive-tools"
   - path: ../.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: '@yarnpkg/plugin-workspace-tools'
+    spec: "@yarnpkg/plugin-workspace-tools"
 
-# See https://github.com/nrwl/nx/issues/22177
 supportedArchitectures:
   cpu:
     - current
@@ -36,6 +35,4 @@ supportedArchitectures:
 unsafeHttpWhitelist:
   - localhost
 
-yarnPath: ../.yarn/releases/yarn-4.3.0.cjs
-# Sometimes you get a "The remote archive doesn't match the expected checksum" error, uncommenting this line will fix it
-# checksumBehavior: 'update'
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

scripts/get-sandbox-dir.ts

@@ -0,0 +1,28 @@
+import { program } from 'commander';
+
+import { esMain } from './utils/esmain';
+
+type RunOptions = {
+  template?: string;
+};
+
+// Get sandbox directory from template name
+// replace '/' by a '-'
+async function run({ template }: RunOptions) {
+  console.log(template.replace('/', '-'));
+}
+
+if (esMain(import.meta.url)) {
+  program
+    .description('Retrieve the sandbox directory for template name')
+    .option('--template <template>', 'Template name');
+
+  program.parse(process.argv);
+
+  const options = program.opts() as RunOptions;
+
+  run(options).catch((err) => {
+    console.error(err);
+    process.exit(1);
+  });
+}

scripts/package.json

@@ -12,6 +12,7 @@
     "docs:prettier:write": "cd ../docs && prettier --write ./_snippets",
     "generate-sandboxes": "jiti ./sandbox/generate.ts",
     "get-report-message": "jiti ./get-report-message.ts",
+    "get-sandbox-dir": "jiti ./get-sandbox-dir.ts",
     "get-template": "jiti ./get-template.ts",
     "lint": "yarn lint:js && yarn lint:md",
     "lint:js": "yarn lint:js:cmd .  --quiet",
@@ -173,7 +174,7 @@
     "serve-static": "^1.15.0",
     "simple-git": "^3.25.0",
     "slash": "^3.0.0",
-    "sort-package-json": "^2.10.0",
+    "sort-package-json": "^2.14.0",
     "tiny-invariant": "^1.3.3",
     "tinyexec": "^0.3.0",
     "trash": "^7.2.0",

scripts/yarn.lock

@@ -1739,7 +1739,7 @@ __metadata:
     serve-static: "npm:^1.15.0"
     simple-git: "npm:^3.25.0"
     slash: "npm:^3.0.0"
-    sort-package-json: "npm:^2.10.0"
+    sort-package-json: "npm:^2.14.0"
     tiny-invariant: "npm:^1.3.3"
     tinyexec: "npm:^0.3.0"
     trash: "npm:^7.2.0"
@@ -6532,6 +6532,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fdir@npm:^6.4.2":
+  version: 6.4.3
+  resolution: "fdir@npm:6.4.3"
+  peerDependencies:
+    picomatch: ^3 || ^4
+  peerDependenciesMeta:
+    picomatch:
+      optional: true
+  checksum: 10c0/d13c10120e9625adf21d8d80481586200759928c19405a816b77dd28eaeb80e7c59c5def3e2941508045eb06d34eb47fad865ccc8bf98e6ab988bb0ed160fb6f
+  languageName: node
+  linkType: hard
+
 "file-entry-cache@npm:^6.0.1":
   version: 6.0.1
   resolution: "file-entry-cache@npm:6.0.1"
@@ -7212,7 +7224,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globby@npm:^13.0.0, globby@npm:^13.1.2":
+"globby@npm:^13.0.0":
   version: 13.2.2
   resolution: "globby@npm:13.2.2"
   dependencies:
@@ -11393,7 +11405,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picomatch@npm:^4.0.1":
+"picomatch@npm:^4.0.1, picomatch@npm:^4.0.2":
   version: 4.0.2
   resolution: "picomatch@npm:4.0.2"
   checksum: 10c0/7c51f3ad2bb42c776f49ebf964c644958158be30d0a510efd5a395e8d49cb5acfed5b82c0c5b365523ce18e6ab85013c9ebe574f60305892ec3fa8eee8304ccc
@@ -13737,21 +13749,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sort-package-json@npm:^2.10.0":
-  version: 2.10.0
-  resolution: "sort-package-json@npm:2.10.0"
+"sort-package-json@npm:^2.14.0":
+  version: 2.14.0
+  resolution: "sort-package-json@npm:2.14.0"
   dependencies:
     detect-indent: "npm:^7.0.1"
     detect-newline: "npm:^4.0.0"
     get-stdin: "npm:^9.0.0"
     git-hooks-list: "npm:^3.0.0"
-    globby: "npm:^13.1.2"
     is-plain-obj: "npm:^4.1.0"
     semver: "npm:^7.6.0"
     sort-object-keys: "npm:^1.1.3"
+    tinyglobby: "npm:^0.2.9"
   bin:
     sort-package-json: cli.js
-  checksum: 10c0/f3325c402cd63fa42947e3861fde0ed26c742bb1db9011d4a4111f2a27427ec778ce8223af5c5dd8fcdb1cf49a1ff55d7e5323fb187d29811cd99e503a80fe26
+  checksum: 10c0/bcc114a3b5e11d4539ba46dd4eeda6d6909202cb1a9526c230850f1edfdfcf8712e9479b71f98d8f6cb8554740294acdfcaae84461dcecd90592867e1ba90924
   languageName: node
   linkType: hard
 
@@ -14450,6 +14462,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tinyglobby@npm:^0.2.9":
+  version: 0.2.10
+  resolution: "tinyglobby@npm:0.2.10"
+  dependencies:
+    fdir: "npm:^6.4.2"
+    picomatch: "npm:^4.0.2"
+  checksum: 10c0/ce946135d39b8c0e394e488ad59f4092e8c4ecd675ef1bcd4585c47de1b325e61ec6adfbfbe20c3c2bfa6fd674c5b06de2a2e65c433f752ae170aff11793e5ef
+  languageName: node
+  linkType: hard
+
 "tinypool@npm:^1.0.2":
   version: 1.0.2
   resolution: "tinypool@npm:1.0.2"

test-storybooks/portable-stories-kitchen-sink/nextjs/.yarnrc.yml

@@ -1,3 +1,3 @@
 enableImmutableInstalls: false
 nodeLinker: node-modules
-yarnPath: ../../../.yarn/releases/yarn-4.3.0.cjs
+yarnPath: ../../../.yarn/releases/yarn-4.6.0.cjs

test-storybooks/portable-stories-kitchen-sink/react/.yarnrc.yml

@@ -1 +1 @@
-yarnPath: ../../../.yarn/releases/yarn-4.3.0.cjs
+yarnPath: ../../../.yarn/releases/yarn-4.6.0.cjs