Merge pull request #237 from eik-lib/refactor

Common package refactor

.eslintrc

@@ -1,10 +1,34 @@
 {
-  "extends": ["airbnb-base", "prettier"],
-  "plugins": ["prettier"],
-  "rules": {
-    "strict": [0, "global"],
-    "class-methods-use-this": [0],
-    "no-underscore-dangle": [0],
-    "no-restricted-syntax": [0]
-  }
+    "parser": "@babel/eslint-parser",
+    "extends": [
+        "airbnb-base",
+        "prettier"
+    ],
+    "plugins": [
+        "prettier"
+    ],
+    "parserOptions": {
+        "ecmaVersion": 11,
+        "sourceType": "module",
+        "requireConfigFile": false
+    },
+    "rules": {
+        "import/prefer-default-export": "off",
+        "import/extensions": [
+            "error",
+            {
+                "js": "ignorePackages",
+                "json": "ignorePackages"
+            }
+        ],
+        "class-methods-use-this": [
+            0
+        ],
+        "no-underscore-dangle": [
+            0
+        ],
+        "no-restricted-syntax": [
+            0
+        ]
+    }
 }

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        node-version: [14.x, 16.x]
+        node-version: [16.x, 18.x]
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
@@ -17,29 +17,29 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - name: install dependencies
         run: |
-          npm install
+          npm install --workspaces
         env:
           CI: true
       - name: lint files
         run: |
-          npm run lint
+          npm run lint --workspaces
         env:
           CI: true
       - name: style check files
         run: |
-          npm run style:check
+          npm run style:check --workspaces
         env:
           CI: true
       - name: typecheck files
         run: |
-          npm run typecheck
+          npm run typecheck --workspaces
         env:
           CI: true
       - name: check eik json schema is up to date
         run: |
-          npm run schema:outdated
+          npm run schema:outdated --workspace=packages/schemas
         env:
           CI: true
       - name: run tests
         run: |
-          npm test
+          npm test --workspaces

.gitignore

@@ -10,5 +10,5 @@ tmp/**/*
 *.log
 coverage
 .vscode
-eik.json
-types
+.eik.json
+types

.prettierignore

@@ -1,5 +1,5 @@
-node_modules
-.nyc_output
+node_modules/**/*
+.nyc_output/**/*
 package-lock.json
 node_modules/**/*
 .DS_Store

test/fixtures/client-with-bare-imports.js → fixtures/client-with-bare-imports.js

@@ -1,7 +1,5 @@
 /* eslint-disable import/no-unresolved */
 
-'use strict';
-
 import scrollIntoView from 'scroll-into-view-if-needed';
 
 const main = () => {

test/fixtures/client.js → fixtures/client.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const main = () => {
     const thing = 'this is a test fixture';
     return thing;

test/fixtures/folder/client.js → fixtures/folder/client.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const main = () => {
     const thing = 'this is a test fixture';
     return thing;

package.json

@@ -1,64 +1,9 @@
 {
   "name": "@eik/common",
-  "version": "4.0.0-next.5",
-  "description": "Common utilities for Eik modules",
-  "main": "lib/index.js",
-  "types": "types/index.d.ts",
-  "files": [
-    "CHANGELOG.md",
-    "package.json",
-    "lib",
-    "types",
-    "eikjson.d.ts"
-  ],
-  "scripts": {
-    "test": "tap  --no-check-coverage",
-    "lint:fix": "eslint --fix .",
-    "lint": "eslint .",
-    "schema:types": "json2ts lib/schemas/eikjson.schema.json > eikjson.d.ts",
-    "schema:outdated": "npm run schema:types && git diff --exit-code HEAD:eikjson.d.ts eikjson.d.ts",
-    "style:check": "prettier -c .",
-    "style:format": "prettier -w .",
-    "typecheck": "tsc",
-    "prepublish": "npm run typecheck"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/eik-lib/common.git"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/eik-lib/common/issues"
-  },
-  "homepage": "https://github.com/eik-lib/common#readme",
-  "dependencies": {
-    "ajv": "^8.6.2",
-    "ajv-formats": "^2.1.0",
-    "glob": "^8.0.0",
-    "is-glob": "^4.0.1",
-    "mime-types": "^2.1.29",
-    "node-fetch": "^2.6.1",
-    "semver": "^7.0.0",
-    "validate-npm-package-name": "^4.0.0"
-  },
-  "devDependencies": {
-    "@hapi/hapi": "20.2.2",
-    "@semantic-release/changelog": "6.0.1",
-    "@semantic-release/git": "10.0.1",
-    "eslint": "7.32.0",
-    "eslint-config-airbnb-base": "14.2.1",
-    "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-prettier": "4.2.1",
-    "express": "4.18.1",
-    "fastify": "3.29.0",
-    "json-schema-to-typescript": "10.1.5",
-    "prettier": "2.7.1",
-    "semantic-release": "18.0.1",
-    "stoppable": "1.1.0",
-    "tap": "15.2.3",
-    "typescript": "4.7.4"
-  }
+  "workspaces": [
+    "packages/config-loader",
+    "packages/utils",
+    "packages/schemas",
+    "packages/validators"
+  ]
 }

packages/config-loader/.prettierignore

@@ -0,0 +1,17 @@
+node_modules/**/*
+.nyc_output/**/*
+package-lock.json
+node_modules/**/*
+.DS_Store
+tmp/**/*
+.idea
+.idea/**/*
+*.iml
+*.log
+coverage
+.vscode
+eikjson.d.ts
+CHANGELOG.md
+dist
+types
+renovate.json

packages/config-loader/index.js

@@ -0,0 +1,13 @@
+const ReadFile = require('./src/classes/read-file.js');
+const EikConfig = require('./src/eik-config.js');
+const getDefaults = require('./src/get-defaults.js');
+const configStore = require('./src/config-store.js');
+const localAssets = require('./src/local-assets');
+
+module.exports = {
+    ReadFile,
+    EikConfig,
+    getDefaults,
+    configStore,
+    localAssets,
+};