Merge remote-tracking branch 'origin/main' into empty-open-drop

.github/workflows/build-and-test.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: "16.x"
+          node-version: "20.x"
           registry-url: "https://registry.npmjs.org"
       - run: yarn
       - run: yarn build

.github/workflows/prerelease.yml

@@ -0,0 +1,21 @@
+name: Publish Pre-Release to NPM
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  publish_prerelease:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "20.x"
+          registry-url: "https://registry.npmjs.org"
+      - run: yarn
+      - run: yarn bump prerelease
+      - run: bin/publish --tag next
+        env:
+          YARN_NPM_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}

.github/workflows/publish.yml

@@ -1,5 +1,6 @@
-name: Publish Package to npm
+name: Publish Package to NPM
 on:
+  workflow_dispatch:
   release:
     types: [created]
 jobs:
@@ -9,11 +10,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: "16.x"
+          node-version: "20.x"
           registry-url: "https://registry.npmjs.org"
-      - run: cp README.md packages/react-arborist/README.md
-      - run: yarn
-      - run: yarn workspace react-arborist build
-      - run: yarn workspace react-arborist npm publish
+      - run: bin/publish --tag latest
         env:
           YARN_NPM_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}

.gitignore

@@ -22,9 +22,6 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-# react-arborist
-*dist*
-
 .pnp.*
 .yarn/*
 !.yarn/patches

.node-version

@@ -0,0 +1 @@
+20.5.0

.yarnrc.yml

@@ -1,7 +1,7 @@
-nodeLinker: node-modules
+compressionLevel: mixed
+
+enableGlobalCache: false
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
-    spec: "@yarnpkg/plugin-version"
+nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.2.0.cjs
+yarnPath: .yarn/releases/yarn-4.0.2.cjs

bin/publish

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+yarn
+yarn build
+cp README.md packages/react-arborist/README.md
+yarn workspace react-arborist npm publish $@

package.json

@@ -4,20 +4,15 @@
     "./packages/*"
   ],
   "scripts": {
-    "start": "run-p 'start:**'",
-    "start:showcase": "yarn workspace showcase start",
-    "start:library": "yarn workspace react-arborist start",
-    "build": "run-s build:react-arborist build:showcase",
-    "build:react-arborist": "yarn workspace react-arborist build",
-    "build:showcase": "yarn workspace showcase build",
-    "test": "run-p test:react-arborist test:e2e",
-    "test:react-arborist": "yarn workspace react-arborist test",
-    "test:e2e": "yarn workspace e2e test"
+    "build": "yarn workspaces foreach --all run build",
+    "test": "yarn workspaces foreach --all run test",
+    "bump": "yarn workspace react-arborist version",
+    "publish": "sh bin/publish"
   },
   "private": true,
-  "packageManager": "yarn@3.2.0",
+  "packageManager": "yarn@4.0.2",
   "devDependencies": {
     "npm-run-all": "^4.1.5",
-    "typescript": ">=3.0.0"
+    "typescript": "^5.3.3"
   }
 }

packages/e2e/cypress/e2e/gmail-spec.cy.ts → packages/e2e/cypress/e2e/gmail-spec.cy.js

@@ -64,14 +64,14 @@ describe("Testing the Gmail Demo", () => {
     cy.focused().type("a");
     cy.focused().type("Root{enter}");
     cy.get("@item").contains("Root").click();
-    cy.focused().should("have.attr", "aria-level", "0");
+    cy.focused().should("have.attr", "aria-level", "1");
 
     // On a folder that is open
     cy.get("@item").contains("Categories").click(); // opened it
     cy.focused().type("a");
     cy.focused().type("Child{enter}");
     cy.get("@item").contains("Child").click();
-    cy.focused().should("have.attr", "aria-level", "1");
+    cy.focused().should("have.attr", "aria-level", "2");
   });
 
   it("Creates Internal Nodes", () => {
@@ -95,14 +95,14 @@ describe("Testing the Gmail Demo", () => {
     cy.focused().type("Root{enter}");
     cy.get("@item").contains("Root").click();
     cy.focused().children().should("have.class", "isInternal");
-    cy.focused().should("have.attr", "aria-level", "0");
+    cy.focused().should("have.attr", "aria-level", "1");
 
     // On a folder that is open
     cy.get("@item").contains("Categories").click(); // opened it
     cy.focused().type("A");
     cy.focused().type("Child{enter}");
     cy.get("@item").contains("Child").click();
-    cy.focused().should("have.attr", "aria-level", "1");
+    cy.focused().should("have.attr", "aria-level", "2");
   });
 
   it("drags and drops in its list", () => {
@@ -141,7 +141,7 @@ describe("Testing the Gmail Demo", () => {
   });
 });
 
-function dragAndDrop(src: any, dst: any) {
+function dragAndDrop(src, dst) {
   const dataTransfer = new DataTransfer();
   src.trigger("dragstart", { dataTransfer });
   dst.trigger("drop", { dataTransfer });

packages/e2e/package.json

@@ -4,13 +4,12 @@
   "scripts": {
     "cy:run": "yarn cypress run",
     "start": "yarn cypress open",
-    "serve": "yarn workspace showcase serve > /dev/null",
+    "serve": "yarn workspace showcase static > /dev/null",
     "test": "start-server-and-test serve http://localhost:3000 cy:run"
   },
   "devDependencies": {
-    "cypress": "^12.4.1",
-    "serve": "^14.2.0",
-    "start-server-and-test": "^1.15.3",
-    "typescript": "^4.9.4"
+    "cypress": "^13.6.1",
+    "serve": "^14.2.1",
+    "start-server-and-test": "^2.0.3"
   }
 }

packages/react-arborist/.gitignore

@@ -0,0 +1,3 @@
+# this is copied from the root
+README.md
+dist

packages/react-arborist/jest.config.js

@@ -1,5 +1,198 @@
-/** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-};
+/**
+ * For a detailed explanation regarding each configuration property, visit:
+ * https://jestjs.io/docs/configuration
+ */
+
+/** @type {import('jest').Config} */
+const config = {
+  // All imported modules in your tests should be mocked automatically
+  // automock: false,
+
+  // Stop running tests after `n` failures
+  // bail: 0,
+
+  // The directory where Jest should store its cached dependency information
+  // cacheDirectory: "/private/var/folders/lt/60gl0cgx76x1cm9cf7jrgp400000gn/T/jest_dx",
+
+  // Automatically clear mock calls, instances, contexts and results before every test
+  clearMocks: true,
+
+  // Indicates whether the coverage information should be collected while executing the test
+  // collectCoverage: false,
+
+  // An array of glob patterns indicating a set of files for which coverage information should be collected
+  // collectCoverageFrom: undefined,
+
+  // The directory where Jest should output its coverage files
+  // coverageDirectory: undefined,
+
+  // An array of regexp pattern strings used to skip coverage collection
+  // coveragePathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // Indicates which provider should be used to instrument code for coverage
+  coverageProvider: "v8",
+
+  // A list of reporter names that Jest uses when writing coverage reports
+  // coverageReporters: [
+  //   "json",
+  //   "text",
+  //   "lcov",
+  //   "clover"
+  // ],
+
+  // An object that configures minimum threshold enforcement for coverage results
+  // coverageThreshold: undefined,
+
+  // A path to a custom dependency extractor
+  // dependencyExtractor: undefined,
+
+  // Make calling deprecated APIs throw helpful error messages
+  // errorOnDeprecated: false,
+
+  // The default configuration for fake timers
+  // fakeTimers: {
+  //   "enableGlobally": false
+  // },
+
+  // Force coverage collection from ignored files using an array of glob patterns
+  // forceCoverageMatch: [],
+
+  // A path to a module which exports an async function that is triggered once before all test suites
+  // globalSetup: undefined,
+
+  // A path to a module which exports an async function that is triggered once after all test suites
+  // globalTeardown: undefined,
+
+  // A set of global variables that need to be available in all test environments
+  // globals: {},
+
+  // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
+  // maxWorkers: "50%",
+
+  // An array of directory names to be searched recursively up from the requiring module's location
+  // moduleDirectories: [
+  //   "node_modules"
+  // ],
+
+  // An array of file extensions your modules use
+  // moduleFileExtensions: [
+  //   "js",
+  //   "mjs",
+  //   "cjs",
+  //   "jsx",
+  //   "ts",
+  //   "tsx",
+  //   "json",
+  //   "node"
+  // ],
+
+  // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
+  // moduleNameMapper: {},
+
+  // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
+  // modulePathIgnorePatterns: [],
+
+  // Activates notifications for test results
+  // notify: false,
+
+  // An enum that specifies notification mode. Requires { notify: true }
+  // notifyMode: "failure-change",
+
+  // A preset that is used as a base for Jest's configuration
+  preset: "ts-jest",
+
+  // Run tests from one or more projects
+  // projects: undefined,
+
+  // Use this configuration option to add custom reporters to Jest
+  // reporters: undefined,
+
+  // Automatically reset mock state before every test
+  // resetMocks: false,
+
+  // Reset the module registry before running each individual test
+  // resetModules: false,
+
+  // A path to a custom resolver
+  // resolver: undefined,
+
+  // Automatically restore mock state and implementation before every test
+  // restoreMocks: false,
+
+  // The root directory that Jest should scan for tests and modules within
+  rootDir: "./src",
+
+  // A list of paths to directories that Jest should use to search for files in
+  // roots: [
+  //   "<rootDir>"
+  // ],
+
+  // Allows you to use a custom runner instead of Jest's default test runner
+  // runner: "jest-runner",
+
+  // The paths to modules that run some code to configure or set up the testing environment before each test
+  // setupFiles: [],
+
+  // A list of paths to modules that run some code to configure or set up the testing framework before each test
+  // setupFilesAfterEnv: [],
+
+  // The number of seconds after which a test is considered as slow and reported as such in the results.
+  // slowTestThreshold: 5,
+
+  // A list of paths to snapshot serializer modules Jest should use for snapshot testing
+  // snapshotSerializers: [],
+
+  // The test environment that will be used for testing
+  // testEnvironment: "jest-environment-node",
+
+  // Options that will be passed to the testEnvironment
+  // testEnvironmentOptions: {},
+
+  // Adds a location field to test results
+  // testLocationInResults: false,
+
+  // The glob patterns Jest uses to detect test files
+  // testMatch: [
+  //   "**/__tests__/**/*.[jt]s?(x)",
+  //   "**/?(*.)+(spec|test).[tj]s?(x)"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
+  // testPathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // The regexp pattern or array of patterns that Jest uses to detect test files
+  // testRegex: [],
+
+  // This option allows the use of a custom results processor
+  // testResultsProcessor: undefined,
+
+  // This option allows use of a custom test runner
+  // testRunner: "jest-circus/runner",
+
+  // A map from regular expressions to paths to transformers
+  // transform: undefined,
+
+  // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
+  // transformIgnorePatterns: [
+  //   "/node_modules/",
+  //   "\\.pnp\\.[^\\/]+$"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
+  // unmockedModulePathPatterns: undefined,
+
+  // Indicates whether each individual test should be reported during the run
+  // verbose: undefined,
+
+  // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
+  // watchPathIgnorePatterns: [],
+
+  // Whether to use watchman for file crawling
+  // watchman: true,
+};
+
+module.exports = config;