@equinor/echo-cli 1.0.0-beta-15 → 1.0.0-beta-16
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.
- package/lib/const/common.d.ts +1 -1
- package/lib/const/common.js +1 -1
- package/lib/const/common.js.map +1 -1
- package/lib/echo-build-dev-host.js +2 -1
- package/lib/echo-build-dev-host.js.map +1 -1
- package/lib/echo-update-dev-host-deps.js +3 -3
- package/lib/echo-update-dev-host-deps.js.map +1 -1
- package/lib/tools/buildScripts/buildAndCopyDevHost.js +4 -3
- package/lib/tools/buildScripts/buildAndCopyDevHost.js.map +1 -1
- package/package.json +2 -3
- package/echo-dev-host/.env +0 -29
- package/echo-dev-host/.vscode/settings.json +0 -5
- package/echo-dev-host/README.md +0 -46
- package/echo-dev-host/babel.config.js +0 -11
- package/echo-dev-host/env.sh +0 -51
- package/echo-dev-host/jest.config.js +0 -21
- package/echo-dev-host/package-lock.json +0 -12457
- package/echo-dev-host/package.json +0 -80
- package/echo-dev-host/public/env-config.js +0 -17
- package/echo-dev-host/public/index.css +0 -60
- package/echo-dev-host/public/index.html +0 -21
- package/echo-dev-host/src/api/api-plants.ts +0 -22
- package/echo-dev-host/src/app.css +0 -12
- package/echo-dev-host/src/app.tsx +0 -43
- package/echo-dev-host/src/components/Home/Home.tsx +0 -23
- package/echo-dev-host/src/components/Home/home.module.css +0 -38
- package/echo-dev-host/src/components/legend.tsx +0 -3
- package/echo-dev-host/src/images/frontpage-brand-placeholder.jpg +0 -0
- package/echo-dev-host/src/index.tsx +0 -90
- package/echo-dev-host/src/setupTests.ts +0 -25
- package/echo-dev-host/src/utils/plants.test.ts +0 -33
- package/echo-dev-host/src/utils/plants.ts +0 -12
- package/echo-dev-host/src/utils/setupSkipAuth.ts +0 -43
- package/echo-dev-host/tsconfig.json +0 -21
- package/echo-dev-host/webpack.config.js +0 -141
package/lib/const/common.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export declare const REQUIRED_REF = "echoDepLoader";
|
|
2
2
|
export declare const ECHO_MODULE_ID_PATH = "/echoModuleId.json";
|
|
3
3
|
export declare const ECHO_MODULE_CONFIG_PATH = "/echoModule.config.json";
|
|
4
|
-
export declare const
|
|
4
|
+
export declare const ECHO_HOST_BUILD_OUTPUT_FOLDER = "echo-dev-host-build";
|
package/lib/const/common.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export const REQUIRED_REF = 'echoDepLoader';
|
|
2
2
|
export const ECHO_MODULE_ID_PATH = '/echoModuleId.json';
|
|
3
3
|
export const ECHO_MODULE_CONFIG_PATH = '/echoModule.config.json';
|
|
4
|
-
export const
|
|
4
|
+
export const ECHO_HOST_BUILD_OUTPUT_FOLDER = 'echo-dev-host-build';
|
|
5
5
|
//# sourceMappingURL=common.js.map
|
package/lib/const/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/const/common.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,eAAe,CAAC;AAE5C,MAAM,CAAC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AACxD,MAAM,CAAC,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;AACjE,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/const/common.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,eAAe,CAAC;AAE5C,MAAM,CAAC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AACxD,MAAM,CAAC,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;AACjE,MAAM,CAAC,MAAM,6BAA6B,GAAG,qBAAqB,CAAC"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { Command } from '@oclif/core';
|
|
3
3
|
import path from 'path';
|
|
4
|
+
import { ECHO_HOST_BUILD_OUTPUT_FOLDER } from './const/common.js';
|
|
4
5
|
import { buildAndCopyDevHost } from './tools/buildScripts/buildAndCopyDevHost.js';
|
|
5
6
|
export default class BuildDevHost extends Command {
|
|
6
7
|
static description = 'Build echo-dev-host locally with current echo lib versions';
|
|
7
8
|
async run() {
|
|
8
9
|
const cliNodeModules = path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli');
|
|
9
|
-
const finalOutput = path.join(cliNodeModules,
|
|
10
|
+
const finalOutput = path.join(cliNodeModules, ECHO_HOST_BUILD_OUTPUT_FOLDER);
|
|
10
11
|
await buildAndCopyDevHost({
|
|
11
12
|
consumerRoot: process.cwd(),
|
|
12
13
|
finalOutputDir: finalOutput
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"echo-build-dev-host.js","sourceRoot":"","sources":["../src/echo-build-dev-host.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAElF,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,OAAO;IAC7C,MAAM,CAAC,WAAW,GAAG,4DAA4D,CAAC;IAElF,KAAK,CAAC,GAAG;QACL,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3F,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"echo-build-dev-host.js","sourceRoot":"","sources":["../src/echo-build-dev-host.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAElF,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,OAAO;IAC7C,MAAM,CAAC,WAAW,GAAG,4DAA4D,CAAC;IAElF,KAAK,CAAC,GAAG;QACL,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3F,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,6BAA6B,CAAC,CAAC;QAE7E,MAAM,mBAAmB,CAAC;YACtB,YAAY,EAAE,OAAO,CAAC,GAAG,EAAE;YAC3B,cAAc,EAAE,WAAW;SAC9B,CAAC,CAAC;IACP,CAAC;;AAGL,YAAY,CAAC,GAAG,EAAE,CAAC"}
|
|
@@ -6,7 +6,7 @@ import fs from 'fs-extra';
|
|
|
6
6
|
import inquirer from 'inquirer';
|
|
7
7
|
import ora from 'ora';
|
|
8
8
|
import path from 'path';
|
|
9
|
-
import {
|
|
9
|
+
import { ECHO_HOST_BUILD_OUTPUT_FOLDER } from './const/common.js';
|
|
10
10
|
import { buildAndCopyDevHost } from './tools/buildScripts/buildAndCopyDevHost.js';
|
|
11
11
|
/**
|
|
12
12
|
* @class UpdateDevHostEchoLibVersions
|
|
@@ -41,7 +41,7 @@ export default class UpdateDevHostEchoLibVersions extends Command {
|
|
|
41
41
|
};
|
|
42
42
|
async run() {
|
|
43
43
|
const { flags } = await this.parse(UpdateDevHostEchoLibVersions);
|
|
44
|
-
const devHostPkgPath = path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli',
|
|
44
|
+
const devHostPkgPath = path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli', ECHO_HOST_BUILD_OUTPUT_FOLDER, 'package.json');
|
|
45
45
|
this.log(chalk.cyan(`Trying to load echo lib dependencies from: ${chalk.yellow(devHostPkgPath)}`));
|
|
46
46
|
let pkg;
|
|
47
47
|
try {
|
|
@@ -114,7 +114,7 @@ export default class UpdateDevHostEchoLibVersions extends Command {
|
|
|
114
114
|
fs.writeJsonSync(devHostPkgPath, pkg, { spaces: 2 });
|
|
115
115
|
this.log('Dependencies updated. Rebuilding echo-dev-host...');
|
|
116
116
|
const cliNodeModules = path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli');
|
|
117
|
-
const finalOutput = path.join(cliNodeModules,
|
|
117
|
+
const finalOutput = path.join(cliNodeModules, ECHO_HOST_BUILD_OUTPUT_FOLDER);
|
|
118
118
|
await buildAndCopyDevHost({
|
|
119
119
|
consumerRoot: process.cwd(),
|
|
120
120
|
finalOutputDir: finalOutput,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"echo-update-dev-host-deps.js","sourceRoot":"","sources":["../src/echo-update-dev-host-deps.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,GAAY,MAAM,KAAK,CAAC;AAC/B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"echo-update-dev-host-deps.js","sourceRoot":"","sources":["../src/echo-update-dev-host-deps.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import figlet from 'figlet';
|
|
|
4
4
|
import fs from 'fs-extra';
|
|
5
5
|
import inquirer from 'inquirer';
|
|
6
6
|
import path from 'path';
|
|
7
|
-
import {
|
|
7
|
+
import { ECHO_HOST_BUILD_OUTPUT_FOLDER } from '../../const/common.js';
|
|
8
8
|
import { printDevHostVersions } from '../../utils/printDevHostVersions.js';
|
|
9
9
|
/**
|
|
10
10
|
* Builds and copies the Echo Dev Host application for local development.
|
|
@@ -32,7 +32,8 @@ export async function buildAndCopyDevHost({ consumerRoot, finalOutputDir, instal
|
|
|
32
32
|
const cliNodeModules = path.resolve(consumerRoot, 'node_modules', '@equinor', 'echo-cli');
|
|
33
33
|
const devHostSrc = path.join(cliNodeModules, 'lib', 'echo-dev-host');
|
|
34
34
|
const tmpDevHostFolder = path.resolve(consumerRoot, 'echo-dev-host-tmp');
|
|
35
|
-
const buildOutput = path.join(tmpDevHostFolder,
|
|
35
|
+
const buildOutput = path.join(tmpDevHostFolder, ECHO_HOST_BUILD_OUTPUT_FOLDER);
|
|
36
|
+
const srcPkgJson = path.join(devHostSrc, 'package.json');
|
|
36
37
|
let shouldReuse = reuseTmpFolder;
|
|
37
38
|
if (fs.existsSync(tmpDevHostFolder) && typeof shouldReuse === 'undefined') {
|
|
38
39
|
const answer = await inquirer.prompt([
|
|
@@ -65,7 +66,7 @@ export async function buildAndCopyDevHost({ consumerRoot, finalOutputDir, instal
|
|
|
65
66
|
if (installAndBuild) {
|
|
66
67
|
console.log(chalk.greenBright.bold('[echo-dev-host] Installing dependencies and building echo-dev-host...\n'));
|
|
67
68
|
console.log(chalk.greenBright.bold('[echo-dev-host] Using the following versions of echo libraries - run `npx update-echo-dev-host-deps` to update them:'));
|
|
68
|
-
printDevHostVersions(
|
|
69
|
+
printDevHostVersions(srcPkgJson);
|
|
69
70
|
execSync('npm install', { cwd: tmpDevHostFolder, stdio: 'inherit' });
|
|
70
71
|
execSync('npm run build', { cwd: tmpDevHostFolder, stdio: 'inherit' });
|
|
71
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildAndCopyDevHost.js","sourceRoot":"","sources":["../../../src/tools/buildScripts/buildAndCopyDevHost.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"buildAndCopyDevHost.js","sourceRoot":"","sources":["../../../src/tools/buildScripts/buildAndCopyDevHost.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@equinor/echo-cli",
|
|
3
|
-
"version": "1.0.0-beta-
|
|
3
|
+
"version": "1.0.0-beta-16",
|
|
4
4
|
"description": "Command line interface for Echo Apps",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"source": "src/test.js",
|
|
@@ -37,8 +37,7 @@
|
|
|
37
37
|
},
|
|
38
38
|
"files": [
|
|
39
39
|
"lib",
|
|
40
|
-
"templates"
|
|
41
|
-
"echo-dev-host"
|
|
40
|
+
"templates"
|
|
42
41
|
],
|
|
43
42
|
"dependencies": {
|
|
44
43
|
"@babel/core": "7.28.0",
|
package/echo-dev-host/.env
DELETED
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
/* eslint-disable */
|
|
2
|
-
|
|
3
|
-
Never use PROCESS.ENV/process.env use env() instead. (Except for process.env.NODE_ENV)
|
|
4
|
-
---------------------------------
|
|
5
|
-
|
|
6
|
-
Based on: https://www.freecodecamp.org/news/how-to-implement-runtime-environment-variables-with-create-react-app-docker-and-nginx-7f9d42a91d70/
|
|
7
|
-
|
|
8
|
-
All variables in this files are converted to env() during build, and values here are replaced
|
|
9
|
-
by environment variables if they exists. This is done by running the env.sh bash script before the
|
|
10
|
-
build.
|
|
11
|
-
|
|
12
|
-
env.sh generates env-config.js containing all the variables, which is included in index.html,
|
|
13
|
-
and appended to Window._env_. env() is a shortcut for Window._env_ and should be used in code.
|
|
14
|
-
|
|
15
|
-
NOTE: Seems like window._env_ is not available in a worker
|
|
16
|
-
|
|
17
|
-
*/
|
|
18
|
-
WEBSITE_HOSTNAME=localhost:3000;
|
|
19
|
-
REACT_APP_DEFAULT_CACHE_LOCATION=localstorage
|
|
20
|
-
REACT_APP_API_URL=https://dt-echopedia-api-dev.azurewebsites.net
|
|
21
|
-
REACT_APP_WEB_URL=https://dt-echopedia-web-dev.azurewebsites.net
|
|
22
|
-
REACT_APP_WEB_PROD_URL=https://echo.equinor.com
|
|
23
|
-
REACT_APP_AZURE_AD_TENNANT=StatoilSRM.onmicrosoft.com
|
|
24
|
-
REACT_APP_AZURE_AD_TENNANT_ID=3aa4a235-b6e2-48d5-9195-7fcf05b459b0
|
|
25
|
-
REACT_APP_AZURE_AD_CLIENT_ID=751d2504-0b66-4b78-9807-4b60525a14c6
|
|
26
|
-
REACT_APP_API_CLIENT_ID=aef35d97-53d4-4fd0-adaf-c5a514b38436
|
|
27
|
-
REACT_APP_APPINSIGHTS_CONNECTION_STRING=InstrumentationKey=e5299075-a00d-4012-96f9-42861e8d8a9e;IngestionEndpoint=https://northeurope-3.in.applicationinsights.azure.com/;LiveEndpoint=https://northeurope.livediagnostics.monitor.azure.com/;ApplicationId=a9b64222-d4a9-42e6-a615-7428fe1a26af
|
|
28
|
-
REACT_APP_AZURE_BUILD_NUMBER=0.8.dev.9
|
|
29
|
-
REACT_APP_LOGGER_ACTIVE=false
|
package/echo-dev-host/README.md
DELETED
|
@@ -1,46 +0,0 @@
|
|
|
1
|
-
# echo-dev-host
|
|
2
|
-
|
|
3
|
-
TODO: update this readme
|
|
4
|
-
|
|
5
|
-
Lightweight host application for Echo Module development, shipped with `echo-cli`
|
|
6
|
-
|
|
7
|
-
## Why it's needed
|
|
8
|
-
|
|
9
|
-
Each Echo Module needs EchopediaWeb as a host to run.
|
|
10
|
-
|
|
11
|
-
This makes development of Echo Modules difficult, since every time a
|
|
12
|
-
new change is introduced, one would need to release and deploy new version of the given Echo Module to see the newly developed features, changes.
|
|
13
|
-
|
|
14
|
-
Echo Client (with the help of `echo-cli`) solves this issue: it provides an "empty shell" of EchopediaWeb's framework, providing the same dependencies.
|
|
15
|
-
|
|
16
|
-
Echo Module devs can run their module via `npm start`, and develop their module "as normal": their module will show up in echo client, so they can see their changes right away with hot module reload.
|
|
17
|
-
|
|
18
|
-
To make sure that Echo Client mimics the same environment as the original echopediaWeb app, their dependencies are linked, and they need to be kept in sync.
|
|
19
|
-
|
|
20
|
-
## How it works
|
|
21
|
-
|
|
22
|
-
`echo-client` ships together with `echo-cli`, so each Echo Module should have `echo-cli` as a dev dependency.
|
|
23
|
-
|
|
24
|
-
When you run the script `npm start` in your Echo Module, `echo-client` will start up providing the dev environment and the empty shell
|
|
25
|
-
of EchopediaWeb.
|
|
26
|
-
|
|
27
|
-
Development goes as usual:
|
|
28
|
-
|
|
29
|
-
- change code
|
|
30
|
-
- save changes
|
|
31
|
-
- hot reload will take care of applying the changes
|
|
32
|
-
|
|
33
|
-
## Maintaining dependencies
|
|
34
|
-
|
|
35
|
-
### Echo packages
|
|
36
|
-
|
|
37
|
-
With new echo packages released (for example: `echo-framework`, `echo-components`) the `echo-client` needs to be updated with these new versions as well,
|
|
38
|
-
and a new `echo-cli` release needs to be done.
|
|
39
|
-
|
|
40
|
-
When that's done, your Echo Module needs to be bumped to this new version of `echo-cli`.
|
|
41
|
-
|
|
42
|
-
See [here](../echo-cli/README.md) how to release new version of `echo-cli` (which ships `echo-client`)
|
|
43
|
-
|
|
44
|
-
### Non-Echo packages
|
|
45
|
-
|
|
46
|
-
Non echo package dependencies are linked to echopediaWeb dependencies, so they are aligned and don't require maintenance.
|
package/echo-dev-host/env.sh
DELETED
|
@@ -1,51 +0,0 @@
|
|
|
1
|
-
#!/bin/bash
|
|
2
|
-
|
|
3
|
-
#https://www.freecodecamp.org/news/how-to-implement-runtime-environment-variables-with-create-react-app-docker-and-nginx-7f9d42a91d70/
|
|
4
|
-
#
|
|
5
|
-
|
|
6
|
-
# Recreate config file
|
|
7
|
-
rm -rf ./env-config.js
|
|
8
|
-
touch ./env-config.js
|
|
9
|
-
|
|
10
|
-
echo "creating env-config.js"
|
|
11
|
-
|
|
12
|
-
# Add assignment
|
|
13
|
-
echo "window._env_ = {" >> ./env-config.js
|
|
14
|
-
|
|
15
|
-
# Read each line in .env file
|
|
16
|
-
# Each line represents key=value pairs
|
|
17
|
-
while read -r line || [[ -n "$line" ]];
|
|
18
|
-
do
|
|
19
|
-
#only process lines containting =
|
|
20
|
-
if [[ $line == *"="* ]]; then
|
|
21
|
-
|
|
22
|
-
# Split env variables by character `=`
|
|
23
|
-
if printf '%s\n' "$line" | grep -q -e '='; then
|
|
24
|
-
varname=$(printf '%s\n' "$line" | sed -e 's/=.*//')
|
|
25
|
-
varvalue=$(printf '%s\n' "$line" | sed -e 's/^[^=]*=//')
|
|
26
|
-
fi
|
|
27
|
-
|
|
28
|
-
# Read value of current variable if exists as Environment variable
|
|
29
|
-
value=$(printf '%s\n' "${!varname}")
|
|
30
|
-
# Otherwise use value from .env file
|
|
31
|
-
[[ -z $value ]] && value=${varvalue}
|
|
32
|
-
|
|
33
|
-
# Append configuration property to JS file
|
|
34
|
-
echo " $varname: \"$value\"," >> ./env-config.js
|
|
35
|
-
|
|
36
|
-
#print variables
|
|
37
|
-
valueObfuscated=$(printf '%s' "$value" | cut -c 1-3)
|
|
38
|
-
#echo " $varname: \"$value\"," #print the environment variables
|
|
39
|
-
echo " $varname=\"$valueObfuscated***\"," #print the environment variables obfuscated
|
|
40
|
-
fi
|
|
41
|
-
done < .env
|
|
42
|
-
|
|
43
|
-
echo "}" >> ./env-config.js
|
|
44
|
-
|
|
45
|
-
#if directory exists, copy to public folder. Needed for dev enironment (npm start)
|
|
46
|
-
if [ -d "public" ]; then
|
|
47
|
-
rm -rf ./public/env-config.js
|
|
48
|
-
cp ./env-config.js ./public/env-config.js
|
|
49
|
-
fi
|
|
50
|
-
|
|
51
|
-
echo "done creating env-config.js"
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
module.exports = {
|
|
2
|
-
testEnvironment: 'jsdom',
|
|
3
|
-
moduleNameMapper: {
|
|
4
|
-
'\\.css$': 'identity-obj-proxy',
|
|
5
|
-
'\\.svg$': '<rootDir>/src/__mocks__/svgrMock.ts'
|
|
6
|
-
},
|
|
7
|
-
preset: 'ts-jest',
|
|
8
|
-
coveragePathIgnorePatterns: ['src/types/*', 'src/index.ts', 'src/typings/*'],
|
|
9
|
-
collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}', '!<rootDir>/node_modules/'],
|
|
10
|
-
coverageThreshold: {
|
|
11
|
-
global: {
|
|
12
|
-
lines: 90,
|
|
13
|
-
statements: 90
|
|
14
|
-
}
|
|
15
|
-
},
|
|
16
|
-
transform: {
|
|
17
|
-
'^.+\\.(j|t)sx?$': 'ts-jest'
|
|
18
|
-
},
|
|
19
|
-
testMatch: ['**/__tests__/**/*.test.[jt]s?(x)', '**/?(*.)+(spec|test).[tj]s?(x)'],
|
|
20
|
-
setupFilesAfterEnv: ['<rootDir>/src/setupTests.ts']
|
|
21
|
-
};
|