jqtree 1.6.0 → 1.6.3

package/.eslintrc

@@ -1,6 +1,6 @@
 {
     "parser": "@typescript-eslint/parser",
-    "plugins": ["@typescript-eslint", "import", "jest"],
+    "plugins": ["@typescript-eslint", "import"],
     "extends": [
         "eslint:recommended",
         "plugin:@typescript-eslint/eslint-recommended",
@@ -8,8 +8,7 @@
         "plugin:@typescript-eslint/recommended-requiring-type-checking",
         "plugin:import/errors",
         "plugin:import/warnings",
-        "plugin:import/typescript",
-        "plugin:jest/all"
+        "plugin:import/typescript"
     ],
     "rules": {
         "@typescript-eslint/explicit-function-return-type": "off",
@@ -27,14 +26,7 @@
                 "allowAny": false,
                 "allowNullish": false
             }
-        ],
-        "jest/consistent-test-it": "off",
-        "jest/prefer-expect-assertions": "off",
-        "jest/no-duplicate-hooks": "off",
-        "jest/no-hooks": "off",
-        "jest/no-identical-title": "off",
-        "jest/prefer-strict-equal": "off",
-        "jest/require-top-level-describe": "off"
+        ]
     },
     "parserOptions": {
         "project": "./tsconfig.json"

package/.github/workflows/ci.yml

@@ -8,44 +8,69 @@ jobs:
 
         steps:
             - name: Check out repository code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
             - name: Setup node
-              uses: actions/setup-node@v1
+              uses: actions/setup-node@v3
               with:
-                  node-version: "14"
-            - name: Get yarn cache directory path
-              id: yarn-cache-dir-path
-              run: echo "::set-output name=dir::$(yarn cache dir)"
-            - name: Cache javascript packages
-              uses: actions/cache@v2
+                  node-version: "16"
+            - name: Install pnpm
+              run: npm install -g pnpm
+            - name: Get pnpm store directory
+              id: pnpm-cache
+              run: |
+                echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
+            - uses: actions/cache@v3
+              name: Setup pnpm cache
+              with:
+                path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
+                key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+                restore-keys: |
+                  ${{ runner.os }}-pnpm-store-
+            - uses: actions/cache@v3
+              name: Setup Playwright browsers cache
               with:
-                  path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/package.json') }}
-                  restore-keys: |
-                      ${{ runner.os }}-yarn-
+                path: /home/runner/.cache/ms-playwright/
+                key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+                restore-keys: |
+                  ${{ runner.os }}-playwright-
             - name: Install packages
               run: |
-                  yarn --prefer-offline
+                  pnpm install
             - name: Build
               run: |
-                  yarn run production
+                  pnpm production
             - name: Lint
               run: |
-                  yarn run lint
+                  pnpm lint
             - name: Check types
               run: |
-                  yarn run tsc
-            - name: Run tests
-              run: |
-                  yarn run clean-coverage
-                  yarn run test
+                  pnpm tsc
+            - name: Clean coverage
+              run: pnpm clean-coverage
+            - name: Run jest tests
+              run: pnpm jest
+            - name: Playwright install
+              run: npx playwright install chromium
+            - name: Run playwright tests
+              run: pnpm playwright
+            - name: Screenshots artifact
+              if: always()
+              uses: actions/upload-artifact@v3
+              with:
+                name: screenshots
+                path: src/playwright/playwright.test.ts-snapshots/
             - name: Merge coverage
               run: |
-                  yarn run merge-coverage
-                  yarn run print-coverage
+                  pnpm merge-coverage
+                  pnpm print-coverage
+            - name: Coverage artifact
+              uses: actions/upload-artifact@v3
+              with:
+                name: coverage
+                path: .nyc_output
             - name: Coveralls
               run: |
-                  yarn run coveralls
+                  pnpm coveralls
               env:
                   COVERALLS_REPO_TOKEN: ${{ secrets.github_token }}
                   COVERALLS_SERVICE_NAME: github

package/.github/workflows/codeql-analysis.yml

@@ -1,6 +1,10 @@
 name: "CodeQL"
 
-on: [push]
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
 
 jobs:
     analyze:
@@ -14,15 +18,15 @@ jobs:
 
         steps:
             - name: Checkout repository
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Initialize CodeQL
-              uses: github/codeql-action/init@v1
+              uses: github/codeql-action/init@v2
               with:
                   languages: ${{ matrix.language }}
 
             - name: Autobuild
-              uses: github/codeql-action/autobuild@v1
+              uses: github/codeql-action/autobuild@v2
 
             - name: Perform CodeQL Analysis
-              uses: github/codeql-action/analyze@v1
+              uses: github/codeql-action/analyze@v2

package/.prettier

@@ -0,0 +1,3 @@
+{
+  "tabWidth": 4
+}

package/README.md

@@ -10,10 +10,10 @@ JqTree is a tree widget. Read more in the [documentation](https://mbraak.github.
 
 ## Features
 
-* Create a tree from JSON data
-* Drag and drop
-* Works on ie9+, firefox, chrome and safari
-* Written in Typescript
+-   Create a tree from JSON data
+-   Drag and drop
+-   Works on ie11+, firefox, chrome and safari
+-   Written in Typescript
 
 The project is hosted on [github](https://github.com/mbraak/jqTree), has a [test suite](http://mbraak.github.io/jqTree/test/test.html).
 
@@ -36,18 +36,21 @@ var data = [
     {
         label: "node1",
         id: 1,
-        children: [{ label: "child1", id: 2 }, { label: "child2", id: 3 }]
+        children: [
+            { label: "child1", id: 2 },
+            { label: "child2", id: 3 },
+        ],
     },
     {
         label: "node2",
         id: 4,
-        children: [{ label: "child3", id: 5 }]
-    }
+        children: [{ label: "child3", id: 5 }],
+    },
 ];
 $("#tree1").tree({
     data: data,
     autoOpen: true,
-    dragAndDrop: true
+    dragAndDrop: true,
 });
 ```
 

package/bower.json

@@ -1,6 +1,6 @@
 {
     "name": "jqTree",
-    "version": "1.6.0",
+    "version": "1.6.3",
     "main": ["jqtree.css", "jqtree-circle.png", "tree.jquery.js"],
     "dependencies": {
         "jquery": ">=1.9"

package/config/babel.config.json

@@ -0,0 +1,11 @@
+{
+    "presets": ["@babel/preset-typescript", "@babel/preset-env"],
+    "env": {
+        "test": {
+            "presets": [
+                "@babel/preset-typescript",
+                ["@babel/preset-env", { "targets": { "node": "current" } }]
+            ]
+        }
+    }
+}

package/config/babel.coverage.config.json

@@ -0,0 +1,4 @@
+{
+    "presets": ["@babel/preset-typescript", "@babel/preset-env"],
+    "plugins": ["istanbul"]
+}

package/{jest-jsdom.config.js → config/jest.config.js}

@@ -1,16 +1,20 @@
 module.exports = {
+    coverageDirectory: "jest-coverage",
+    coverageReporters: ["json"],
     modulePathIgnorePatterns: [
-        "<rootDir>/build/",
+        "<rootDir>/docs/_site/",
+        "<rootDir>/docs/static/",
         "<rootDir>/lib/",
-        "<rootDir>/_site/",
-        "<rootDir>/static/",
     ],
-    preset: "ts-jest",
+    rootDir: "../",
     setupFilesAfterEnv: [
         "<rootDir>/src/test/support/setupTests.ts",
         "givens/setup.js",
-        "jest-extended",
+        "jest-extended/all",
     ],
     testEnvironment: "jsdom",
     testRegex: "\\/src\\/test\\/.*\\.test\\.ts",
+    transform: {
+        "\\.tsx?$": ["babel-jest", { root: __dirname }],
+    },
 };

package/config/playwright.config.js

@@ -0,0 +1,18 @@
+const { devices } = require("@playwright/test");
+
+const config = {
+    testDir: "../src/playwright",
+    projects: [
+        {
+            name: "Chromium",
+            use: { ...devices["Desktop Chrome"] },
+        },
+    ],
+    webServer: {
+        command: "pnpm devserver-with-coverage",
+        cwd: "..",
+        port: 8080,
+    },
+};
+
+module.exports = config;

package/config/production

@@ -0,0 +1,4 @@
+rollup -c config/rollup.config.js &&
+DEBUG_BUILD=true rollup -c config/rollup.config.js &&
+babel src --config-file ./config/babel.config.json --out-dir lib --extensions .ts &&
+postcss --config ./config -o jqtree.css css/jqtree.postcss

package/{rollup.config.js → config/rollup.config.js}

@@ -2,10 +2,10 @@ import fs from "fs";
 import path from "path";
 import jsonfile from "jsonfile";
 import template from "lodash.template";
-import typescript from "@rollup/plugin-typescript";
-import { terser } from "rollup-plugin-terser";
+import { babel } from "@rollup/plugin-babel";
+import resolve from "@rollup/plugin-node-resolve";
 import serve from "rollup-plugin-serve";
-import coverage from "rollup-plugin-istanbul2";
+import { terser } from "rollup-plugin-terser";
 
 const getBanner = () => {
     const headerTemplate = fs.readFileSync("./src/header.txt", "utf8");
@@ -24,7 +24,19 @@ const debugBuild = Boolean(process.env.DEBUG_BUILD);
 const devServer = Boolean(process.env.SERVE);
 const includeCoverage = Boolean(process.env.COVERAGE);
 
-const plugins = [typescript()];
+const resolvePlugin = resolve({ extensions: [".ts"] });
+
+const babelConfigFile = includeCoverage
+    ? "babel.coverage.config.json"
+    : "babel.config.json";
+
+const babelPlugin = babel({
+    babelHelpers: "bundled",
+    configFile: path.resolve(__dirname, babelConfigFile),
+    extensions: [".ts"],
+});
+
+const plugins = [resolvePlugin, babelPlugin];
 
 if (!debugBuild) {
     const terserPlugin = terser({
@@ -35,19 +47,12 @@ if (!debugBuild) {
     plugins.push(terserPlugin);
 }
 
-if (includeCoverage) {
-    const coveragePlugin = coverage({
-        esModules: true,
-    });
-    plugins.push(coveragePlugin);
-}
-
 if (devServer) {
     const servePlugin = serve({
         contentBase: [
-            path.join(__dirname, "devserver"),
-            path.join(__dirname, "static"),
-            __dirname,
+            path.join(__dirname, "../devserver"),
+            path.join(__dirname, "../docs/static"),
+            path.join(__dirname, ".."),
         ],
         port: 8080,
     });

package/{jqtree.postcss → css/jqtree.postcss}

@@ -59,6 +59,9 @@ ul.jqtree-tree {
     .jqtree-title {
         color: #1c4257;
         vertical-align: middle;
+    }
+
+    .jqtree-title-button-left {
         margin-left: 1.5em;
 
         &.jqtree-title-folder {

package/devserver/index.html

@@ -8,14 +8,6 @@
             name="description"
             content="JqTree is a jQuery widget for displaying a tree structure in html"
         />
-        <link
-            rel="stylesheet"
-            href="/bower_components/bootstrap/dist/css/bootstrap.min.css"
-        />
-        <link
-            rel="stylesheet"
-            href="/bower_components/bootstrap/dist/css/bootstrap-theme.min.css"
-        />
         <link rel="stylesheet" href="/jqtree.css" />
     </head>
     <body>
@@ -24,7 +16,7 @@
         </div>
     </body>
     <script src="/bower_components/jquery/dist/jquery.min.js"></script>
-    <script src="tree.jquery.js"></script>
+    <script src="/tree.jquery.js"></script>
     <script src="/example_data.js"></script>
     <script src="/devserver.js"></script>
 </html>

package/docs/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'github-pages', group: :jekyll_plugins

package/docs/Gemfile.lock

@@ -0,0 +1,263 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.0.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.11.1)
+    colorator (1.1.0)
+    commonmarker (0.23.4)
+    concurrent-ruby (1.1.10)
+    dnsruby (1.61.9)
+      simpleidn (~> 0.1)
+    em-websocket (0.5.3)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0)
+    ethon (0.15.0)
+      ffi (>= 1.15.0)
+    eventmachine (1.2.7)
+    execjs (2.8.1)
+    faraday (2.3.0)
+      faraday-net_http (~> 2.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (2.0.3)
+    ffi (1.15.5)
+    forwardable-extended (2.6.0)
+    gemoji (3.0.1)
+    github-pages (226)
+      github-pages-health-check (= 1.17.9)
+      jekyll (= 3.9.2)
+      jekyll-avatar (= 0.7.0)
+      jekyll-coffeescript (= 1.1.1)
+      jekyll-commonmark-ghpages (= 0.2.0)
+      jekyll-default-layout (= 0.1.4)
+      jekyll-feed (= 0.15.1)
+      jekyll-gist (= 1.5.0)
+      jekyll-github-metadata (= 2.13.0)
+      jekyll-include-cache (= 0.2.1)
+      jekyll-mentions (= 1.6.0)
+      jekyll-optional-front-matter (= 0.3.2)
+      jekyll-paginate (= 1.1.0)
+      jekyll-readme-index (= 0.3.0)
+      jekyll-redirect-from (= 0.16.0)
+      jekyll-relative-links (= 0.6.1)
+      jekyll-remote-theme (= 0.4.3)
+      jekyll-sass-converter (= 1.5.2)
+      jekyll-seo-tag (= 2.8.0)
+      jekyll-sitemap (= 1.4.0)
+      jekyll-swiss (= 1.0.0)
+      jekyll-theme-architect (= 0.2.0)
+      jekyll-theme-cayman (= 0.2.0)
+      jekyll-theme-dinky (= 0.2.0)
+      jekyll-theme-hacker (= 0.2.0)
+      jekyll-theme-leap-day (= 0.2.0)
+      jekyll-theme-merlot (= 0.2.0)
+      jekyll-theme-midnight (= 0.2.0)
+      jekyll-theme-minimal (= 0.2.0)
+      jekyll-theme-modernist (= 0.2.0)
+      jekyll-theme-primer (= 0.6.0)
+      jekyll-theme-slate (= 0.2.0)
+      jekyll-theme-tactile (= 0.2.0)
+      jekyll-theme-time-machine (= 0.2.0)
+      jekyll-titles-from-headings (= 0.5.3)
+      jemoji (= 0.12.0)
+      kramdown (= 2.3.2)
+      kramdown-parser-gfm (= 1.1.0)
+      liquid (= 4.0.3)
+      mercenary (~> 0.3)
+      minima (= 2.5.1)
+      nokogiri (>= 1.13.4, < 2.0)
+      rouge (= 3.26.0)
+      terminal-table (~> 1.4)
+    github-pages-health-check (1.17.9)
+      addressable (~> 2.3)
+      dnsruby (~> 1.60)
+      octokit (~> 4.0)
+      public_suffix (>= 3.0, < 5.0)
+      typhoeus (~> 1.3)
+    html-pipeline (2.14.1)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
+    http_parser.rb (0.8.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jekyll (3.9.2)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 0.7)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 2.0)
+      kramdown (>= 1.17, < 3)
+      liquid (~> 4.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (>= 1.7, < 4)
+      safe_yaml (~> 1.0)
+    jekyll-avatar (0.7.0)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-coffeescript (1.1.1)
+      coffee-script (~> 2.2)
+      coffee-script-source (~> 1.11.1)
+    jekyll-commonmark (1.4.0)
+      commonmarker (~> 0.22)
+    jekyll-commonmark-ghpages (0.2.0)
+      commonmarker (~> 0.23.4)
+      jekyll (~> 3.9.0)
+      jekyll-commonmark (~> 1.4.0)
+      rouge (>= 2.0, < 4.0)
+    jekyll-default-layout (0.1.4)
+      jekyll (~> 3.0)
+    jekyll-feed (0.15.1)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-gist (1.5.0)
+      octokit (~> 4.2)
+    jekyll-github-metadata (2.13.0)
+      jekyll (>= 3.4, < 5.0)
+      octokit (~> 4.0, != 4.4.0)
+    jekyll-include-cache (0.2.1)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-mentions (1.6.0)
+      html-pipeline (~> 2.3)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-optional-front-matter (0.3.2)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-paginate (1.1.0)
+    jekyll-readme-index (0.3.0)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-redirect-from (0.16.0)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-relative-links (0.6.1)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-remote-theme (0.4.3)
+      addressable (~> 2.0)
+      jekyll (>= 3.5, < 5.0)
+      jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
+      rubyzip (>= 1.3.0, < 3.0)
+    jekyll-sass-converter (1.5.2)
+      sass (~> 3.4)
+    jekyll-seo-tag (2.8.0)
+      jekyll (>= 3.8, < 5.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-swiss (1.0.0)
+    jekyll-theme-architect (0.2.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-cayman (0.2.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-dinky (0.2.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-hacker (0.2.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-leap-day (0.2.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-merlot (0.2.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-midnight (0.2.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-minimal (0.2.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-modernist (0.2.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-primer (0.6.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-github-metadata (~> 2.9)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-slate (0.2.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-tactile (0.2.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-time-machine (0.2.0)
+      jekyll (> 3.5, < 5.0)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-titles-from-headings (0.5.3)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    jemoji (0.12.0)
+      gemoji (~> 3.0)
+      html-pipeline (~> 2.2)
+      jekyll (>= 3.0, < 5.0)
+    kramdown (2.3.2)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.3.6)
+    mini_portile2 (2.8.0)
+    minima (2.5.1)
+      jekyll (>= 3.5, < 5.0)
+      jekyll-feed (~> 0.9)
+      jekyll-seo-tag (~> 2.1)
+    minitest (5.15.0)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    octokit (4.25.0)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    public_suffix (4.0.7)
+    racc (1.6.0)
+    rb-fsevent (0.11.1)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rexml (3.2.5)
+    rouge (3.26.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    safe_yaml (1.0.5)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sawyer (0.9.2)
+      addressable (>= 2.3.5)
+      faraday (>= 0.17.3, < 3)
+    simpleidn (0.2.1)
+      unf (~> 0.1.4)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.10)
+      thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
+    unicode-display_width (1.8.0)
+    zeitwerk (2.5.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  github-pages
+
+BUNDLED WITH
+   2.1.4

package/{_config.yml → docs/_config.yml}

@@ -11,7 +11,14 @@ collections:
     examples:
         output: true
 
-jqtree_version: 1.6.0
+defaults:
+    - scope:
+        path: ""
+        type: "examples"
+      values:
+        layout: "example"
+
+jqtree_version: 1.6.3
 
 # Build settings
 markdown: kramdown

package/{_entries → docs/_entries}/03_features.md

@@ -9,7 +9,7 @@ name: features
 -   Saves the state
 -   Keyboard support
 -   Lazy loading
--   Works on ie9+, firefox, chrome and safari
+-   Works on ie11+, firefox, chrome and safari
 -   Written in Typescript
 
 The project is [hosted on github](https://github.com/mbraak/jqTree).