Improvements to the Module System

.eslintignore

@@ -1,3 +1,6 @@
 .github/
 .husky/
 build/
+
+**/.eslintrc*.js
+scripts/templates/templates

.eslintrc.base.js

@@ -209,7 +209,7 @@ module.exports = {
     'no-lonely-if': 1,
     'no-loop-func': 1,
     // "no-magic-numbers": 0,
-    'no-mixed-operators': 1,
+    'no-mixed-operators': 0,
     'no-multi-assign': 1,
     'no-multi-str': 1,
     // "no-negated-condition": 0,
@@ -318,7 +318,6 @@ module.exports = {
     'require-await': 1,
     'require-unicode-regexp': 1,
     'require-yield': 1, // Was 2
-    // 'sort-imports': 0,
     // "sort-keys": 0,
     // "sort-vars": 0,
     'spaced-comment': [

.eslintrc.test.json

@@ -0,0 +1,4 @@
+{
+  "extends": ["plugin:jest/recommended"],
+  "plugins": ["jest"]
+}

.gitignore

@@ -6,7 +6,7 @@ build/*
 /package-lock.json
 coverage/
 
-scripts/rollup/database.json
+scripts/build/database.json
 
 # Compiled source #
 ###################

babel.config.js

@@ -1,4 +1,4 @@
-module.exports = {
+const defaultConfig = {
   /**
    * - **script** - Parse the file using the ECMAScript Script grammar. No import/export statements allowed, and files are not in strict mode.
    * - **module** - Parse the file using the ECMAScript Module grammar. Files are automatically strict, and import/export statements are allowed.
@@ -89,3 +89,10 @@ module.exports = {
     ],
   ],
 };
+
+module.exports = api => api.env('test') ? {
+  ...defaultConfig,
+  plugins: [
+    ["babel-plugin-transform-import-meta", { module: "ES6" }]
+  ],
+} : defaultConfig;

jest.config.ts

@@ -0,0 +1,19 @@
+export default {
+  roots: [
+    "<rootDir>/src/bundles",
+    "<rootDir>/src/tabs",
+    "<rootDir>/scripts"
+  ],
+  modulePaths:[
+    '<rootDir>',
+  ],
+  // Module Name settings required to make chalk work with jest
+  moduleNameMapper: {
+    "#(.*)": "<rootDir>/node_modules/$1",
+    "lowdb": "<rootDir>/node_modules/lowdb/lib",
+    "steno": "<rootDir>/node_modules/steno/lib",
+  },
+  transformIgnorePatterns: [
+    'node_modules/(?!=chalk)/'
+  ],
+}

package.json

@@ -6,29 +6,29 @@
   "license": "Apache-2.0",
   "scripts-info": {
     "//NOTE": "Run `npm i npm-scripts-info -g` to install once globally, then run `npm-scripts-info` as needed to list these descriptions",
-    "module": "Interactively initialise a new bundle or tab from their templates",
+    "create": "Interactively initialise a new bundle or tab from their templates",
     "lint": "Check code for eslint warnings and errors",
-    "lint:fix": "Lint code and fix automatically fixable problems",
+    "lint:src": "Lint bundle and tab code",
+    "lint:scripts": "Lint build script code",
     "build": "Lint code, then build modules and documentation",
-    "build:rollup": "Transpile modules into the `build/` folder and copy over `modules.json`",
     "build:docs": "Generate TypeDocs in the `build/documentation/` folder",
-    "rebuild": "Build only modules whose files have been modified since the last build/rebuild",
     "serve": "Start the HTTP server to serve all files in `build/`, with the same directory structure",
+    "scripts": "Run a script within the scripts directory using ts-node",
     "dev": "Rebuild modules, then serve",
     "prepare": "Enable git hooks",
     "test": "Run unit tests",
     "test:watch": "Watch files for changes and rerun tests related to changed files"
   },
   "scripts": {
-    "module": "node ./scripts/templates/app.js",
-    "lint": "./node_modules/.bin/eslint --ext \".ts, .tsx\" src/",
-    "lint:fix": "./node_modules/.bin/eslint --ext \".ts, .tsx\" src/ --fix",
-    "build": "yarn lint && yarn build:rollup && yarn build:docs",
-    "build:rollup": "./node_modules/.bin/tsc && rollup -c scripts/rollup/rollup.config.js",
-    "build:docs": "node ./scripts/docs/index.js",
-    "rebuild": "./node_modules/.bin/tsc && rollup -c scripts/rollup/rollup.config.js --quick",
+    "create": "yarn scripts create",
+    "lint": " yarn lint:src && yarn lint:scripts",
+    "lint:src": "./node_modules/.bin/eslint -c src/.eslintrc.js --ext \".ts, .tsx\" src/",
+    "lint:scripts": "./node_modules/.bin/eslint -c scripts/.eslintrc.js --ext \".ts, .tsx\" scripts/",
+    "build": "yarn lint && yarn scripts build",
+    "build:docs": "yarn scripts build docs",
     "serve": "http-server --cors=* -c-1 -p 8022 ./build",
-    "dev": "yarn rebuild && yarn serve",
+    "dev": "yarn build && yarn serve",
+    "scripts": "cross-env TS_NODE_PROJECT=scripts/tsconfig.json ts-node scripts/index.ts",
     "prepare": "husky install",
     "test": "jest --verbose",
     "test:watch": "jest --watch"
@@ -44,42 +44,46 @@
     "@rollup/plugin-typescript": "^8.2.0",
     "@types/dom-mediacapture-record": "^1.0.11",
     "@types/jest": "^27.4.1",
+    "@types/lowdb": "^1.0.11",
     "@types/node": "^17.0.23",
     "@types/react": "^17.0.43",
     "@typescript-eslint/eslint-plugin": "^5.18.0",
     "@typescript-eslint/parser": "^5.18.0",
     "babel-jest": "^26.6.3",
-    "chalk": "^4.1.2",
-    "eslint": "^8.12.0",
+    "babel-plugin-transform-import-meta": "^2.2.0",
+    "chalk": "^5.0.1",
+    "commander": "^9.4.0",
+    "cross-env": "^7.0.3",
+    "eslint": "^8.21.0",
+    "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-typescript": "^2.7.1",
     "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jest": "^26.8.1",
     "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-react-hooks": "^4.4.0",
     "generate-template-files": "^3.0.0",
     "http-server": "^0.12.3",
     "husky": "5",
     "jest": "^26.6.3",
-    "lowdb": "1.0.0",
-    "prettier": "^2.2.1",
+    "lowdb": "^3.0.0",
     "rollup": "^2.41.2",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-copy": "^3.4.0",
     "rollup-plugin-filesize": "^9.1.1",
     "rollup-plugin-inject-process-env": "^1.3.1",
     "ts-jest": "^26.5.4",
-    "typedoc": "^0.20.33",
+    "ts-node": "^10.9.1",
+    "typedoc": "^0.23.10",
     "typescript": "^4.2.3",
     "yarnhook": "^0.5.1"
   },
   "dependencies": {
-    "@blueprintjs/core": "^3.54.0",
-    "@blueprintjs/icons": "^3.33.0",
-    "@blueprintjs/popover2": "^0.14.0",
+    "@blueprintjs/core": "^4.6.1",
+    "@blueprintjs/icons": "^4.4.0",
+    "@blueprintjs/popover2": "^1.4.3",
     "@jscad/modeling": "^2.9.5",
     "@jscad/regl-renderer": "^2.6.1",
     "classnames": "^2.3.1",
@@ -93,12 +97,5 @@
     "regl": "^2.1.0",
     "tslib": "^2.3.1",
     "typedoc-default-themes": "^0.12.10"
-  },
-  "jest": {
-    "roots": [
-      "<rootDir>/src/bundles",
-      "<rootDir>/src/tabs",
-      "<rootDir>/scripts"
-    ]
   }
 }

scripts/.eslintignore

@@ -0,0 +1,2 @@
+.eslintrc.js
+templates/templates

scripts/.eslintrc.js

@@ -0,0 +1,27 @@
+// Leaving everything double quoted so it's easier to switch between JS and JSON
+// Since JSON has automatic schema validation
+
+module.exports = {
+  // Need react here because otherwise we get undefined rule errors
+  "plugins": ["import", "react", "@typescript-eslint"],
+  "extends": ["../.eslintrc.base.js", "airbnb-typescript"],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaVersion": 2022,
+    "project": "./tsconfig.json",
+    "tsconfigRootDir": __dirname,
+  },
+  "rules": {
+    "func-style": 0,
+    "import/no-extraneous-dependencies": 0,
+    "no-console": 0,
+    "no-continue": 0,
+    "no-param-reassign": 0,
+    "no-restricted-syntax": 0,
+    "prefer-const": 0
+  },
+  "overrides": [{
+    "extends": "../.eslintrc.test.json",
+    "files": ["./**/__tests__/**.test.ts"],
+  }]
+}