From 634f8ec0cdf835e0a25135dd3df0a9bb11889bea Mon Sep 17 00:00:00 2001 From: Dylan Decrulle <81740200+ddecrulle@users.noreply.github.com> Date: Mon, 4 Dec 2023 17:11:43 +0100 Subject: [PATCH] build: env issue --- .eslintrc.cjs | 16 ---------------- .eslintrc.json | 16 ++++++++++++++++ entrypoint.sh | 2 +- scripts/generate-entrypoint.js | 7 ++----- 4 files changed, 19 insertions(+), 22 deletions(-) delete mode 100644 .eslintrc.cjs create mode 100644 .eslintrc.json diff --git a/.eslintrc.cjs b/.eslintrc.cjs deleted file mode 100644 index daf68db..0000000 --- a/.eslintrc.cjs +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - env: { browser: true, es2020: true }, - extends: [ - 'eslint:recommended', - 'plugin:react/recommended', - 'plugin:react/jsx-runtime', - 'plugin:react-hooks/recommended', - ], - parserOptions: { ecmaVersion: 'latest', sourceType: 'module' }, - settings: { react: { version: '18.2' } }, - plugins: ['react-refresh'], - rules: { - 'react-refresh/only-export-components': 'warn', - 'react/prop-types': 'off', - }, -}; diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..cb5537b --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,16 @@ +{ + "env": { "browser": true, "es2020": true }, + "extends": [ + "eslint:recommended", + "plugin:react/recommended", + "plugin:react/jsx-runtime", + "plugin:react-hooks/recommended" + ], + "parserOptions": { "ecmaVersion": "latest", "sourceType": "module" }, + "settings": { "react": { "version": "18.2" } }, + "plugins": ["react-refresh"], + "rules": { + "react-refresh/only-export-components": "warn", + "react/prop-types": "off" + } +} diff --git a/entrypoint.sh b/entrypoint.sh index 78326e0..112c83c 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,3 +1,3 @@ #!/bin/sh -echo "window._env_['VITE_API_URL'] = '$VITE_API_URL';" >> /usr/share/nginx/html/env-config.js +echo "window._env_['API_URL'] = '$API_URL';" >> /usr/share/nginx/html/env-config.js exec "$@" \ No newline at end of file diff --git a/scripts/generate-entrypoint.js b/scripts/generate-entrypoint.js index 5dcfacc..f9a6bbe 100644 --- a/scripts/generate-entrypoint.js +++ b/scripts/generate-entrypoint.js @@ -10,11 +10,8 @@ fs.readFile('.env', 'utf8') .filter((data) => data.length === 2) .map( ([key]) => - `echo "window._env_['${key.replace( - 'REACT_APP_', - '' - )}'] = '\$${key.replace( - 'REACT_APP_', + `echo "window._env_['${key.replace('VITE_', '')}'] = '\$${key.replace( + 'VITE_', '' )}';" >> /usr/share/nginx/html/env-config.js` );