Skip to content

Commit

Permalink
Merge branch 'main' into allow-scoped-client-certs
Browse files Browse the repository at this point in the history
  • Loading branch information
zkochan committed Jan 18, 2024
2 parents 2cfe141 + c594fa9 commit aea8ad2
Show file tree
Hide file tree
Showing 15 changed files with 27,282 additions and 2,105 deletions.
102 changes: 92 additions & 10 deletions .bitmap
Original file line number Diff line number Diff line change
Expand Up @@ -14,70 +14,152 @@
"scope": "pnpm.network",
"version": "0.1.0",
"mainFile": "index.ts",
"rootDir": "network/agent"
"rootDir": "network/agent",
"config": {
"pnpm.env/envs/pnpm-env": {},
"teambit.envs/envs": {
"env": "pnpm.env/envs/pnpm-env"
}
}
},
"ca-file": {
"name": "ca-file",
"scope": "pnpm.network",
"version": "1.0.2",
"mainFile": "index.ts",
"rootDir": "network/ca-file"
"rootDir": "network/ca-file",
"config": {
"pnpm.env/envs/pnpm-env": {},
"teambit.envs/envs": {
"env": "pnpm.env/envs/pnpm-env"
}
}
},
"env-replace": {
"name": "env-replace",
"scope": "pnpm.config",
"version": "1.1.0",
"mainFile": "index.ts",
"rootDir": "config/env-replace"
"rootDir": "config/env-replace",
"config": {
"pnpm.env/envs/pnpm-env": {},
"teambit.envs/envs": {
"env": "pnpm.env/envs/pnpm-env"
}
}
},
"env/path-extender": {
"name": "env/path-extender",
"scope": "pnpm.os",
"version": "0.2.12",
"mainFile": "index.ts",
"rootDir": "os/env/path-extender"
"rootDir": "os/env/path-extender",
"config": {
"pnpm.env/envs/pnpm-env": {},
"teambit.envs/envs": {
"env": "pnpm.env/envs/pnpm-env"
}
}
},
"env/path-extender-posix": {
"name": "env/path-extender-posix",
"scope": "pnpm.os",
"version": "0.2.10",
"mainFile": "index.ts",
"rootDir": "os/env/path-extender-posix"
"rootDir": "os/env/path-extender-posix",
"config": {
"pnpm.env/envs/pnpm-env": {},
"teambit.envs/envs": {
"env": "pnpm.env/envs/pnpm-env"
}
}
},
"env/path-extender-windows": {
"name": "env/path-extender-windows",
"scope": "pnpm.os",
"version": "0.2.5",
"mainFile": "index.ts",
"rootDir": "os/env/path-extender-windows"
"rootDir": "os/env/path-extender-windows",
"config": {
"pnpm.env/envs/pnpm-env": {},
"teambit.envs/envs": {
"env": "pnpm.env/envs/pnpm-env"
}
}
},
"envs/pnpm-env": {
"name": "envs/pnpm-env",
"scope": "",
"version": "",
"defaultScope": "pnpm.env",
"mainFile": "index.ts",
"rootDir": "env/envs/pnpm-env",
"config": {
"teambit.envs/envs": {
"env": "teambit.envs/env"
},
"teambit.dependencies/dependency-resolver": {
"policy": {
"devDependencies": {
"@pnpm/eslint-config": "1.1.0",
"@pnpm/config": "20.4.1",
"@pnpm/tsconfig": "2.0.0"
}
}
}
}
},
"group": {
"name": "group",
"scope": "pnpm.log",
"version": "1.0.1",
"mainFile": "index.ts",
"rootDir": "log/group"
"rootDir": "log/group",
"config": {
"pnpm.env/envs/pnpm-env": {},
"teambit.envs/envs": {
"env": "pnpm.env/envs/pnpm-env"
}
}
},
"lex-comparator": {
"name": "lex-comparator",
"scope": "pnpm.util",
"version": "1.0.0",
"mainFile": "index.ts",
"rootDir": "util/lex-comparator"
"rootDir": "util/lex-comparator",
"config": {
"pnpm.env/envs/pnpm-env": {},
"teambit.envs/envs": {
"env": "pnpm.env/envs/pnpm-env"
}
}
},
"policy": {
"name": "policy",
"scope": "pnpm.builder",
"version": "1.1.0",
"mainFile": "index.ts",
"rootDir": "builder/policy"
"rootDir": "builder/policy",
"config": {
"pnpm.env/envs/pnpm-env": {},
"teambit.envs/envs": {
"env": "pnpm.env/envs/pnpm-env"
}
}
},
"proxy-agent": {
"name": "proxy-agent",
"scope": "pnpm.network",
"version": "0.1.0",
"mainFile": "index.ts",
"rootDir": "network/proxy-agent"
"rootDir": "network/proxy-agent",
"config": {
"pnpm.env/envs/pnpm-env": {},
"teambit.envs/envs": {
"env": "pnpm.env/envs/pnpm-env"
}
}
},
"$schema-version": "17.0.0"
}
3 changes: 3 additions & 0 deletions env/envs/pnpm-env/config/eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
extends: [require.resolve('@pnpm/eslint-config')],
}
28 changes: 28 additions & 0 deletions env/envs/pnpm-env/config/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/**
* @see https://bit.dev/reference/jest/jest-config
*/
const { jestConfig } = require('@teambit/react.react-env');

const {
generateNodeModulesPattern,
} = require('@teambit/dependencies.modules.packages-excluder');

const packagesToExclude = ['@teambit', '@my-org', 'my-package-name'];

/**
* by default, jest excludes all node_modules from the transform (compilation) process.
* the following config excludes all node_modules, except for Bit components, style modules, and the packages that are listed.
*/
module.exports = {
...jestConfig,
testEnvironment: 'node',
setupFiles: [],
setupFilesAfterEnv: [],
transformIgnorePatterns: [
'^.+.module.(css|sass|scss)$',
generateNodeModulesPattern({
packages: packagesToExclude,
excludeComponents: true,
}),
],
};
13 changes: 13 additions & 0 deletions env/envs/pnpm-env/config/prettier.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const { prettierConfig } = require('@teambit/react.react-env');

module.exports = {
...prettierConfig,
semi: false,
singleQuote: true,
trailingComma: 'es5',
bracketSpacing: true,
jsxBracketSameLine: false,
arrowParens: 'avoid',
printWidth: 80,
tabWidth: 2,
};
18 changes: 18 additions & 0 deletions env/envs/pnpm-env/config/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/**
* @see https://bit.dev/reference/typescript/typescript-config
*/
{
"extends": "@pnpm/tsconfig",
"compilerOptions": {
"ignoreDeprecations": "5.0"
},
"exclude": [
"artifacts",
"public",
"dist",
"node_modules",
"package.json",
"**/*.cjs"
],
"include": ["**/*", "**/*.json", ".mocharc.js", ".mocharc.js"]
}
9 changes: 9 additions & 0 deletions env/envs/pnpm-env/config/webpack.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import type { WebpackConfigMutator } from '@teambit/webpack';

/**
* modifies the webpack config for the components preview bundle.
* @see https://bit.dev/reference/webpack/webpack-config
*/
export const webpackTransformer = (
configMutator: WebpackConfigMutator
): WebpackConfigMutator => configMutator;
96 changes: 96 additions & 0 deletions env/envs/pnpm-env/env.jsonc
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
{
/**
* standardize your component dependencies.
* @see https://bit.dev/docs/node-env/dependencies
*/
"policy": {
/**
* peer dependencies for components using that env.
*/
"peers": [
{
"name": "react",
/* the version to be installed and used by the env */
"version": "^18.0.0",
/* the range of versions this env's components are compatible with */
"supportedRange": "^17.0.0 || ^18.0.0"
},
{
"name": "react-dom",
"version": "^18.0.0",
"supportedRange": "^17.0.0 || ^18.0.0"
},
{
"name": "jest",
"version": "29.3.1",
"supportedRange": "29.3.1"
},
{
"name": "@mdx-js/react",
"version": "1.6.22",
"supportedRange": "^1.6.22"
},
{
"name": "@teambit/mdx.ui.mdx-scope-context",
"version": "1.0.0",
"supportedRange": "^1.0.0"
}
],
/**
* dev dependencies for components using that env
*/
"dev": [
{
"name": "@types/node",
/* the version to be installed and used by the env */
"version": "^18.11.9",
/**
* hide the dependency from bit's inspection tools.
* in most cases, a component should only list its env as a dev dependency
*/
"hidden": true,
/* add this dependency to components, even if they don't directly import it */
"force": true
},
{
"name": "@types/jest",
"version": "^29.2.2",
"hidden": true,
"force": true
},
{
"name": "@pnpm/tsconfig",
"version": "^2.0.0",
"hidden": true,
"force": true
},
{
"name": "@pnpm/eslint-config",
"version": "^1.1.0",
"hidden": true,
"force": true
}
],
"runtime": []
},

/**
* associate files with a specific dev service.
* associated files are considered as dev files.
* @see https://bit.dev/docs/node-env/dependencies#configure-files-as-dev-files
*/
"patterns": {
/**
* files to be loaded and displayed in the 'preview' tab.
* @see https://bit.dev/docs/node-env/component-previews
*/
"compositions": ["**/*.composition.*", "**/*.preview.*"],
/**
* files to be loaded and displayed in the 'overview' tab.
* @see https://bit.dev/docs/node-env/component-docs
*/
"docs": ["**/*.docs.*"],
/* files to be included in the component testing */
"tests": ["**/*.spec.*", "**/*.test.*"]
}
}
4 changes: 4 additions & 0 deletions env/envs/pnpm-env/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { PnpmEnv } from "./pnpm-env.bit-env";

export { PnpmEnv };
export default PnpmEnv;
Loading

0 comments on commit aea8ad2

Please sign in to comment.