Merge pull request #203 from painebot/tkp/norm

Normalize package layout with nbcelltests

.github/workflows/build.yml

@@ -30,10 +30,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        # TODO more later
-        # os: [ubuntu-latest, macos-latest, windows-latest]
         python-version: [3.9]
-        node-version: [16.x]
+        node-version: [18.x]
 
     steps:
     - uses: actions/checkout@v3
@@ -42,15 +40,15 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
-        cache: "pip"
-        cache-dependency-path: "pyproject.toml"
+        cache: 'pip'
+        cache-dependency-path: 'pyproject.toml'
 
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'yarn'
-        cache-dependency-path: yarn.lock
+        cache-dependency-path: js/yarn.lock
 
     - name: Install yarn
       run: npm install -g yarn

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "typescript.tsdk": "./js/node_modules/typescript/lib",
+  "eslint.workingDirectories": ["./js"]
+}

Makefile

@@ -1,5 +1,4 @@
 DOCKER_COMPOSE := podman-compose
-YARN := jlpm
 
 ###############
 # Build Tools #
@@ -52,7 +51,7 @@ testpy: ## Clean and Make unit tests
 	python -m pytest -v jupyterfs/tests --junitxml=junit.xml --cov=jupyterfs --cov-report=xml:.coverage.xml --cov-branch --cov-fail-under=20 --cov-report term-missing
 
 testjs: ## Clean and Make js tests
-	cd js; ${YARN} test
+	cd js; jlpm test
 
 test: tests
 tests: testpy testjs ## run the tests
@@ -67,15 +66,15 @@ lintpy:  ## Lint Python with Ruff
 	python -m ruff format --check jupyterfs setup.py
 
 lintjs:  ## Lint Javascript with ESlint
-	cd js; ${YARN} lint
+	cd js; jlpm lint
 
 lint: lintpy lintjs  ## run linter
 
 fixpy:  ## Autoformat Python with Ruff
 	python -m ruff format jupyterfs/ setup.py
 
 fixjs:  ## Autoformat JavaScript with ESlint
-	cd js; ${YARN} fix
+	cd js; jlpm fix
 
 fix: fixpy fixjs  ## run black/tslint fix
 format: fix
@@ -122,7 +121,7 @@ clean: ## clean the repository
 	find . -name ".ipynb_checkpoints" | xargs  rm -rf
 	rm -rf .coverage coverage *.xml build dist *.egg-info lib node_modules .pytest_cache *.egg-info
 	rm -rf jupyterfs/labextension jupyterfs/nbextension/static/index*
-	cd js && ${YARN} clean
+	cd js && jlpm clean
 	git clean -fd
 
 ###########

js/.eslintrc.js

@@ -1,9 +1,18 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 module.exports = {
   ignorePatterns: ["lib/**", "node_modules/**", "filetree.ts", "utils.ts"],
   env: {
     browser: true,
     es6: true,
     commonjs: true,
+    jest: true,
   },
   extends: [
     "eslint:recommended",

js/babel.config.js

@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 module.exports = {
   presets: [
     [

js/jest.config.js

@@ -1,4 +1,27 @@
-const esModules = ["@jupyter", "@jupyterlab", "@jupyter-widgets", "@lumino", "lib0", "nanoid", "y-protocols", "internmap", "delaunator", "robust-predicates", "lodash-es", "tree-finder"].join("|");
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the nbcelltests authors.
+ *
+ * This file is part of the nbcelltests library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
+const esModules = [
+  "@jupyter",
+  "@jupyterlab",
+  "@jupyter-widgets",
+  "@lumino",
+  "@microsoft",
+  "delaunator",
+  "exenv-es6",
+  "internmap",
+  "lib0",
+  "lodash-es",
+  "nanoid",
+  "robust-predicates",
+  "vscode-ws-jsonrpc",
+  "y-protocols",
+].join("|");
 
 module.exports = {
   preset: "ts-jest/presets/js-with-babel",

js/package.json

@@ -18,18 +18,17 @@
     "build:prod": "jlpm build:lib && jlpm build:labextension:prod",
     "build:labextension:prod": "jupyter labextension build --source-map=True .",
     "build:lib": "tsc -b",
-    "clean": "rimraf *junit.xml .jupyter coverage* dist lib tsconfig.tsbuildinfo",
+    "clean": "rimraf dist lib tsconfig.tsbuildinfo",
     "clean:labextension": "rimraf ../jupyterfs/labextension",
     "clean:slate": "jlpm clean && jlpm clean:labextension && rimraf node_modules",
-    "deduplicate": "jlpm yarn-deduplicate -s fewer ../yarn.lock || jlpm yarn-deduplicate -s fewer",
+    "deduplicate": "jlpm yarn-deduplicate -s fewer yarn.lock || jlpm yarn-deduplicate -s fewer",
     "fix": "jlpm lint --fix",
     "integrity": "jlpm install && jlpm deduplicate && jlpm install",
     "lint": "eslint -c .eslintrc.js --ext .js,.ts,.tsx src/ tests/",
     "postpack": "shx rm README.md",
     "prepack": "shx cp ../README.md .",
     "prepublishOnly": "jlpm clean && jlpm clean:labextension && jlpm integrity && jlpm build:prod",
     "test": "jest --coverage",
-    "test:browser": "../ci/browser_check.sh",
     "watch": "run-p watch:lib watch:labextension",
     "watch:lib": "tsc -b -w",
     "watch:labextension": "jupyter labextension watch ."

js/style/index.js

@@ -1 +1,9 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 import './index.css';

js/tests/activate.test.ts

@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 import "isomorphic-fetch";
 
 import { browser, progressStatus } from "../src/index";

js/tests/assetsTransformer.js

@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 const path = require("path");
 
 module.exports = {

js/tests/export.test.ts

@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 import "isomorphic-fetch";
 
 import * as extension from "../src/index";

js/tests/fileMock.js

@@ -1 +1,9 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 module.exports = "test-file-stub";

js/tests/jest-setup.js

@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 /* eslint-disable no-undef */
 //global.fetch = require("jest-fetch-mock");
 const version = process.version.match(/^v((\d+)\.(\d+))/).slice(2, 4).map(v => parseInt(v));

js/tests/settings.test.ts

@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 import "isomorphic-fetch";
 
 import { unpartialResource } from "../src/settings";

js/tests/setup.js

@@ -1,3 +1,25 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 Object.defineProperty(window, "DragEvent", {
   value: class DragEvent {},
 });
+
+Object.defineProperty(window, "matchMedia", {
+  writable: true,
+  value: jest.fn().mockImplementation(query => ({
+    matches: false,
+    media: query,
+    onchange: null,
+    addListener: jest.fn(), // Deprecated
+    removeListener: jest.fn(), // Deprecated
+    addEventListener: jest.fn(),
+    removeEventListener: jest.fn(),
+    dispatchEvent: jest.fn(),
+  })),
+});

js/tests/snippets.test.ts

@@ -1,3 +1,11 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 import "isomorphic-fetch";
 
 import {

js/tests/styleMock.js

@@ -1 +1,9 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019, the jupyter-fs authors.
+ *
+ * This file is part of the jupyter-fs library, distributed under the terms of
+ * the Apache License 2.0.  The full license can be found in the LICENSE file.
+ *
+ */
 module.exports = {};