Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion env/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"main": "index.js",
"private": true,
"dependencies": {
"dotenv": "^8.2.0"
"dotenv": "^17.4.2"
}
}
20 changes: 11 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"clean": "rm -rf dist && rm -rf test-reports",
"lint": "eslint .",
"lint:report": "eslint -f checkstyle -o ./test-reports/lint/eslint-checkstyle-result.xml .",
"lint:lockfile": "lockfile-lint --path yarn.lock --allowed-hosts registry.yarnpkg.com --validate-https",
"prepare": "yarn build",
"start": "yarn workspace @okta/test.app.test-harness-app start",
"test": "yarn lint && yarn test:unit && yarn test:e2e",
Expand Down Expand Up @@ -47,11 +48,12 @@
"**/glob": "^9.3.5",
"@babel/runtime": "^7.27.0",
"**/lodash": "4.18.1",
"**/lodash-es": "4.18.1"
"**/lodash-es": "4.18.1",
"@types/node": "^20.0.0"
},
"dependencies": {
"@babel/runtime": "^7.27.0",
"compare-versions": "^4.1.2"
"compare-versions": "^6.1.1"
},
"peerDependencies": {
"@okta/okta-auth-js": "^5.3.1 || ^6.0.0 || ^7.0.0 || ^8.0.0",
Expand All @@ -66,8 +68,8 @@
"@babel/preset-env": "^7.19.3",
"@babel/preset-react": "^7.18.6",
"@okta/okta-auth-js": "^7.14.5",
"@rollup/plugin-babel": "^5.2.1",
"@rollup/plugin-replace": "^2.3.4",
"@rollup/plugin-babel": "^7.1.0",
"@rollup/plugin-replace": "^6.0.3",
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/react": "^12.1.3",
"@types/enzyme": "^3.10.8",
Expand All @@ -81,7 +83,7 @@
"axios": "^1.15.0",
"babel-jest": "^27.5.1",
"chalk": "^4.1.0",
"dotenv": "^8.2.0",
"dotenv": "^17.4.2",
"enzyme": "^3.5.1",
"enzyme-adapter-react-16": "^1.4.0",
"eslint": "^7.10.0",
Expand All @@ -98,17 +100,17 @@
"jest": "^29.6.4",
"jest-environment-jsdom": "^29.6.4",
"jest-junit": "^13.0.0",
"lockfile-lint": "^5.0.0",
"polished": "^1.7.0",
"prop-types": "^15.5.10",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-router-dom": "5.2.0",
"rimraf": "^2.6.2",
"rollup": "^2.33.1",
"rollup": "^4.62.3",
"rollup-plugin-cleanup": "^3.2.1",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-typescript2": "^0.29.0",
"shelljs": "^0.8.5",
"rollup-plugin-typescript2": "^0.37.0",
"shelljs": "^0.10.0",
"ts-jest": "^29.1.1",
"typescript": "^4.0.5"
},
Expand Down
11 changes: 8 additions & 3 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import replace from '@rollup/plugin-replace';
import cleanup from 'rollup-plugin-cleanup';
import { terser } from 'rollup-plugin-terser';
import typescript from 'rollup-plugin-typescript2';
import pkg from "./package.json";
import ts from 'typescript';
import { readFileSync } from 'fs';

const pkg = JSON.parse(readFileSync('./package.json', 'utf8'));


const makeExternalPredicate = () => {
Expand All @@ -25,8 +28,7 @@ const input = 'src/index.ts';
const external = makeExternalPredicate();
const commonPlugins = [
typescript({
// eslint-disable-next-line node/no-unpublished-require
typescript: require('typescript'),
typescript: ts,
useTsconfigDeclarationDir: true
}),
replace({
Expand All @@ -38,6 +40,9 @@ const commonPlugins = [
minSupportedVersion: '5.3.1'
})
},
// default delimiters in @rollup/plugin-replace v3+ don't match identifiers
// followed by ".", which breaks replacing AUTH_JS.minSupportedVersion
delimiters: ['\\b', '\\b'],
preventAssignment: true
}),
cleanup({
Expand Down
5 changes: 5 additions & 0 deletions scripts/lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ if ! yarn lint:report; then
exit ${TEST_FAILURE}
fi

if ! yarn lint:lockfile; then
echo "lockfile lint failed! Exiting..."
exit ${TEST_FAILURE}
fi

echo ${TEST_SUITE_TYPE} > ${TEST_SUITE_TYPE_FILE}
echo ${TEST_RESULT_FILE_DIR} > ${TEST_RESULT_FILE_DIR_FILE}
exit ${PUBLISH_TYPE_AND_RESULT_DIR_BUT_SUCCEED_IF_NO_RESULTS}
2 changes: 1 addition & 1 deletion scripts/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if ! ci-append-sha; then
fi

npm config set @okta:registry ${REGISTRY}
if ! npm publish --registry ${REGISTRY}; then
if ! npm publish --registry ${REGISTRY} --tag ${TARGET_BRANCH}; then
echo "npm publish failed! Exiting..."
exit ${PUBLISH_ARTIFACTORY_FAILURE}
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export AUTHJS_VERSION=""

# Install required node version
export NVM_DIR="/root/.nvm"
NODE_VERSION="${1:-v18.20.2}"
NODE_VERSION="${1:-v24.18.0}"
setup_service node $NODE_VERSION
# Use the cacert bundled with centos as okta root CA is self-signed and cause issues downloading from yarn
setup_service yarn 1.21.1 /etc/pki/tls/certs/ca-bundle.crt
Expand Down
Loading