Merge pull request #55 from TouK/dev

dev > master

Author: JulianWielga

.github/workflows/ci.yml

@@ -52,7 +52,7 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 14
       - run: npm ci
       - run: npm run build --if-present
       - name: Release

.gitignore

@@ -1,2 +1,3 @@
 .idea
 node_modules
+/test-results/

.npmrc

@@ -0,0 +1,2 @@
+engine-strict=true
+legacy-peer-deps=true

.nvmrc

@@ -0,0 +1 @@
+v16.15.1

CHANGELOG.md

@@ -1,3 +1,15 @@
+# [1.2.0-beta.1](https://github.com/touk/federated-types/compare/v1.1.0...v1.2.0-beta.1) (2022-10-31)
+
+
+### Bug Fixes
+
+* npm audit fix ([e95a125](https://github.com/touk/federated-types/commit/e95a125541584a95038d209f285ef28ea60a38d2))
+
+
+### Features
+
+* "--saveToNodeModules" param ([8ca1214](https://github.com/touk/federated-types/commit/8ca1214759cc2659e546c5e99d3121374947be4b))
+
 # [1.1.0](https://github.com/touk/federated-types/compare/v1.0.0...v1.1.0) (2021-08-02)
 
 

README.md

@@ -14,9 +14,10 @@ npm install @touk/federated-types
 
 You'll also need to place a `federation.config.json` in each package being federated. It will contain the remote name and exported members. These properties are used in Webpack's `ModuleFederationPlugin` configuration object. An example:
 
-#### `federation.config.json`
 
 ```json
+//federation.config.json
+
 {
     "name": "app2",
     "exposes": {
@@ -27,9 +28,9 @@ You'll also need to place a `federation.config.json` in each package being feder
 
 It's recommended that you spread these properties into your ModuleFederationPlugin configuration, like so:
 
-#### `webpack.config.js`
 
 ```javascript
+//webpack.config.js
 
 const deps = require('../package.json').dependencies;
 const federationConfig = require('./federation.config.json');
@@ -54,9 +55,10 @@ module.exports = {
 
 Then you can call `make-federated-types` from your `scripts` block in your package's `package.json` file:
 
-#### `package.json`
 
-```json
+```javascript
+//package.json
+
 scripts: {
     "make-types": "make-federated-types"
 }
@@ -66,19 +68,21 @@ This will write new package to the `node_modules/@types/__federated_types` in yo
 
 If you would rather specify a directory in which to write the typing files, you can pass an `--outputDir` parameter to the command like so:
 
-#### `package.json`
 
-```json
+```javascript
+//package.json
+
 scripts: {
     "make-types": "make-federated-types --outputDir ../../my_types/"
 }
 ```
-
-#### `package.json`
+You can add an `--saveToNodeModules` parameter to save in both places.
 
 If you would like to specify custom path to the config, you can pass `--config` parameter like so:
 
-```json
+```javascript
+//package.json
+
 scripts: {
     "make-types": "make-federated-types --config ./path/to/my/config.json --outputDir ../../my_types/"
 }

cli.js

@@ -6,8 +6,8 @@ const findNodeModules = require('find-node-modules');
 const ts = require('typescript');
 
 const formatHost = {
-  getCurrentDirectory: ts.sys.getCurrentDirectory,
-  getNewLine: () => ts.sys.newLine
+    getCurrentDirectory: ts.sys.getCurrentDirectory,
+    getNewLine: () => ts.sys.newLine
 };
 
 function reportDiagnostic(diagnostic) {
@@ -16,16 +16,26 @@ function reportDiagnostic(diagnostic) {
 
 const [nodeModules] = findNodeModules({ cwd: process.argv[1], relative: false });
 
+const hasArg = (argName) => {
+    const argIndex = process.argv.indexOf(argName);
+    return argIndex !== -1;
+};
 const getArg = (argName) => {
     const argIndex = process.argv.indexOf(argName);
     return argIndex !== -1 ? process.argv[argIndex + 1] : null;
 };
 
+const nodeModulesOutputDir = path.resolve(nodeModules, '@types/__federated_types/');
+const saveToNodeMoulesArg = hasArg('--saveToNodeModules');
 const outDirArg = getArg('--outputDir');
 
 const outputDir = outDirArg
     ? path.resolve('./', outDirArg)
-    : path.resolve(nodeModules, '@types/__federated_types/');
+    : nodeModulesOutputDir;
+
+const outputDirs = outputDir !== nodeModulesOutputDir && saveToNodeMoulesArg
+    ? [nodeModulesOutputDir, outputDir]
+    : [outputDir];
 
 const configPathArg = getArg('--config');
 const configPath = configPathArg
@@ -69,14 +79,14 @@ console.log(`Using config file: ${federationConfigPath}`);
 const federationConfig = require(federationConfigPath);
 const compileFiles = Object.values(federationConfig.exposes);
 const compileKeys = Object.keys(federationConfig.exposes);
-const outFile = path.resolve(outputDir, `${federationConfig.name}.d.ts`);
 
 function getModuleDeclareName(exposeName) {
     // windows paths 🤦
     return path.join(federationConfig.name, exposeName).replace(/[\\/]/g, '/');
 }
 
 try {
+    const outFile = path.resolve(outputDir, `${federationConfig.name}.d.ts`);
     if (fs.existsSync(outFile)) {
         fs.unlinkSync(outFile);
     }
@@ -128,39 +138,40 @@ try {
         ].join('\n');
     });
 
-    console.log('writing typing file:', outFile);
+    outputDirs.forEach(_outputDir => {
+        const _outFile = path.resolve(_outputDir, `${federationConfig.name}.d.ts`);
+        console.log('writing typing file:', _outFile);
 
-    fs.writeFileSync(outFile, typing);
+        fs.writeFileSync(_outFile, typing);
 
-    // if we are writing to the node_modules/@types directory, add a package.json file
-    if (outputDir.includes(path.join('node_modules', '@types'))) {
-        const packageJsonPath = path.resolve(outputDir, 'package.json');
+        console.debug(`using output dir: ${_outputDir}`);
+        // if we are writing to the node_modules/@types directory, add a package.json file
+        if (_outputDir.includes(path.join('node_modules', '@types'))) {
+            const packageJsonPath = path.resolve(_outputDir, 'package.json');
 
-        if (!fs.existsSync(packageJsonPath)) {
-            console.debug('writing package.json:', packageJsonPath);
-            fs.copyFileSync(path.resolve(__dirname, 'typings.package.tmpl.json'), packageJsonPath);
-        } else {
-            console.debug(packageJsonPath, 'already exists');
+            if (!fs.existsSync(packageJsonPath)) {
+                console.debug('writing package.json:', packageJsonPath);
+                fs.copyFileSync(path.resolve(__dirname, 'typings.package.tmpl.json'), packageJsonPath);
+            } else {
+                console.debug(packageJsonPath, 'already exists');
+            }
         }
-    } else {
-        console.debug('not writing to node modules, dont need a package.json');
-    }
 
-    // write/update the index.d.ts file
-    const indexPath = path.resolve(outputDir, 'index.d.ts');
-    const importStatement = `export * from './${federationConfig.name}';`;
-
-    if (!fs.existsSync(indexPath)) {
-        console.log('creating index.d.ts file');
-        fs.writeFileSync(indexPath, `${importStatement}\n`);
-    } else {
-        console.log('updating index.d.ts file');
-        const contents = fs.readFileSync(indexPath);
-        if (!contents.includes(importStatement)) {
-            fs.writeFileSync(indexPath, `${contents}${importStatement}\n`);
-        }
-    }
+        // write/update the index.d.ts file
+        const indexPath = path.resolve(_outputDir, 'index.d.ts');
+        const importStatement = `export * from './${federationConfig.name}';`;
 
+        if (!fs.existsSync(indexPath)) {
+            console.log('creating index.d.ts file');
+            fs.writeFileSync(indexPath, `${importStatement}\n`);
+        } else {
+            console.log('updating index.d.ts file');
+            const contents = fs.readFileSync(indexPath);
+            if (!contents.includes(importStatement)) {
+                fs.writeFileSync(indexPath, `${contents}${importStatement}\n`);
+            }
+        }
+    });
     console.debug('Success!');
 } catch (e) {
     console.error(`ERROR:`, e);