@jungvonmatt/contentful-migrations 6.1.0 → 6.1.2

package/README.md

@@ -30,7 +30,7 @@ We use [`@jungvonmatt/contentful-config`](https://github.com/jungvonmatt/content
 
 **Supported configuration locations (in order of priority):**
 - Configuration overrides passed via command line arguments
-- User-specified config file (via `--config-file` option)
+- User-specified config file (via `--config` option)
 - `migrations.config.{js,ts,mjs,cjs,mts,cts}`
 - `.config/migrations.{js,ts,mjs,cjs,mts,cts,json,jsonc,json5,yaml,yml,toml}`
 - `.migrationsrc.{js,ts,mjs,cjs,mts,cts,json,jsonc,json5,yaml,yml,toml}`
@@ -60,7 +60,7 @@ export default {
 }
 ```
 
-You can specify any config file path using the `--config-file <path/to/config>` command line argument. Multiple config files can be used for different environments or spaces in your project.
+You can specify any config file path using the `--config <path/to/config>` command line argument. Multiple config files can be used for different environments or spaces in your project.
 
 #### Configuration values
 

package/cli.js

@@ -82,8 +82,6 @@ program
         ]
       );
 
-      const { managementToken, accessToken, environmentId, spaceId, ...rest } = config;
-
       if (config.storage === STORAGE_CONTENT) {
         await initializeContentModel(config);
         await migrateToContentStorage(config);
@@ -92,24 +90,35 @@ program
         await migrateToTagStorage(config);
       }
 
-      if (!process.env.CONTENTFUL_SPACE_ID) {
-        rest.spaceId = spaceId;
-      }
-
       const storeConfig = await confirm({ message: 'Do you want to store the configuration?' });
 
       if (storeConfig) {
+        // only store relevant config values without management token
+        // management token should not be stored inside the project
+        const { host, spaceId, environmentId, storage, fieldId, migrationContentTypeId, directory } = config;
+
+        const data = {
+          host,
+          spaceId,
+          environmentId,
+          directory,
+          storage,
+          ...(storage === STORAGE_CONTENT ? { migrationContentTypeId } : { fieldId }),
+        };
+
         // try to store in package.json
         const { pkgUp } = await import('pkg-up');
         const localPkg = await pkgUp();
         if (localPkg) {
           const packageJson = await fs.readJson(localPkg);
-          rest.directory = path.relative(path.dirname(localPkg), rest.directory);
-          packageJson.migrations = rest;
+          data.directory = path.relative(path.dirname(localPkg), data.directory);
+          packageJson.migrations = data;
           await fs.outputJson(localPkg, packageJson, { spaces: 2 });
         } else {
           // store in .migrationsrc if no package.json is available
-          await fs.outputJson(path.join(process.cwd(), '.migrationsrc'), rest, { spaces: 2 });
+          const cwd = cmd.cwd ? path.resolve(cmd.cwd) : process.cwd();
+          data.directory = path.relative(cwd, data.directory);
+          await fs.outputJson(path.join(cwd, '.migrationsrc.json'), data, { spaces: 2 });
         }
       }
     })
@@ -134,6 +143,7 @@ program
         'environmentId',
         'directory',
       ]);
+
       await fetchMigration({ ...config, contentType: cmd.contentType });
     })
   );
@@ -207,7 +217,7 @@ program
   .description('Execute a single migration.')
   .action(
     actionRunner(async (file, options) => {
-      const config = await getConfig(parseArgs(cmd || {}), [
+      const config = await getConfig(parseArgs(options || {}), [
         'managementToken',
         'spaceId',
         'environmentId',
@@ -240,7 +250,7 @@ program
   .action(
     actionRunner(async (file, options) => {
       const { remove, add } = options;
-      const config = await getConfig(parseArgs(cmd || {}), [
+      const config = await getConfig(parseArgs(options || {}), [
         'managementToken',
         'spaceId',
         'environmentId',

package/lib/config.js

@@ -16,6 +16,7 @@ const STATE_FAILURE = 'failure';
 const getConfig = async (args, required = [], prompt = []) => {
   const { configFile, cwd, ...overrides } = args;
   const { loadContentfulConfig } = await import('@jungvonmatt/contentful-config');
+
   const result = await loadContentfulConfig('migrations', {
     configFile,
     cwd,

package/lib/diff.js

@@ -30,7 +30,7 @@ const getNodeDate = (node) => {
 
 const oldValueColor = (text) => pc.reset(pc.red(pc.dim(text)));
 const newValueColor = (text) => pc.reset(pc.green(text));
-const unchangedColor = (text) => pc.reset(pc.grey(text));
+const unchangedColor = (text) => pc.reset(pc.gray(text));
 
 const diffString = (source, dest) => {
   const diff = Diff.diffWords(source, dest);
@@ -45,7 +45,7 @@ const diffString = (source, dest) => {
 
     if (part.value.length > 50) {
       const value = `${part.value.slice(0, 15)} [...] ${part.value.slice(-15)}`;
-      return unchangedColor(pc.grey(value));
+      return unchangedColor(pc.gray(value));
     }
 
     return unchangedColor(part.value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jungvonmatt/contentful-migrations",
-  "version": "6.1.0",
+  "version": "6.1.2",
   "description": "Helper to handle migrations in contentful",
   "main": "index.js",
   "files": [
@@ -35,7 +35,7 @@
   ],
   "dependencies": {
     "@contentful/rich-text-plain-text-renderer": "^15.12.1",
-    "@jungvonmatt/contentful-config": "^3.0.3",
+    "@jungvonmatt/contentful-config": "^3.0.5",
     "array.prototype.flatmap": "^1.3.3",
     "ascii-tree": "^0.3.0",
     "cli-progress": "^3.11.2",