CyberCoveLLC/threshold-ui
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #25 from hashicorp/oss/merge-main-7509fa345b88bdde29887bfcc5897d5e3825dd78

Browse Source 
[main] OSS to ENT merge of (7509fa3)
This commit is contained in:
hc-github-team-secure-boundary authored and GitHub committed 2023-01-10 15:25:52 -08:00
2 parents 9e3d067033 c36f9041ac
commit d654fb6522
16 files changed
+1545 -774
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

addons/api/package.json
+2 -1
View File
@@ -17,7 +17,7 @@
"format": "yarn run format:js",
"format:js": "prettier --write '{addon,app,config,stories,tests,mirage}/**/*.js' *.js",
"start": "ember serve",
"test": "ember test",
"test": "ember exam --test-port 0 --split=4 --parallel=1 --random",
"test:ember-compatibility": "ember try:each",
"precommit": "yarn lint && yarn format && yarn test",
"doc:toc": "doctoc README.md"
@@ -48,6 +48,7 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-exam": "^8.0.0",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
addons/api/testem.js
+1
View File
@@ -22,4 +22,5 @@ module.exports = {
},
Firefox: ['-headless', '--window-size=1440,900'],
},
parallel: process.env.EMBER_EXAM_SPLIT_COUNT || 1,
};
addons/api/tests/test-helper.js
+1 -1
View File
@@ -3,7 +3,7 @@ import config from 'dummy/config/environment';
import * as QUnit from 'qunit';
import { setApplication } from '@ember/test-helpers';
import { setup } from 'qunit-dom';
import { start } from 'ember-qunit';
import start from 'ember-exam/test-support/start';
setApplication(Application.create(config.APP));
addons/auth/package.json
+1 -1
View File
@@ -15,7 +15,7 @@
"format": "yarn run format:js",
"format:js": "prettier --write '{addon,app,config,stories,tests}/**/*.js' *.js",
"start": "ember serve",
"test": "ember test",
"test": "ember test --test-port 0",
"test:ember-compatibility": "ember try:each",
"precommit": "yarn lint && yarn format && yarn test",
"doc:toc": "doctoc README.md"
addons/core/package.json
+1 -1
View File
@@ -25,7 +25,7 @@
"format:js": "prettier --write '{addon,app,config,stories,tests}/**/*.js' *.js",
"format:hbs": "prettier --write '{addon,app,tests}/**/*.hbs'",
"start": "ember serve",
"test": "ember test",
"test": "ember test --test-port 0",
"test:ember-compatibility": "ember try:each",
"precommit": "yarn lint && yarn format && yarn test",
"doc:toc": "doctoc README.md"
addons/rose/package.json
+2 -1
View File
@@ -24,7 +24,7 @@
"format:mdx": "prettier --write 'addon/**/*.mdx'",
"format:sass": "prettier --write '{addon,app}/**/*.scss'",
"start": "ember serve",
"test": "ember test",
"test": "ember exam --test-port 0 --split=4 --parallel=1 --random",
"test:ember-compatibility": "ember try:each",
"prestorybook": "yarn build && yarn storybook:build",
"storybook": "start-storybook -p 6006 -s dist",
@@ -80,6 +80,7 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-exam": "^8.0.0",
"ember-export-application-global": "^2.0.1",
"ember-inline-svg": "^1.0.1",
"ember-load-initializers": "^2.1.2",
addons/rose/testem.js
+1
View File
@@ -22,4 +22,5 @@ module.exports = {
},
Firefox: ['-headless', '--window-size=1440,900'],
},
parallel: process.env.EMBER_EXAM_SPLIT_COUNT || 1,
};
addons/rose/tests/test-helper.js
+1 -1
View File
@@ -3,7 +3,7 @@ import config from 'dummy/config/environment';
import * as QUnit from 'qunit';
import { setApplication } from '@ember/test-helpers';
import { setup } from 'qunit-dom';
import { start } from 'ember-qunit';
import start from 'ember-exam/test-support/start';
setApplication(Application.create(config.APP));
package.json
+21 -21
View File
@@ -14,28 +14,28 @@
},
"scripts": {
"build": "yarn build:ui:admin",
"build:ui:admin": "cd ui/admin && yarn build",
"build:ui:admin:oss": "cd ui/admin && yarn build:oss",
"build:ui:admin:enterprise": "cd ui/admin && yarn build:enterprise",
"build:ui:admin:hcp": "cd ui/admin && yarn build:hcp",
"build:ui:desktop": "cd ui/desktop && yarn build",
"build:ui:admin": "yarn --cwd ui/admin build",
"build:ui:admin:oss": "yarn --cwd ui/admin build:oss",
"build:ui:admin:enterprise": "yarn --cwd ui/admin build:enterprise",
"build:ui:admin:hcp": "yarn --cwd ui/admin build:hcp",
"build:ui:desktop": "yarn --cwd ui/desktop build",
"build:ui:desktop:win": "docker-compose -f docker-compose-embedding.yml run build-desktop-production && yarn build:ui:desktop:app",
"build:ui:desktop:production": "cd ui/desktop && yarn build:production",
"build:ui:desktop:app": "cd ui/desktop && yarn build:desktop",
"lint": "npm-run-all lint:*",
"lint:addons-api": "cd addons/api && yarn lint",
"lint:addons-auth": "cd addons/auth && yarn lint",
"lint:addons-core": "cd addons/core && yarn lint",
"lint:addons-rose": "cd addons/rose && yarn lint",
"lint:ui-admin": "cd ui/admin && yarn lint",
"lint:ui-desktop": "cd ui/desktop && yarn lint",
"test": "npm-run-all test:*",
"test:addons-api": "cd addons/api && yarn test",
"test:addons-auth": "cd addons/auth && yarn test",
"test:addons-core": "cd addons/core && yarn test",
"test:addons-rose": "cd addons/rose && yarn test",
"test:ui-admin": "cd ui/admin && yarn test",
"test:ui-desktop": "cd ui/desktop && yarn test",
"build:ui:desktop:production": "yarn --cwd ui/desktop build:production",
"build:ui:desktop:app": "yarn --cwd ui/desktop build:desktop",
"lint": "npm-run-all -p lint:*",
"lint:addons-api": "yarn --cwd addons/api lint",
"lint:addons-auth": "yarn --cwd addons/auth lint",
"lint:addons-core": "yarn --cwd addons/core lint",
"lint:addons-rose": "yarn --cwd addons/rose lint",
"lint:ui-admin": "yarn --cwd ui/admin lint",
"lint:ui-desktop": "yarn --cwd ui/desktop lint",
"test": "npm-run-all -p test:*",
"test:addons-api": "yarn --cwd addons/api test",
"test:addons-auth": "yarn --cwd addons/auth test",
"test:addons-core": "yarn --cwd addons/core test",
"test:addons-rose": "yarn --cwd addons/rose test",
"test:ui-admin": "yarn --cwd ui/admin test",
"test:ui-desktop": "yarn --cwd ui/desktop test",
"compliance:licenses": "license-checker --onlyAllow 'Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Python-2.0;Unicode-TOU;Unlicense;WTFPL' --excludePackages 'boundary-ui;admin@0.0.0;desktop@0.0.0;base64-js@0.0.2;cycle@1.0.3;cldr-core@41.0.0;make-plural@7.2.0'",
"doc:toc": "doctoc README.md",
"prepare": "husky install"
ui/admin/package.json
+1 -1
View File
@@ -32,7 +32,7 @@
"clean:coverage": "rm -rf coverage_*",
"pretest": "yarn clean:coverage",
"test": "npm-run-all test:*",
"test:ember": "COVERAGE=true ember exam --random",
"test:ember": "COVERAGE=true ember exam --test-port 0 --split=4 --parallel=1 --random",
"posttest": "ember coverage-merge && yarn clean:coverage"
},
"dependencies": {
ui/admin/testem.js
+1
View File
@@ -20,4 +20,5 @@ module.exports = {
},
Firefox: ['-headless', '--window-size=1440,900'],
},
parallel: process.env.EMBER_EXAM_SPLIT_COUNT || 1,
};
ui/admin/tests/test-helper.js
+1 -3
View File
@@ -3,10 +3,8 @@ import config from 'admin/config/environment';
import * as QUnit from 'qunit';
import { setApplication } from '@ember/test-helpers';
import { setup } from 'qunit-dom';
//import { start } from 'ember-qunit';
import './helpers/flash-message';
import start from 'ember-exam/test-support/start';
import './helpers/flash-message';
setApplication(Application.create(config.APP));
ui/desktop/package.json
+1 -1
View File
@@ -36,7 +36,7 @@
"clean:coverage": "rm -rf coverage_*",
"pretest": "yarn clean:coverage",
"test": "npm-run-all test:*",
"test:ember": "cross-env COVERAGE=true ember exam --random",
"test:ember": "cross-env COVERAGE=true ember exam --test-port 0 --split=4 --parallel=1 --random",
"e2e": "yarn run build && yarn run e2e:dev",
"e2e:dev": "npx playwright test --headed",
"postinstall": "cd electron-app && yarn install",
ui/desktop/testem.js
+1
View File
@@ -20,4 +20,5 @@ module.exports = {
].filter(Boolean),
},
},
parallel: process.env.EMBER_EXAM_SPLIT_COUNT || 1,
};
ui/desktop/tests/test-helper.js
+1 -1
View File
@@ -3,7 +3,7 @@ import config from 'desktop/config/environment';
import * as QUnit from 'qunit';
import { setApplication } from '@ember/test-helpers';
import { setup } from 'qunit-dom';
import { start } from 'ember-qunit';
import start from 'ember-exam/test-support/start';
import './helpers/flash-message';
setApplication(Application.create(config.APP));
yarn.lock
+1508 -741
View File
File diff suppressed because it is too large. Load diff