fix: npm workspace tweak: align module name and folder name

When importing as esmodule from node-client, npm tried to resolve the local dependency on file:../schemas from common-config-loader as @eik/schemas. Renaming should fix this.
eik-lib · Jun 30, 2023 · 91e7416 · 91e7416
1 parent db30e5b
commit 91e7416
Show file tree

Hide file tree

Showing 90 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -38,7 +38,7 @@ jobs:
           CI: true
       - name: check eik json schema is up to date
         run: |
-          npm run schema:outdated --workspace=packages/schemas
+          npm run schema:outdated --workspace=packages/common-schemas
         env:
           CI: true
       - name: run tests

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -37,7 +37,7 @@ jobs:
           CI: true
       - name: check eik json schema is up to date
         run: |
-          npm run schema:outdated --workspace=packages/schemas
+          npm run schema:outdated --workspace=packages/common-schemas
         env:
           CI: true
       - name: run tests

diff --git a/README.md b/README.md
@@ -6,16 +6,16 @@ Note: this module is for internal eik-lib usage and may change at any time witho
 
 ### common-config-loader
 
-Eik configuration definition and functions for loading eik configuration files, see [config-loader](./packages/config-loader/README.md)
+Eik configuration definition and functions for loading eik configuration files, see [config-loader](./packages/common-config-loader/README.md)
 
 ### common-schemas
 
-Schema and validators for the eik.json schema used by eik configuration, see [schemas](./packages/schemas/README.md)
+Schema and validators for the eik.json schema used by eik configuration, see [schemas](./packages/common-schemas/README.md)
 
 ### common-utils
 
-Utilities used by other eik-lib packages, see [utils](./packages/utils/README.md)
+Utilities used by other eik-lib packages, see [utils](./packages/common-utils/README.md)
 
 ### common-validators
 
-Misc validators/converters used for validating eik config, see [validators](./packages/validators/README.md)
+Misc validators/converters used for validating eik config, see [validators](./packages/common-validators/README.md)
diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@eik/common",
   "workspaces": [
-    "packages/validators",
-    "packages/schemas",
-    "packages/utils",
-    "packages/config-loader"
+    "packages/common-validators",
+    "packages/common-schemas",
+    "packages/common-utils",
+    "packages/common-config-loader"
   ],
   "devDependencies": {
     "@semantic-release/changelog": "6.0.3",

diff --git a/packages/config-loader/.prettierignore → ...ages/common-config-loader/.prettierignore b/packages/config-loader/.prettierignore → ...ages/common-config-loader/.prettierignore
diff --git a/packages/config-loader/README.md → packages/common-config-loader/README.md b/packages/config-loader/README.md → packages/common-config-loader/README.md
diff --git a/packages/config-loader/index.js → packages/common-config-loader/index.js b/packages/config-loader/index.js → packages/common-config-loader/index.js
diff --git a/packages/config-loader/package.json → packages/common-config-loader/package.json b/packages/config-loader/package.json → packages/common-config-loader/package.json
@@ -14,8 +14,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@eik/common-schemas": "file:../schemas",
-    "@eik/common-utils": "file:../utils",
+    "@eik/common-schemas": "file:../common-schemas",
+    "@eik/common-utils": "file:../common-utils",
     "glob": "10.3.0",
     "is-glob": "4.0.3",
     "mime-types": "2.1.35"

diff --git a/...config-loader/src/classes/file-mapping.js → ...config-loader/src/classes/file-mapping.js b/...config-loader/src/classes/file-mapping.js → ...config-loader/src/classes/file-mapping.js
diff --git a/...loader/src/classes/local-file-location.js → ...loader/src/classes/local-file-location.js b/...loader/src/classes/local-file-location.js → ...loader/src/classes/local-file-location.js
diff --git a/...oader/src/classes/remote-file-location.js → ...oader/src/classes/remote-file-location.js b/...oader/src/classes/remote-file-location.js → ...oader/src/classes/remote-file-location.js
diff --git a/...nfig-loader/src/classes/resolved-files.js → ...nfig-loader/src/classes/resolved-files.js b/...nfig-loader/src/classes/resolved-files.js → ...nfig-loader/src/classes/resolved-files.js
diff --git a/packages/config-loader/src/config-store.js → .../common-config-loader/src/config-store.js b/packages/config-loader/src/config-store.js → .../common-config-loader/src/config-store.js
diff --git a/packages/config-loader/src/eik-config.js → ...es/common-config-loader/src/eik-config.js b/packages/config-loader/src/eik-config.js → ...es/common-config-loader/src/eik-config.js
diff --git a/.../config-loader/src/errors/custom-error.js → ...-config-loader/src/errors/custom-error.js b/.../config-loader/src/errors/custom-error.js → ...-config-loader/src/errors/custom-error.js
diff --git a/...loader/src/errors/invalid-config-error.js → ...loader/src/errors/invalid-config-error.js b/...loader/src/errors/invalid-config-error.js → ...loader/src/errors/invalid-config-error.js
diff --git a/...loader/src/errors/missing-config-error.js → ...loader/src/errors/missing-config-error.js b/...loader/src/errors/missing-config-error.js → ...loader/src/errors/missing-config-error.js
diff --git a/...c/errors/multiple-config-sources-error.js → ...c/errors/multiple-config-sources-error.js b/...c/errors/multiple-config-sources-error.js → ...c/errors/multiple-config-sources-error.js
diff --git a/...ader/src/errors/no-files-matched-error.js → ...ader/src/errors/no-files-matched-error.js b/...ader/src/errors/no-files-matched-error.js → ...ader/src/errors/no-files-matched-error.js
diff --git a/...rors/single-dest-multiple-source-error.js → ...rors/single-dest-multiple-source-error.js b/...rors/single-dest-multiple-source-error.js → ...rors/single-dest-multiple-source-error.js
diff --git a/packages/config-loader/src/get-defaults.js → .../common-config-loader/src/get-defaults.js b/packages/config-loader/src/get-defaults.js → .../common-config-loader/src/get-defaults.js
diff --git a/packages/config-loader/src/local-assets.js → .../common-config-loader/src/local-assets.js b/packages/config-loader/src/local-assets.js → .../common-config-loader/src/local-assets.js
diff --git a/.../config-loader/src/utils/resolve-files.js → ...-config-loader/src/utils/resolve-files.js b/.../config-loader/src/utils/resolve-files.js → ...-config-loader/src/utils/resolve-files.js
diff --git a/packages/config-loader/test/assets/esm.css → .../common-config-loader/test/assets/esm.css b/packages/config-loader/test/assets/esm.css → .../common-config-loader/test/assets/esm.css
diff --git a/...ges/config-loader/test/assets/esm.css.map → ...mon-config-loader/test/assets/esm.css.map b/...ges/config-loader/test/assets/esm.css.map → ...mon-config-loader/test/assets/esm.css.map
diff --git a/packages/config-loader/test/assets/esm.js → ...s/common-config-loader/test/assets/esm.js b/packages/config-loader/test/assets/esm.js → ...s/common-config-loader/test/assets/esm.js
diff --git a/...ages/config-loader/test/assets/esm.js.map → ...mmon-config-loader/test/assets/esm.js.map b/...ages/config-loader/test/assets/esm.js.map → ...mmon-config-loader/test/assets/esm.js.map
diff --git a/...s/config-loader/test/config-store.test.js → ...n-config-loader/test/config-store.test.js b/...s/config-loader/test/config-store.test.js → ...n-config-loader/test/config-store.test.js
diff --git a/...config-loader/test/eik-config/cwd.test.js → ...config-loader/test/eik-config/cwd.test.js b/...config-loader/test/eik-config/cwd.test.js → ...config-loader/test/eik-config/cwd.test.js
diff --git a/...config-loader/test/eik-config/map.test.js → ...config-loader/test/eik-config/map.test.js b/...config-loader/test/eik-config/map.test.js → ...config-loader/test/eik-config/map.test.js
diff --git a/...g-loader/test/eik-config/mappings.test.js → ...g-loader/test/eik-config/mappings.test.js b/...g-loader/test/eik-config/mappings.test.js → ...g-loader/test/eik-config/mappings.test.js
diff --git a/...config-loader/test/eik-config/out.test.js → ...config-loader/test/eik-config/out.test.js b/...config-loader/test/eik-config/out.test.js → ...config-loader/test/eik-config/out.test.js
diff --git a/...fig-loader/test/eik-config/server.test.js → ...fig-loader/test/eik-config/server.test.js b/...fig-loader/test/eik-config/server.test.js → ...fig-loader/test/eik-config/server.test.js
diff --git a/...fig-loader/test/eik-config/toJSON.test.js → ...fig-loader/test/eik-config/toJSON.test.js b/...fig-loader/test/eik-config/toJSON.test.js → ...fig-loader/test/eik-config/toJSON.test.js
diff --git a/...nfig-loader/test/eik-config/token.test.js → ...nfig-loader/test/eik-config/token.test.js b/...nfig-loader/test/eik-config/token.test.js → ...nfig-loader/test/eik-config/token.test.js
diff --git a/...onfig-loader/test/eik-config/type.test.js → ...onfig-loader/test/eik-config/type.test.js b/...onfig-loader/test/eik-config/type.test.js → ...onfig-loader/test/eik-config/type.test.js
diff --git a/...g-loader/test/eik-config/validate.test.js → ...g-loader/test/eik-config/validate.test.js b/...g-loader/test/eik-config/validate.test.js → ...g-loader/test/eik-config/validate.test.js
diff --git a/...ig-loader/test/eik-config/version.test.js → ...ig-loader/test/eik-config/version.test.js b/...ig-loader/test/eik-config/version.test.js → ...ig-loader/test/eik-config/version.test.js
diff --git a/packages/config-loader/test/eik.json → packages/common-config-loader/test/eik.json b/packages/config-loader/test/eik.json → packages/common-config-loader/test/eik.json
diff --git a/...test/fixtures/client-with-bare-imports.js → ...test/fixtures/client-with-bare-imports.js b/...test/fixtures/client-with-bare-imports.js → ...test/fixtures/client-with-bare-imports.js
diff --git a/...ges/config-loader/test/fixtures/client.js → ...mon-config-loader/test/fixtures/client.js b/...ges/config-loader/test/fixtures/client.js → ...mon-config-loader/test/fixtures/client.js
diff --git a/...config-loader/test/fixtures/client.js.map → ...config-loader/test/fixtures/client.js.map b/...config-loader/test/fixtures/client.js.map → ...config-loader/test/fixtures/client.js.map
diff --git a/...fig-loader/test/fixtures/folder/client.js → ...fig-loader/test/fixtures/folder/client.js b/...fig-loader/test/fixtures/folder/client.js → ...fig-loader/test/fixtures/folder/client.js
diff --git a/...ig-loader/test/fixtures/folder/styles.css → ...ig-loader/test/fixtures/folder/styles.css b/...ig-loader/test/fixtures/folder/styles.css → ...ig-loader/test/fixtures/folder/styles.css
diff --git a/...r/test/fixtures/icons/checkbox-sprite.svg → ...r/test/fixtures/icons/checkbox-sprite.svg b/...r/test/fixtures/icons/checkbox-sprite.svg → ...r/test/fixtures/icons/checkbox-sprite.svg
diff --git a/...loader/test/fixtures/nested/client.js.map → ...loader/test/fixtures/nested/client.js.map b/...loader/test/fixtures/nested/client.js.map → ...loader/test/fixtures/nested/client.js.map
diff --git a/...oader/test/fixtures/nested/styles.css.map → ...oader/test/fixtures/nested/styles.css.map b/...oader/test/fixtures/nested/styles.css.map → ...oader/test/fixtures/nested/styles.css.map
diff --git a/...es/config-loader/test/fixtures/styles.css → ...on-config-loader/test/fixtures/styles.css b/...es/config-loader/test/fixtures/styles.css → ...on-config-loader/test/fixtures/styles.css
diff --git a/...onfig-loader/test/fixtures/styles.css.map → ...onfig-loader/test/fixtures/styles.css.map b/...onfig-loader/test/fixtures/styles.css.map → ...onfig-loader/test/fixtures/styles.css.map
diff --git a/...s/config-loader/test/local-assets.test.js → ...n-config-loader/test/local-assets.test.js b/...s/config-loader/test/local-assets.test.js → ...n-config-loader/test/local-assets.test.js
diff --git a/...test/local-file-location/absolute.test.js → ...test/local-file-location/absolute.test.js b/...test/local-file-location/absolute.test.js → ...test/local-file-location/absolute.test.js
diff --git a/...t/local-file-location/contentType.test.js → ...t/local-file-location/contentType.test.js b/...t/local-file-location/contentType.test.js → ...t/local-file-location/contentType.test.js
diff --git a/...est/local-file-location/extension.test.js → ...est/local-file-location/extension.test.js b/...est/local-file-location/extension.test.js → ...est/local-file-location/extension.test.js
diff --git a/...test/local-file-location/mimeType.test.js → ...test/local-file-location/mimeType.test.js b/...test/local-file-location/mimeType.test.js → ...test/local-file-location/mimeType.test.js
diff --git a/.../config-loader/test/resolve-files.test.js → ...-config-loader/test/resolve-files.test.js b/.../config-loader/test/resolve-files.test.js → ...-config-loader/test/resolve-files.test.js
diff --git a/...ader/test/resolved-files/iterator.test.js → ...ader/test/resolved-files/iterator.test.js b/...ader/test/resolved-files/iterator.test.js → ...ader/test/resolved-files/iterator.test.js
diff --git a/packages/config-loader/test/tmp/.gitkeep → ...es/common-config-loader/test/tmp/.gitkeep b/packages/config-loader/test/tmp/.gitkeep → ...es/common-config-loader/test/tmp/.gitkeep
diff --git a/packages/config-loader/tsconfig.json → packages/common-config-loader/tsconfig.json b/packages/config-loader/tsconfig.json → packages/common-config-loader/tsconfig.json
diff --git a/packages/schemas/.prettierignore → packages/common-schemas/.prettierignore b/packages/schemas/.prettierignore → packages/common-schemas/.prettierignore
diff --git a/packages/schemas/README.md → packages/common-schemas/README.md b/packages/schemas/README.md → packages/common-schemas/README.md
diff --git a/packages/schemas/eikjson.d.ts → packages/common-schemas/eikjson.d.ts b/packages/schemas/eikjson.d.ts → packages/common-schemas/eikjson.d.ts
diff --git a/packages/schemas/index.js → packages/common-schemas/index.js b/packages/schemas/index.js → packages/common-schemas/index.js
diff --git a/packages/schemas/package.json → packages/common-schemas/package.json b/packages/schemas/package.json → packages/common-schemas/package.json
@@ -8,7 +8,7 @@
     "style:check": "prettier -c .",
     "style:format": "prettier -w .",
     "schema:types": "json2ts ./src/eikjson.schema.json > eikjson.d.ts",
-    "schema:outdated": "npm run schema:types && git diff --exit-code HEAD:packages/schemas/eikjson.d.ts eikjson.d.ts",
+    "schema:outdated": "npm run schema:types && git diff --exit-code HEAD:packages/common-schemas/eikjson.d.ts eikjson.d.ts",
     "typecheck": "tsc && cp eikjson.d.ts types",
     "prepublish": "npm run typecheck",
     "test": "tap --no-check-coverage",

diff --git a/packages/schemas/src/assert.js → packages/common-schemas/src/assert.js b/packages/schemas/src/assert.js → packages/common-schemas/src/assert.js
diff --git a/packages/schemas/src/eikjson.schema.json → ...es/common-schemas/src/eikjson.schema.json b/packages/schemas/src/eikjson.schema.json → ...es/common-schemas/src/eikjson.schema.json
diff --git a/packages/schemas/src/validate.js → packages/common-schemas/src/validate.js b/packages/schemas/src/validate.js → packages/common-schemas/src/validate.js
diff --git a/packages/schemas/src/validation-error.js → ...es/common-schemas/src/validation-error.js b/packages/schemas/src/validation-error.js → ...es/common-schemas/src/validation-error.js
diff --git a/packages/schemas/test/assert.js → packages/common-schemas/test/assert.js b/packages/schemas/test/assert.js → packages/common-schemas/test/assert.js
diff --git a/packages/schemas/test/index.js → packages/common-schemas/test/index.js b/packages/schemas/test/index.js → packages/common-schemas/test/index.js
diff --git a/packages/schemas/tsconfig.json → packages/common-schemas/tsconfig.json b/packages/schemas/tsconfig.json → packages/common-schemas/tsconfig.json
diff --git a/packages/utils/.prettierignore → packages/common-utils/.prettierignore b/packages/utils/.prettierignore → packages/common-utils/.prettierignore
diff --git a/packages/utils/README.md → packages/common-utils/README.md b/packages/utils/README.md → packages/common-utils/README.md
diff --git a/packages/utils/index.js → packages/common-utils/index.js b/packages/utils/index.js → packages/common-utils/index.js
diff --git a/packages/utils/package.json → packages/common-utils/package.json b/packages/utils/package.json → packages/common-utils/package.json
diff --git a/packages/utils/src/path-slashes.js → packages/common-utils/src/path-slashes.js b/packages/utils/src/path-slashes.js → packages/common-utils/src/path-slashes.js
diff --git a/packages/utils/src/read-file.js → packages/common-utils/src/read-file.js b/packages/utils/src/read-file.js → packages/common-utils/src/read-file.js
diff --git a/packages/utils/src/stream.js → packages/common-utils/src/stream.js b/packages/utils/src/stream.js → packages/common-utils/src/stream.js
diff --git a/packages/utils/src/type-slug.js → packages/common-utils/src/type-slug.js b/packages/utils/src/type-slug.js → packages/common-utils/src/type-slug.js
diff --git a/packages/utils/src/type-title.js → packages/common-utils/src/type-title.js b/packages/utils/src/type-title.js → packages/common-utils/src/type-title.js
diff --git a/packages/utils/test/path-slashes.test.js → ...es/common-utils/test/path-slashes.test.js b/packages/utils/test/path-slashes.test.js → ...es/common-utils/test/path-slashes.test.js
diff --git a/packages/utils/test/read-file.test.js → packages/common-utils/test/read-file.test.js b/packages/utils/test/read-file.test.js → packages/common-utils/test/read-file.test.js
diff --git a/packages/utils/test/stream.test.js → packages/common-utils/test/stream.test.js b/packages/utils/test/stream.test.js → packages/common-utils/test/stream.test.js
diff --git a/packages/utils/tsconfig.json → packages/common-utils/tsconfig.json b/packages/utils/tsconfig.json → packages/common-utils/tsconfig.json
diff --git a/packages/validators/.prettierignore → packages/common-validators/.prettierignore b/packages/validators/.prettierignore → packages/common-validators/.prettierignore
diff --git a/packages/validators/README.md → packages/common-validators/README.md b/packages/validators/README.md → packages/common-validators/README.md
diff --git a/packages/validators/package.json → packages/common-validators/package.json b/packages/validators/package.json → packages/common-validators/package.json
diff --git a/packages/validators/src/index.js → packages/common-validators/src/index.js b/packages/validators/src/index.js → packages/common-validators/src/index.js
diff --git a/packages/validators/test/index.js → packages/common-validators/test/index.js b/packages/validators/test/index.js → packages/common-validators/test/index.js
diff --git a/packages/validators/tsconfig.json → packages/common-validators/tsconfig.json b/packages/validators/tsconfig.json → packages/common-validators/tsconfig.json
diff --git a/release.config.js b/release.config.js
@@ -7,28 +7,28 @@ module.exports = {
       '@semantic-release/npm',
       {
         tarballDir: 'release',
-        pkgRoot: 'packages/config-loader',
+        pkgRoot: 'packages/common-config-loader',
       },
     ],
     [
       '@semantic-release/npm',
       {
         tarballDir: 'release',
-        pkgRoot: 'packages/schemas',
+        pkgRoot: 'packages/common-schemas',
       },
     ],
     [
       '@semantic-release/npm',
       {
         tarballDir: 'release',
-        pkgRoot: 'packages/utils',
+        pkgRoot: 'packages/common-utils',
       },
     ],
     [
       '@semantic-release/npm',
       {
         tarballDir: 'release',
-        pkgRoot: 'packages/validators',
+        pkgRoot: 'packages/common-validators',
       },
     ],
     [
@@ -41,10 +41,10 @@ module.exports = {
       '@semantic-release/git',
       {
         assets: [
-          'packages/config-loader',
-          'packages/schemas',
-          'packages/utils',
-          'packages/validators',
+          'packages/common-config-loader',
+          'packages/common-schemas',
+          'packages/common-utils',
+          'packages/common-validators',
         ],
       },
     ],