fix: esm issues

teambit · Apr 17, 2024 · c77234b · c77234b
1 parent b474f14
commit c77234b
Show file tree

Hide file tree

Showing 22 changed files with 26 additions and 22 deletions.
diff --git a/angular/examples/my-angular-env/config/jest.config.cjs b/angular/examples/my-angular-env/config/jest.config.cjs
@@ -1,7 +1,7 @@
 /**
  * @see https://bit.dev/reference/jest/jest-config
  */
-const { jestConfig } = require('@bitdev/angular.angular-env');
+const { jestConfig } = require('@bitdev/angular.envs.angular-v17-env/jest/jest.config.cjs');
 const { generateNodeModulesPattern } = require('@teambit/dependencies.modules.packages-excluder');
 const { defaultTransformerOptions } = require('jest-preset-angular/presets');
 

diff --git a/angular/examples/my-angular-env/config/prettier.config.cjs b/angular/examples/my-angular-env/config/prettier.config.cjs
@@ -1,7 +1,7 @@
 /**
  * @see https://bit.dev/reference/prettier/prettier-config
  */
-const { prettierConfig } = require('@bitdev/angular.envs.base-env');
+const { prettierConfig } = require('@bitdev/angular.envs.base-env/config/prettier.config.cjs');
 
 module.exports = {
   ...prettierConfig,

diff --git a/angular/examples/my-angular-env/my-angular-env.bit-env.ts b/angular/examples/my-angular-env/my-angular-env.bit-env.ts
@@ -51,7 +51,7 @@ export class MyAngularEnv extends AngularEnv {
       eslint: ESLintLib,
       configPath: require.resolve('./config/eslintrc.cjs'),
       // resolve all plugins from the angular environment.
-      pluginsPath: __dirname,
+      pluginsPath: import.meta.dirname,
       extensions: ['.ts', '.tsx', '.js', '.jsx', '.mjs']
     };
   }

diff --git a/angular/examples/my-angular-v13-env/config/jest.config.cjs b/angular/examples/my-angular-v13-env/config/jest.config.cjs
@@ -1,7 +1,7 @@
 /**
  * @see https://bit.dev/reference/jest/jest-config
  */
-const { jestConfig } = require('@bitdev/angular.envs.angular-v13-env');
+const { jestConfig } = require('@bitdev/angular.envs.angular-v13-env/jest/jest.config.cjs');
 const { generateNodeModulesPattern } = require('@teambit/dependencies.modules.packages-excluder');
 
 const packagesToExclude = ['@angular', '@ngrx', 'apollo-angular'];

diff --git a/angular/examples/my-angular-v13-env/config/prettier.config.cjs b/angular/examples/my-angular-v13-env/config/prettier.config.cjs
@@ -1,7 +1,7 @@
 /**
  * @see https://bit.dev/reference/prettier/prettier-config
  */
-const { prettierConfig } = require('@bitdev/angular.envs.base-env');
+const { prettierConfig } = require('@bitdev/angular.envs.base-env/config/prettier.config.cjs');
 
 module.exports = {
   ...prettierConfig,

diff --git a/angular/examples/my-angular-v13-env/my-angular-v13-env.bit-env.ts b/angular/examples/my-angular-v13-env/my-angular-v13-env.bit-env.ts
@@ -51,7 +51,7 @@ export class MyAngularV13Env extends AngularV13Env {
       eslint: ESLintLib,
       configPath: require.resolve('./config/eslintrc.cjs'),
       // resolve all plugins from the angular environment.
-      pluginsPath: __dirname,
+      pluginsPath: import.meta.dirname,
       extensions: ['.ts', '.tsx', '.js', '.jsx', '.mjs']
     };
   }

diff --git a/angular/examples/my-angular-v14-env/config/jest.config.cjs b/angular/examples/my-angular-v14-env/config/jest.config.cjs
@@ -1,7 +1,7 @@
 /**
  * @see https://bit.dev/reference/jest/jest-config
  */
-const { jestConfig } = require('@bitdev/angular.envs.angular-v14-env');
+const { jestConfig } = require('@bitdev/angular.envs.angular-v14-env/jest/jest.config.cjs');
 const { generateNodeModulesPattern } = require('@teambit/dependencies.modules.packages-excluder');
 
 const packagesToExclude = ['@angular', '@ngrx', 'apollo-angular'];

diff --git a/angular/examples/my-angular-v14-env/config/prettier.config.cjs b/angular/examples/my-angular-v14-env/config/prettier.config.cjs
@@ -1,7 +1,7 @@
 /**
  * @see https://bit.dev/reference/prettier/prettier-config
  */
-const { prettierConfig } = require('@bitdev/angular.envs.base-env');
+const { prettierConfig } = require('@bitdev/angular.envs.base-env/config/prettier.config.cjs');
 
 module.exports = {
   ...prettierConfig,

diff --git a/angular/examples/my-angular-v14-env/my-angular-v14-env.bit-env.ts b/angular/examples/my-angular-v14-env/my-angular-v14-env.bit-env.ts
@@ -51,7 +51,7 @@ export class MyAngularV14Env extends AngularV14Env {
       eslint: ESLintLib,
       configPath: require.resolve('./config/eslintrc.cjs'),
       // resolve all plugins from the angular environment.
-      pluginsPath: __dirname,
+      pluginsPath: import.meta.dirname,
       extensions: ['.ts', '.tsx', '.js', '.jsx', '.mjs']
     };
   }

diff --git a/angular/examples/my-angular-v15-env/config/jest.config.cjs b/angular/examples/my-angular-v15-env/config/jest.config.cjs
@@ -1,7 +1,7 @@
 /**
  * @see https://bit.dev/reference/jest/jest-config
  */
-const { jestConfig } = require('@bitdev/angular.envs.angular-v15-env');
+const { jestConfig } = require('@bitdev/angular.envs.angular-v15-env/jest/jest.config.cjs');
 const { generateNodeModulesPattern } = require('@teambit/dependencies.modules.packages-excluder');
 
 const packagesToExclude = ['@angular', '@ngrx', 'apollo-angular'];

diff --git a/angular/examples/my-angular-v15-env/config/prettier.config.cjs b/angular/examples/my-angular-v15-env/config/prettier.config.cjs
@@ -1,7 +1,7 @@
 /**
  * @see https://bit.dev/reference/prettier/prettier-config
  */
-const { prettierConfig } = require('@bitdev/angular.envs.base-env');
+const { prettierConfig } = require('@bitdev/angular.envs.base-env/config/prettier.config.cjs');
 
 module.exports = {
   ...prettierConfig,

diff --git a/angular/examples/my-angular-v15-env/my-angular-v15-env.bit-env.ts b/angular/examples/my-angular-v15-env/my-angular-v15-env.bit-env.ts
@@ -51,7 +51,7 @@ export class MyAngularV15Env extends AngularV15Env {
       eslint: ESLintLib,
       configPath: require.resolve('./config/eslintrc.cjs'),
       // resolve all plugins from the angular environment.
-      pluginsPath: __dirname,
+      pluginsPath: import.meta.dirname,
       extensions: ['.ts', '.tsx', '.js', '.jsx', '.mjs']
     };
   }

diff --git a/angular/examples/my-angular-v16-env/config/jest.config.cjs b/angular/examples/my-angular-v16-env/config/jest.config.cjs
@@ -1,7 +1,7 @@
 /**
  * @see https://bit.dev/reference/jest/jest-config
  */
-const { jestConfig } = require('@bitdev/angular.envs.angular-v16-env');
+const { jestConfig } = require('@bitdev/angular.envs.angular-v16-env/jest/jest.config.cjs');
 const { generateNodeModulesPattern } = require('@teambit/dependencies.modules.packages-excluder');
 const { defaultTransformerOptions } = require('jest-preset-angular/presets');
 

diff --git a/angular/examples/my-angular-v16-env/config/prettier.config.cjs b/angular/examples/my-angular-v16-env/config/prettier.config.cjs
@@ -1,7 +1,7 @@
 /**
  * @see https://bit.dev/reference/prettier/prettier-config
  */
-const { prettierConfig } = require('@bitdev/angular.envs.base-env');
+const { prettierConfig } = require('@bitdev/angular.envs.base-env/config/prettier.config.cjs');
 
 module.exports = {
   ...prettierConfig,

diff --git a/angular/examples/my-angular-v16-env/my-angular-v16-env.bit-env.ts b/angular/examples/my-angular-v16-env/my-angular-v16-env.bit-env.ts
@@ -51,7 +51,7 @@ export class MyAngularV16Env extends AngularV16Env {
       eslint: ESLintLib,
       configPath: require.resolve('./config/eslintrc.cjs'),
       // resolve all plugins from the angular environment.
-      pluginsPath: __dirname,
+      pluginsPath: import.meta.dirname,
       extensions: ['.ts', '.tsx', '.js', '.jsx', '.mjs']
     };
   }

diff --git a/angular/examples/my-angular-v17-env/config/jest.config.cjs b/angular/examples/my-angular-v17-env/config/jest.config.cjs
@@ -1,7 +1,7 @@
 /**
  * @see https://bit.dev/reference/jest/jest-config
  */
-const { jestConfig } = require('@bitdev/angular.envs.angular-v17-env');
+const { jestConfig } = require('@bitdev/angular.envs.angular-v17-env/jest/jest.config.cjs');
 const { generateNodeModulesPattern } = require('@teambit/dependencies.modules.packages-excluder');
 const { defaultTransformerOptions } = require('jest-preset-angular/presets');
 

diff --git a/angular/examples/my-angular-v17-env/config/prettier.config.cjs b/angular/examples/my-angular-v17-env/config/prettier.config.cjs
@@ -1,7 +1,7 @@
 /**
  * @see https://bit.dev/reference/prettier/prettier-config
  */
-const { prettierConfig } = require('@bitdev/angular.envs.base-env');
+const { prettierConfig } = require('@bitdev/angular.envs.base-env/config/prettier.config.cjs');
 
 module.exports = {
   ...prettierConfig,

diff --git a/angular/examples/my-angular-v17-env/my-angular-v17-env.bit-env.ts b/angular/examples/my-angular-v17-env/my-angular-v17-env.bit-env.ts
@@ -51,7 +51,7 @@ export class MyAngularV17Env extends AngularV17Env {
       eslint: ESLintLib,
       configPath: require.resolve('./config/eslintrc.cjs'),
       // resolve all plugins from the angular environment.
-      pluginsPath: __dirname,
+      pluginsPath: import.meta.dirname,
       extensions: ['.ts', '.tsx', '.js', '.jsx', '.mjs']
     };
   }

diff --git a/angular/templates/generators/ng-env/files/config/jest.config.ts b/angular/templates/generators/ng-env/files/config/jest.config.ts
@@ -4,7 +4,7 @@ export const jestConfigFile = (angularVersion: number, envPkgName: string) => {
     content: `/**
  * @see https://bit.dev/reference/jest/jest-config
  */
-const { jestConfig } = require('${envPkgName}');
+const { jestConfig } = require('${envPkgName}/jest/jest.config.cjs');
 const { generateNodeModulesPattern } = require('@teambit/dependencies.modules.packages-excluder');
 ${angularVersion >= 16 ? `
 const { defaultTransformerOptions } = require('jest-preset-angular/presets');

diff --git a/angular/templates/generators/ng-env/files/config/prettier.config.ts b/angular/templates/generators/ng-env/files/config/prettier.config.ts
@@ -4,7 +4,7 @@ export const prettierConfigFile = () => {
     content: `/**
  * @see https://bit.dev/reference/prettier/prettier-config
  */
-const { prettierConfig } = require('@bitdev/angular.envs.base-env');
+const { prettierConfig } = require('@bitdev/angular.envs.base-env/config/prettier.config.cjs');
 
 module.exports = {
   ...prettierConfig,

diff --git a/angular/templates/generators/ng-env/files/env.ts b/angular/templates/generators/ng-env/files/env.ts
@@ -52,7 +52,7 @@ export class ${Name} extends ${envName} {
       eslint: ESLintLib,
       configPath: require.resolve('./config/eslintrc.cjs'),
       // resolve all plugins from the angular environment.
-      pluginsPath: __dirname,
+      pluginsPath: import.meta.dirname,
       extensions: ['.ts', '.tsx', '.js', '.jsx', '.mjs']
     };
   }

diff --git a/angular/templates/generators/ng-env/index.ts b/angular/templates/generators/ng-env/index.ts
@@ -38,13 +38,17 @@ export class NgEnvTemplate implements ComponentTemplate {
     const aspectId: ComponentID = typeof context.aspectId === 'string' ? ComponentID.fromString(context.aspectId) : context.aspectId;
     const envId = aspectId.toStringWithoutVersion();
     let envPkgName: string;
+    let jestEnvPkgName: string;
     if (this.workspace) {
       const envComponent = await this.workspace!.get(aspectId);
       envPkgName = this.pkg.getPackageName(envComponent);
+      jestEnvPkgName = this.pkg.getPackageName(envComponent);
     } else if (envId === 'bitdev.angular/angular-env') { // mostly for ci / ripple
       envPkgName = '@bitdev/angular.angular-env';
+      jestEnvPkgName = `@bitdev/angular.envs.angular-v${ this.angularVersion }-env`;
     } else {
       envPkgName = `@bitdev/angular.envs.angular-v${ this.angularVersion }-env`;
+      jestEnvPkgName = `@bitdev/angular.envs.angular-v${ this.angularVersion }-env`;
     }
     return [
       {
@@ -62,7 +66,7 @@ export class NgEnvTemplate implements ComponentTemplate {
         content: envFile(context, this.envName, this.angularVersion, envPkgName)
       },
       eslintConfigFile(),
-      jestConfigFile(this.angularVersion, envPkgName),
+      jestConfigFile(this.angularVersion, jestEnvPkgName),
       prettierConfigFile(),
       tsConfigFile(),
       tsConfigSpecFile(),