Reorganise ./dist directory and move ./mockserver (#5)

* Reorganise ./dist directory and move ./mockserver * fix(pre-commit): remove exclusions for non-existent directories
specklesystems · Mar 21, 2023 · 1f8e68e · 1f8e68e
1 parent 34c5bba
commit 1f8e68e
Show file tree

Hide file tree

Showing 25 changed files with 11 additions and 19 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,5 +1,4 @@
 dist/
-mockserver/
 lib/
 node_modules/
 vitest.config.ts

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -11,11 +11,11 @@ repos:
       - id: check-shebang-scripts-are-executable
       - id: check-symlinks
       - id: check-vcs-permalinks
-        exclude: ^dist/|^mockserver/
+        exclude: ^dist/
       - id: trailing-whitespace
-        exclude: ^schemas/spec|^dist/|^mockserver/
+        exclude: ^dist/
       - id: end-of-file-fixer
-        exclude: ^schemas/spec|^dist/|^mockserver/
+        exclude: ^dist/
 
   - repo: https://github.com/Jarmos-san/shellcheck-precommit
     rev: 'v0.2.0'
@@ -33,15 +33,15 @@ repos:
         types:
           - ts
         language: system
-        exclude: ^dist/|^mockserver/
+        exclude: ^dist/
       - id: eslint
         name: eslint
         entry: yarn run lint
         pass_filenames: false
         language: system
         types:
           - ts
-        exclude: ^dist/|^mockserver/
+        exclude: ^dist/
       - id: build-dist
         name: build dist package
         entry: yarn run package
@@ -63,7 +63,7 @@ repos:
         language: system
         types:
           - ts
-        exclude: ^dist/|^mockserver/
+        exclude: ^dist/
 
   - repo: https://github.com/specklesystems/pre-commit
     rev: '0.2.0'

diff --git a/.prettierignore b/.prettierignore
@@ -1,5 +1,4 @@
 dist/
-mockserver/
 lib/
 node_modules/
 *.cjs

diff --git a/action.yaml b/action.yaml
@@ -28,4 +28,4 @@ outputs:
     description: 'The required name of the image of the built function.'
 runs:
   using: 'node16' #FIXME bump to node18 when available
-  main: 'dist/index.js'
+  main: 'dist/action/index.js'
diff --git a/dist/125.index.js → dist/action/125.index.js b/dist/125.index.js → dist/action/125.index.js
diff --git a/dist/125.index.js.map → dist/action/125.index.js.map b/dist/125.index.js.map → dist/action/125.index.js.map
diff --git a/dist/index.js → dist/action/index.js b/dist/index.js → dist/action/index.js
diff --git a/dist/index.js.map → dist/action/index.js.map b/dist/index.js.map → dist/action/index.js.map
diff --git a/dist/licenses.txt → dist/action/licenses.txt b/dist/licenses.txt → dist/action/licenses.txt
diff --git a/dist/package.json → dist/action/package.json b/dist/package.json → dist/action/package.json
diff --git a/dist/sourcemap-register.cjs → dist/action/sourcemap-register.cjs b/dist/sourcemap-register.cjs → dist/action/sourcemap-register.cjs
diff --git a/dist/sourcemap-register.js → dist/action/sourcemap-register.js b/dist/sourcemap-register.js → dist/action/sourcemap-register.js
diff --git a/mockserver/230.index.js → dist/testing/mockserver/230.index.js b/mockserver/230.index.js → dist/testing/mockserver/230.index.js
diff --git a/mockserver/230.index.js.map → dist/testing/mockserver/230.index.js.map b/mockserver/230.index.js.map → dist/testing/mockserver/230.index.js.map
diff --git a/mockserver/728.index.js → dist/testing/mockserver/728.index.js b/mockserver/728.index.js → dist/testing/mockserver/728.index.js
diff --git a/mockserver/728.index.js.map → dist/testing/mockserver/728.index.js.map b/mockserver/728.index.js.map → dist/testing/mockserver/728.index.js.map
diff --git a/mockserver/951.index.js → dist/testing/mockserver/951.index.js b/mockserver/951.index.js → dist/testing/mockserver/951.index.js
diff --git a/mockserver/951.index.js.map → dist/testing/mockserver/951.index.js.map b/mockserver/951.index.js.map → dist/testing/mockserver/951.index.js.map
diff --git a/mockserver/index.js → dist/testing/mockserver/index.js b/mockserver/index.js → dist/testing/mockserver/index.js
diff --git a/mockserver/index.js.map → dist/testing/mockserver/index.js.map b/mockserver/index.js.map → dist/testing/mockserver/index.js.map
diff --git a/mockserver/licenses.txt → dist/testing/mockserver/licenses.txt b/mockserver/licenses.txt → dist/testing/mockserver/licenses.txt
diff --git a/mockserver/package.json → dist/testing/mockserver/package.json b/mockserver/package.json → dist/testing/mockserver/package.json
diff --git a/mockserver/sourcemap-register.cjs → ...testing/mockserver/sourcemap-register.cjs b/mockserver/sourcemap-register.cjs → ...testing/mockserver/sourcemap-register.cjs
diff --git a/package.json b/package.json
@@ -13,12 +13,12 @@
     "build:image": "docker build -t speckle/speckle-automate-github-action:local .",
     "coverage": "vitest run --coverage --run",
     "lint": "eslint **/*.ts",
-    "package": "ncc build --target es2020 --source-map --license licenses.txt -o dist src/main.ts",
-    "package:mockserver": "ncc build --target es2020 --source-map --license licenses.txt -o mockserver src/tests/mock-server.ts",
+    "package": "ncc build --target es2020 --source-map --license licenses.txt -o dist/action src/main.ts",
+    "package:mockserver": "ncc build --target es2020 --source-map --license licenses.txt -o dist/testing/mockserver src/tests/mock-server.ts",
     "precommit": "pre-commit run --all-files",
     "prettier:check": "prettier --check '**/*.ts'",
     "prettier:fix": "prettier --write '**/*.ts'",
-    "run:mockserver": "node mockserver/index.js",
+    "run:mockserver": "node dist/testing/mockserver/index.js",
     "test": "vitest --run"
   },
   "dependencies": {

diff --git a/vitest.config.ts b/vitest.config.ts
@@ -1,9 +1,3 @@
 export default {
-  exclude: [
-    'node_modules/**/*',
-    'lib/**/*',
-    'dist/**/*',
-    '.yarn/**/*',
-    'mockserver/**/*'
-  ]
+  exclude: ['node_modules/**/*', 'lib/**/*', 'dist/**/*', '.yarn/**/*']
 }