Skip to content
This repository was archived by the owner on May 22, 2024. It is now read-only.

Commit b8fbaa3

Browse files
sdadnsdadn
committed
Merge branch 'main' into release-mar-8
2 parents 92c92e0 + 55f57ba commit b8fbaa3

File tree

17 files changed

+381
-392
lines changed

17 files changed

+381
-392
lines changed

‎package.json

+44-44
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
{
22
"name": "terra-toolkit",
3-
"private": true,
43
"version": "5.25.0",
54
"description": "Utilities to help when developing terra modules.",
6-
"engines": {
7-
"node": "10 || 12 || 14",
8-
"npm": "9"
9-
},
5+
"author": "Cerner Corporation",
106
"repository": {
117
"type": "git",
128
"url": "git+https://github.com/cerner/terra-toolkit"
139
},
14-
"workspaces": [
15-
"packages/*"
16-
],
10+
"bugs": {
11+
"url": "https://github.com/cerner/terra-toolkit/issues"
12+
},
13+
"license": "Apache-2.0",
1714
"keywords": [
1815
"Cerner",
1916
"Terra",
2017
"Terra Toolkit",
2118
"terra-toolkit",
2219
"UI"
2320
],
21+
"private": true,
22+
"workspaces": [
23+
"packages/*"
24+
],
25+
"engines": {
26+
"node": "10 || 12 || 14",
27+
"npm": "9"
28+
},
2429
"browserslist": [
2530
"extends @cerner/browserslist-config-terra"
2631
],
27-
"author": "Cerner Corporation",
28-
"license": "Apache-2.0",
29-
"bugs": {
30-
"url": "https://github.com/cerner/terra-toolkit/issues"
31-
},
3232
"package-json-lint": {
3333
"extends": "./packages/package-json-lint-config-terra/package-json-lint.config.js",
3434
"projectType": "devModule",
@@ -43,37 +43,6 @@
4343
}
4444
}
4545
},
46-
"scripts": {
47-
"clean": "npm run clean:root && npm run clean:lib",
48-
"clean:install": "npm run clean && time npm install",
49-
"clean:lib": "rm -rf packages/**/lib",
50-
"clean:root": "$(lerna clean --yes || true) && echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
51-
"compile:prod": "rm -rf ./build; NODE_ENV=production webpack --mode=production --config webpack.dev-site.config.js",
52-
"compile": "npm run clean:lib && lerna run compile",
53-
"danger": "danger ci",
54-
"heroku-postbuild": "npm install --only=dev && npm run compile:prod",
55-
"heroku-prebuild": "npx lerna init",
56-
"jest": "jest",
57-
"lint:js": "eslint --ext .js,.jsx . --max-warnings 0",
58-
"lint:js:fix": "eslint --fix --ext .js,.jsx .",
59-
"lint:package-json": "npm run terra -- package-json-lint",
60-
"lint": "npm run lint:js && npm run lint:package-json",
61-
"mocha": "cd packages/terra-functional-testing && npm run mocha",
62-
"pack": "webpack --mode=production",
63-
"postinstall": "npm run compile",
64-
"prepare-for-release": "npm run terra -- prepare-for-release",
65-
"start": "webpack serve --config webpack.dev-site.config.js",
66-
"start-heroku": "npm run terra -- express-server --port $PORT --site './build' ",
67-
"terra": "node ./packages/terra-cli/bin/terra",
68-
"test": "npm run lint && npm run jest && npm run mocha && npm run wdio",
69-
"test:docker": "npm run lint && npm run jest && npm run mocha && npm run wdio:docker",
70-
"wdio-site": "npm run terra -- wdio --site build --browsers chrome firefox --locales en fr --formFactors small large",
71-
"wdio-webpack": "npm run terra -- wdio",
72-
"wdio-site:docker": "npm run terra -- wdio --site build --disableSeleniumService=true --browsers chrome firefox --locales en fr --formFactors small large",
73-
"wdio-webpack:docker": "npm run terra -- wdio --disableSeleniumService=true",
74-
"wdio": "rm -rf build && npm run pack && npm run wdio-site && npm run wdio-webpack",
75-
"wdio:docker": "rm -rf build && npm run pack && npm run wdio-site:docker && npm run wdio-webpack:docker"
76-
},
7746
"devDependencies": {
7847
"@babel/cli": "7",
7948
"@babel/core": "7",
@@ -108,5 +77,36 @@
10877
"webpack": "5",
10978
"webpack-cli": "4",
11079
"webpack-dev-server": "4"
80+
},
81+
"scripts": {
82+
"clean": "npm run clean:root && npm run clean:lib",
83+
"clean:install": "npm run clean && time npm install",
84+
"clean:lib": "rm -rf packages/**/lib",
85+
"clean:root": "$(lerna clean --yes || true) && echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
86+
"compile:prod": "rm -rf ./build; NODE_ENV=production webpack --mode=production --config webpack.dev-site.config.js",
87+
"compile": "npm run clean:lib && lerna run compile",
88+
"danger": "danger ci",
89+
"heroku-postbuild": "npm install --only=dev && npm run compile:prod",
90+
"heroku-prebuild": "npx lerna init",
91+
"jest": "jest",
92+
"lint:js": "eslint --ext .js,.jsx . --max-warnings 0",
93+
"lint:js:fix": "eslint --fix --ext .js,.jsx .",
94+
"lint:package-json": "npm run terra -- package-json-lint",
95+
"lint": "npm run lint:js && npm run lint:package-json",
96+
"mocha": "cd packages/terra-functional-testing && npm run mocha",
97+
"pack": "webpack --mode=production",
98+
"postinstall": "npm run compile",
99+
"prepare-for-release": "npm run terra -- prepare-for-release",
100+
"start": "webpack serve --config webpack.dev-site.config.js",
101+
"start-heroku": "npm run terra -- express-server --port $PORT --site './build' ",
102+
"terra": "node ./packages/terra-cli/bin/terra",
103+
"test": "npm run lint && npm run jest && npm run mocha && npm run wdio",
104+
"test:docker": "npm run lint && npm run jest && npm run mocha && npm run wdio:docker",
105+
"wdio-site": "npm run terra -- wdio --site build --browsers chrome firefox --locales en fr --formFactors small large",
106+
"wdio-webpack": "npm run terra -- wdio",
107+
"wdio-site:docker": "npm run terra -- wdio --site build --disableSeleniumService=true --browsers chrome firefox --locales en fr --formFactors small large",
108+
"wdio-webpack:docker": "npm run terra -- wdio --disableSeleniumService=true",
109+
"wdio": "rm -rf build && npm run pack && npm run wdio-site && npm run wdio-webpack",
110+
"wdio:docker": "rm -rf build && npm run pack && npm run wdio-site:docker && npm run wdio-webpack:docker"
111111
}
112112
}

‎packages/browserslist-config-terra/package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,40 @@
22
"name": "@cerner/browserslist-config-terra",
33
"version": "4.0.0",
44
"description": "Terra Browserslist Shared Config",
5-
"main": "browserslist.config.js",
6-
"publishConfig": {
7-
"access": "public"
8-
},
5+
"author": "Cerner Corporation",
96
"repository": {
107
"type": "git",
118
"url": "git+https://github.com/cerner/terra-toolkit.git",
129
"directory": "packages/browserslist-config-terra"
1310
},
11+
"bugs": {
12+
"url": "https://github.com/cerner/terra-toolkit/issues"
13+
},
14+
"homepage": "https://github.com/cerner/terra-toolkit",
15+
"license": "Apache-2.0",
1416
"keywords": [
17+
"autoprefixer",
1518
"browserslist",
1619
"browserslist-config",
1720
"Cerner",
18-
"Terra",
19-
"autoprefixer",
21+
"eslint",
2022
"stylelint",
21-
"eslint"
23+
"Terra"
2224
],
23-
"author": "Cerner Corporation",
24-
"license": "Apache-2.0",
25-
"bugs": {
26-
"url": "https://github.com/cerner/terra-toolkit/issues"
25+
"publishConfig": {
26+
"access": "public"
27+
},
28+
"main": "browserslist.config.js",
29+
"devDependencies": {
30+
"@cerner/eslint-config-terra": "^5.6.0",
31+
"eslint": "^7.32.0"
2732
},
28-
"homepage": "https://github.com/cerner/terra-toolkit",
2933
"scripts": {
3034
"clean": "echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
3135
"clean:install": "npm run clean && time npm install",
3236
"clean:lib": "rm -rf lib",
3337
"clean:node_modules": "echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
3438
"lint": "eslint --ext .js,.jsx --ignore-path ../../.eslintignore .",
3539
"lint:js:fix": "eslint --ext .js,.jsx . --fix"
36-
},
37-
"devDependencies": {
38-
"@cerner/eslint-config-terra": "^5.6.0",
39-
"eslint": "^7.32.0"
4040
}
4141
}

‎packages/duplicate-package-checker-webpack-plugin/package.json

+24-24
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,31 @@
22
"name": "@cerner/duplicate-package-checker-webpack-plugin",
33
"version": "2.6.0",
44
"description": "Webpack plugin that warns you when multiple versions of the same package exist in a build.",
5-
"main": "lib/index.js",
6-
"engines": {
7-
"node": "10 || 12 || 14",
8-
"npm": "6 || 9"
9-
},
10-
"publishConfig": {
11-
"access": "public"
12-
},
5+
"author": "Cerner Corporation",
136
"repository": {
147
"type": "git",
158
"url": "git+https://github.com/cerner/terra-toolkit.git",
169
"directory": "packages/duplicate-package-checker-webpack-plugin"
1710
},
11+
"bugs": {
12+
"url": "https://github.com/cerner/terra-toolkit/issues"
13+
},
14+
"homepage": "https://github.com/cerner/terra-toolkit",
15+
"license": "Apache-2.0",
1816
"keywords": [
1917
"Cerner",
20-
"Terra",
2118
"duplicate-package-checker-webpack-plugin",
19+
"Terra",
2220
"webpack"
2321
],
24-
"author": "Cerner Corporation",
25-
"license": "Apache-2.0",
26-
"bugs": {
27-
"url": "https://github.com/cerner/terra-toolkit/issues"
22+
"publishConfig": {
23+
"access": "public"
2824
},
29-
"scripts": {
30-
"clean": "npm run clean:node_modules && npm run clean:lib",
31-
"clean:install": "npm run clean && time npm install",
32-
"clean:lib": "rm -rf lib",
33-
"clean:node_modules": "echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
34-
"compile": "babel src --out-dir lib --copy-files --ignore src --no-comments",
35-
"jest": "jest",
36-
"lint": "eslint --ext .js,.jsx --ignore-path ../../.eslintignore .",
37-
"lint:js:fix": "eslint --ext .js,.jsx . --fix",
38-
"test": "npm run jest"
25+
"engines": {
26+
"node": "10 || 12 || 14",
27+
"npm": "6 || 9"
3928
},
29+
"main": "lib/index.js",
4030
"dependencies": {
4131
"chalk": "^4.1.0",
4232
"find-root": "^1.0.0",
@@ -46,12 +36,22 @@
4636
"peerDependencies": {
4737
"webpack": "^4.30.0 || ^5.0.0"
4838
},
49-
"homepage": "https://github.com/cerner/terra-toolkit",
5039
"devDependencies": {
5140
"@babel/cli": "^7.22.10",
5241
"@babel/core": "^7.22.10",
5342
"@cerner/eslint-config-terra": "^5.6.0",
5443
"@cerner/jest-config-terra": "^2.0.0",
5544
"eslint": "^7.32.0"
45+
},
46+
"scripts": {
47+
"clean": "npm run clean:node_modules && npm run clean:lib",
48+
"clean:install": "npm run clean && time npm install",
49+
"clean:lib": "rm -rf lib",
50+
"clean:node_modules": "echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
51+
"compile": "babel src --out-dir lib --copy-files --ignore src --no-comments",
52+
"jest": "jest",
53+
"lint": "eslint --ext .js,.jsx --ignore-path ../../.eslintignore .",
54+
"lint:js:fix": "eslint --ext .js,.jsx . --fix",
55+
"test": "npm run jest"
5656
}
5757
}

‎packages/eslint-config-terra/package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,31 @@
22
"name": "@cerner/eslint-config-terra",
33
"version": "5.6.0",
44
"description": "Terra Eslint Config",
5-
"main": "eslint.config.js",
6-
"publishConfig": {
7-
"access": "public"
8-
},
5+
"author": "Cerner Corporation",
96
"repository": {
107
"type": "git",
118
"url": "git+https://github.com/cerner/terra-toolkit.git",
129
"directory": "packages/eslint-config-terra"
1310
},
11+
"bugs": {
12+
"url": "https://github.com/cerner/terra-toolkit/issues"
13+
},
14+
"homepage": "https://github.com/cerner/terra-toolkit",
15+
"license": "Apache-2.0",
1416
"keywords": [
17+
"Cerner",
1518
"eslint",
1619
"eslint-config",
17-
"Cerner",
1820
"Terra"
1921
],
20-
"author": "Cerner Corporation",
21-
"license": "Apache-2.0",
22-
"bugs": {
23-
"url": "https://github.com/cerner/terra-toolkit/issues"
22+
"publishConfig": {
23+
"access": "public"
2424
},
2525
"engines": {
2626
"node": "^10.13.0 || 12 || 14",
2727
"npm": "6 || 9"
2828
},
29-
"homepage": "https://github.com/cerner/terra-toolkit",
30-
"scripts": {
31-
"clean": "echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
32-
"clean:install": "npm run clean && time npm install",
33-
"lint": "eslint --ext .js,.jsx --ignore-path ../../.eslintignore .",
34-
"lint:js:fix": "eslint --ext .js,.jsx . --fix"
35-
},
29+
"main": "eslint.config.js",
3630
"dependencies": {
3731
"@babel/eslint-parser": "7",
3832
"eslint-config-airbnb": "18",
@@ -45,5 +39,11 @@
4539
},
4640
"peerDependencies": {
4741
"eslint": "7"
42+
},
43+
"scripts": {
44+
"clean": "echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
45+
"clean:install": "npm run clean && time npm install",
46+
"lint": "eslint --ext .js,.jsx --ignore-path ../../.eslintignore .",
47+
"lint:js:fix": "eslint --ext .js,.jsx . --fix"
4848
}
4949
}

‎packages/jest-config-terra/package.json

+23-23
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,31 @@
22
"name": "@cerner/jest-config-terra",
33
"version": "2.0.0",
44
"description": "A base jest config for the terra application framework.",
5-
"main": "jest.config.js",
6-
"publishConfig": {
7-
"access": "public"
8-
},
5+
"author": "Cerner Corporation",
96
"repository": {
107
"type": "git",
118
"url": "git+https://github.com/cerner/terra-toolkit.git",
129
"directory": "packages/jest-config-terra"
1310
},
11+
"bugs": {
12+
"url": "https://github.com/cerner/terra-toolkit/issues"
13+
},
14+
"homepage": "https://github.com/cerner/terra-toolkit",
15+
"license": "Apache-2.0",
1416
"keywords": [
17+
"Cerner",
1518
"jest",
1619
"jest-config",
17-
"Cerner",
1820
"Terra"
1921
],
20-
"author": "Cerner Corporation",
21-
"license": "Apache-2.0",
22-
"bugs": {
23-
"url": "https://github.com/cerner/terra-toolkit/issues"
22+
"publishConfig": {
23+
"access": "public"
2424
},
2525
"engines": {
2626
"node": "^10.13.0 || 12 || 14",
2727
"npm": "6 || 9"
2828
},
29-
"homepage": "https://github.com/cerner/terra-toolkit",
30-
"scripts": {
31-
"clean": "npm run clean:node_modules && npm run clean:lib",
32-
"clean:install": "npm run clean && time npm install",
33-
"clean:lib": "rm -rf lib",
34-
"clean:node_modules": "echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
35-
"compile": "babel src --out-dir lib --copy-files --ignore src",
36-
"lint": "eslint --ext .js,.jsx --ignore-path ../../.eslintignore .",
37-
"lint:js:fix": "eslint --ext .js,.jsx . --fix",
38-
"jest": "jest --config ./jest.local.config.js",
39-
"test": "npm run jest"
40-
},
29+
"main": "jest.config.js",
4130
"dependencies": {
4231
"@cerner/terra-cli": "^1.12.0",
4332
"@jest/reporters": "27",
@@ -48,13 +37,24 @@
4837
"jest-mock": "27",
4938
"strip-ansi": "^6.0.0"
5039
},
40+
"peerDependencies": {
41+
"jest": "27"
42+
},
5143
"devDependencies": {
5244
"@babel/cli": "^7.10.5",
5345
"@babel/core": "^7.11.1",
5446
"@cerner/eslint-config-terra": "^5.6.0",
5547
"eslint": "^7.32.0"
5648
},
57-
"peerDependencies": {
58-
"jest": "27"
49+
"scripts": {
50+
"clean": "npm run clean:node_modules && npm run clean:lib",
51+
"clean:install": "npm run clean && time npm install",
52+
"clean:lib": "rm -rf lib",
53+
"clean:node_modules": "echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
54+
"compile": "babel src --out-dir lib --copy-files --ignore src",
55+
"lint": "eslint --ext .js,.jsx --ignore-path ../../.eslintignore .",
56+
"lint:js:fix": "eslint --ext .js,.jsx . --fix",
57+
"jest": "jest --config ./jest.local.config.js",
58+
"test": "npm run jest"
5959
}
6060
}

0 commit comments

Comments
 (0)