@common-stack/rollup-vite-utils 6.0.6-alpha.29 → 6.0.6-alpha.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,17 +1,57 @@
1
- 'use strict';var fs=require('fs'),path=require('path');require('fs-extra');var verifyConfig=require('../utils/verifyConfig.cjs');const updateFromConfig = async (configPath) => {
2
- const basePath = process.cwd();
3
- const packageJosnPath = path.join(basePath, 'package.json');
1
+ 'use strict';var fs=require('fs'),path=require('path'),glob=require('glob');require('fs-extra');var verifyConfig=require('../utils/verifyConfig.cjs');const basePath = process.cwd();
2
+ const findPackageJsonFiles = () => {
3
+ const monorepoRoot = path.join(basePath, '..', '..');
4
+ return new Promise((resolve, reject) => {
5
+ glob(`${monorepoRoot}/+(servers|portable-devices|packages|packages-modules)/**/package.json`, { nodir: true, ignore: '**/node_modules/**' }, (err, files) => {
6
+ if (err)
7
+ reject(`Unable to scan directory: ${err}`);
8
+ resolve(files);
9
+ });
10
+ });
11
+ };
12
+ const updateFromConfig = async (configPath) => {
4
13
  try {
5
14
  const config = JSON.parse(fs.readFileSync(configPath).toString());
6
15
  const verified = verifyConfig.verifyConfigSchema(config);
7
16
  if (!verified)
8
17
  return;
9
- const configModules = config.modules || [];
10
- const packageContent = JSON.parse(fs.readFileSync(packageJosnPath).toString());
11
- const dependencies = {
12
- ...(packageContent.dependencies || {}),
13
- ...(packageContent.devDependencies || {}),
14
- };
18
+ const localModules = config.modules || [];
19
+ const devModules = config.devModules || [];
20
+ const externalModules = config.externalModules || [];
21
+ const versionModifier = (version, moduleName) => version === '' ? 'latest' : version;
22
+ const packageJsonPath = path.join(basePath, 'package.json');
23
+ const rootPackageJsonPath = path.join(basePath, '..', '..', 'package.json');
24
+ if (localModules.length > 0) {
25
+ const packageJsonFiles = await findPackageJsonFiles();
26
+ const localVersionModifier = (version, moduleName) => {
27
+ let newVersion = versionModifier(version, moduleName);
28
+ packageJsonFiles.forEach((file) => {
29
+ const packageJson = JSON.parse(fs.readFileSync(file, 'utf8'));
30
+ if (packageJson.name === moduleName) {
31
+ const targetDir = path.dirname(file);
32
+ newVersion = `link:${path.relative(basePath, targetDir)}`;
33
+ }
34
+ });
35
+ return newVersion;
36
+ };
37
+ await processModules(packageJsonPath, localModules, localVersionModifier);
38
+ }
39
+ if (devModules.length > 0) {
40
+ await processModules(rootPackageJsonPath, devModules, versionModifier);
41
+ }
42
+ if (externalModules.length > 0) {
43
+ await processModules(packageJsonPath, externalModules, versionModifier);
44
+ }
45
+ }
46
+ catch (e) {
47
+ console.error(e);
48
+ }
49
+ };
50
+ const processModules = async (packageJsonPath, configModules, versionModifier) => {
51
+ try {
52
+ const packageContent = JSON.parse(fs.readFileSync(packageJsonPath).toString());
53
+ let dependencies = packageContent.dependencies || {};
54
+ let devDependencies = packageContent.devDependencies || {};
15
55
  let modified = false;
16
56
  configModules.forEach((configModule) => {
17
57
  let moduleName = '';
@@ -33,32 +73,37 @@
33
73
  version = configModule[moduleName].version || '';
34
74
  }
35
75
  }
76
+ const allDependencies = { ...dependencies, ...devDependencies };
36
77
  if (moduleName !== '') {
37
- if (typeof dependencies[moduleName] === 'string') {
78
+ if (typeof allDependencies[moduleName] === 'string') {
38
79
  // when dependencies has already included the module
39
- let versionUpdated = changeVersion(packageContent.dependencies, moduleName, version);
80
+ let versionUpdated = changeVersion(dependencies, moduleName, version);
40
81
  if (!versionUpdated) {
41
- versionUpdated = changeVersion(packageContent.devDependencies, moduleName, version);
82
+ versionUpdated = changeVersion(devDependencies, moduleName, version);
83
+ }
84
+ if (versionUpdated) {
85
+ modified = true;
42
86
  }
43
- modified = modified || versionUpdated;
44
87
  }
45
- else if (typeof dependencies[moduleName] === 'undefined') {
88
+ else if (typeof allDependencies[moduleName] === 'undefined') {
46
89
  // when dependencies has not included the module
47
- version = version == '' ? 'latest' : version;
48
- packageContent.dependencies[moduleName] = version;
90
+ version = versionModifier(version, moduleName);
91
+ dependencies[moduleName] = version;
49
92
  console.log(`Added the module '${moduleName}@${version}' in package.json`);
50
93
  modified = true;
51
94
  }
52
95
  }
53
96
  });
54
97
  if (modified) {
98
+ packageContent.dependencies = dependencies;
99
+ packageContent.devDependencies = devDependencies;
55
100
  const sortPackageJson = await import('sort-package-json').then((module) => module.default);
56
101
  const newContent = sortPackageJson(packageContent);
57
- fs.writeFileSync(packageJosnPath, JSON.stringify(newContent, null, 2));
102
+ fs.writeFileSync(packageJsonPath, JSON.stringify(newContent, null, 4));
58
103
  }
59
104
  }
60
105
  catch (e) {
61
- console.error(e);
106
+ console.error(`Error while update ${packageJsonPath} from config`, e);
62
107
  }
63
108
  };
64
109
  const changeVersion = (dependencies, moduleName, version) => {
@@ -1 +1 @@
1
- {"version":3,"file":"rollupPluginUpdateFromConfig.cjs","sources":["../../src/rollup/rollupPluginUpdateFromConfig.ts"],"sourcesContent":[null],"names":["verifyConfigSchema"],"mappings":"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"}
1
+ {"version":3,"file":"rollupPluginUpdateFromConfig.cjs","sources":["../../src/rollup/rollupPluginUpdateFromConfig.ts"],"sourcesContent":[null],"names":["verifyConfigSchema"],"mappings":"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"}
@@ -1,17 +1,57 @@
1
- import fs__default from'fs';import path__default from'path';import'fs-extra';import {verifyConfigSchema}from'../utils/verifyConfig.js';const updateFromConfig = async (configPath) => {
2
- const basePath = process.cwd();
3
- const packageJosnPath = path__default.join(basePath, 'package.json');
1
+ import fs__default from'fs';import path__default from'path';import glob from'glob';import'fs-extra';import {verifyConfigSchema}from'../utils/verifyConfig.js';const basePath = process.cwd();
2
+ const findPackageJsonFiles = () => {
3
+ const monorepoRoot = path__default.join(basePath, '..', '..');
4
+ return new Promise((resolve, reject) => {
5
+ glob(`${monorepoRoot}/+(servers|portable-devices|packages|packages-modules)/**/package.json`, { nodir: true, ignore: '**/node_modules/**' }, (err, files) => {
6
+ if (err)
7
+ reject(`Unable to scan directory: ${err}`);
8
+ resolve(files);
9
+ });
10
+ });
11
+ };
12
+ const updateFromConfig = async (configPath) => {
4
13
  try {
5
14
  const config = JSON.parse(fs__default.readFileSync(configPath).toString());
6
15
  const verified = verifyConfigSchema(config);
7
16
  if (!verified)
8
17
  return;
9
- const configModules = config.modules || [];
10
- const packageContent = JSON.parse(fs__default.readFileSync(packageJosnPath).toString());
11
- const dependencies = {
12
- ...(packageContent.dependencies || {}),
13
- ...(packageContent.devDependencies || {}),
14
- };
18
+ const localModules = config.modules || [];
19
+ const devModules = config.devModules || [];
20
+ const externalModules = config.externalModules || [];
21
+ const versionModifier = (version, moduleName) => version === '' ? 'latest' : version;
22
+ const packageJsonPath = path__default.join(basePath, 'package.json');
23
+ const rootPackageJsonPath = path__default.join(basePath, '..', '..', 'package.json');
24
+ if (localModules.length > 0) {
25
+ const packageJsonFiles = await findPackageJsonFiles();
26
+ const localVersionModifier = (version, moduleName) => {
27
+ let newVersion = versionModifier(version, moduleName);
28
+ packageJsonFiles.forEach((file) => {
29
+ const packageJson = JSON.parse(fs__default.readFileSync(file, 'utf8'));
30
+ if (packageJson.name === moduleName) {
31
+ const targetDir = path__default.dirname(file);
32
+ newVersion = `link:${path__default.relative(basePath, targetDir)}`;
33
+ }
34
+ });
35
+ return newVersion;
36
+ };
37
+ await processModules(packageJsonPath, localModules, localVersionModifier);
38
+ }
39
+ if (devModules.length > 0) {
40
+ await processModules(rootPackageJsonPath, devModules, versionModifier);
41
+ }
42
+ if (externalModules.length > 0) {
43
+ await processModules(packageJsonPath, externalModules, versionModifier);
44
+ }
45
+ }
46
+ catch (e) {
47
+ console.error(e);
48
+ }
49
+ };
50
+ const processModules = async (packageJsonPath, configModules, versionModifier) => {
51
+ try {
52
+ const packageContent = JSON.parse(fs__default.readFileSync(packageJsonPath).toString());
53
+ let dependencies = packageContent.dependencies || {};
54
+ let devDependencies = packageContent.devDependencies || {};
15
55
  let modified = false;
16
56
  configModules.forEach((configModule) => {
17
57
  let moduleName = '';
@@ -33,32 +73,37 @@ import fs__default from'fs';import path__default from'path';import'fs-extra';imp
33
73
  version = configModule[moduleName].version || '';
34
74
  }
35
75
  }
76
+ const allDependencies = { ...dependencies, ...devDependencies };
36
77
  if (moduleName !== '') {
37
- if (typeof dependencies[moduleName] === 'string') {
78
+ if (typeof allDependencies[moduleName] === 'string') {
38
79
  // when dependencies has already included the module
39
- let versionUpdated = changeVersion(packageContent.dependencies, moduleName, version);
80
+ let versionUpdated = changeVersion(dependencies, moduleName, version);
40
81
  if (!versionUpdated) {
41
- versionUpdated = changeVersion(packageContent.devDependencies, moduleName, version);
82
+ versionUpdated = changeVersion(devDependencies, moduleName, version);
83
+ }
84
+ if (versionUpdated) {
85
+ modified = true;
42
86
  }
43
- modified = modified || versionUpdated;
44
87
  }
45
- else if (typeof dependencies[moduleName] === 'undefined') {
88
+ else if (typeof allDependencies[moduleName] === 'undefined') {
46
89
  // when dependencies has not included the module
47
- version = version == '' ? 'latest' : version;
48
- packageContent.dependencies[moduleName] = version;
90
+ version = versionModifier(version, moduleName);
91
+ dependencies[moduleName] = version;
49
92
  console.log(`Added the module '${moduleName}@${version}' in package.json`);
50
93
  modified = true;
51
94
  }
52
95
  }
53
96
  });
54
97
  if (modified) {
98
+ packageContent.dependencies = dependencies;
99
+ packageContent.devDependencies = devDependencies;
55
100
  const sortPackageJson = await import('sort-package-json').then((module) => module.default);
56
101
  const newContent = sortPackageJson(packageContent);
57
- fs__default.writeFileSync(packageJosnPath, JSON.stringify(newContent, null, 2));
102
+ fs__default.writeFileSync(packageJsonPath, JSON.stringify(newContent, null, 4));
58
103
  }
59
104
  }
60
105
  catch (e) {
61
- console.error(e);
106
+ console.error(`Error while update ${packageJsonPath} from config`, e);
62
107
  }
63
108
  };
64
109
  const changeVersion = (dependencies, moduleName, version) => {
@@ -1 +1 @@
1
- {"version":3,"file":"rollupPluginUpdateFromConfig.js","sources":["../../src/rollup/rollupPluginUpdateFromConfig.ts"],"sourcesContent":[null],"names":["path","fs"],"mappings":"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"}
1
+ {"version":3,"file":"rollupPluginUpdateFromConfig.js","sources":["../../src/rollup/rollupPluginUpdateFromConfig.ts"],"sourcesContent":[null],"names":["path","fs"],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@common-stack/rollup-vite-utils",
3
- "version": "6.0.6-alpha.29",
3
+ "version": "6.0.6-alpha.34",
4
4
  "description": "Client Module for react app",
5
5
  "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
6
6
  "bugs": {
@@ -58,5 +58,5 @@
58
58
  "typescript": {
59
59
  "definition": "lib/index.d.ts"
60
60
  },
61
- "gitHead": "aa66043992d4bf6bf28cc00791945d04909e56c2"
61
+ "gitHead": "a18390ead2b175b764970e162055142a2f694e9e"
62
62
  }