diff --git a/package-lock.json b/package-lock.json index f087c0b13e..ff0f2bc33f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -62,7 +62,7 @@ "gettext-extractor": "^3.6.0", "gettext-parser": "^6.0.0", "jsdom": "^20.0.3", - "rollup-plugin-inject-process-env": "^1.3.1", + "rollup-plugin-baked-env": "^1.0.0", "rollup-plugin-node-externals": "^5.0.2", "sanitize-filename": "^1.6.3", "sass": "^1.56.2", @@ -2648,6 +2648,20 @@ "node": ">= 8" } }, + "node_modules/@rollup/pluginutils": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", + "dev": true, + "peer": true, + "dependencies": { + "estree-walker": "^2.0.1", + "picomatch": "^2.2.2" + }, + "engines": { + "node": ">= 8.0.0" + } + }, "node_modules/@skjnldsv/sanitize-svg": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@skjnldsv/sanitize-svg/-/sanitize-svg-1.0.2.tgz", @@ -10106,13 +10120,16 @@ "fsevents": "~2.3.2" } }, - "node_modules/rollup-plugin-inject-process-env": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/rollup-plugin-inject-process-env/-/rollup-plugin-inject-process-env-1.3.1.tgz", - "integrity": "sha512-kKDoL30IZr0wxbNVJjq+OS92RJSKRbKV6B5eNW4q3mZTFqoWDh6lHy+mPDYuuGuERFNKXkG+AKxvYqC9+DRpKQ==", + "node_modules/rollup-plugin-baked-env": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-baked-env/-/rollup-plugin-baked-env-1.0.0.tgz", + "integrity": "sha512-I1aJur0aXloQVQ/h30/3teCOQJameMETJr0MNRjx7pKa/cdj4L2TMgUil3whmqqp+Yo7VYYMbhywtFB6ZT2s1w==", "dev": true, - "dependencies": { - "magic-string": "^0.25.7" + "engines": { + "node": ">=6" + }, + "peerDependencies": { + "@rollup/pluginutils": "^4.2.1" } }, "node_modules/rollup-plugin-node-externals": { @@ -14339,6 +14356,17 @@ "fastq": "^1.6.0" } }, + "@rollup/pluginutils": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", + "dev": true, + "peer": true, + "requires": { + "estree-walker": "^2.0.1", + "picomatch": "^2.2.2" + } + }, "@skjnldsv/sanitize-svg": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@skjnldsv/sanitize-svg/-/sanitize-svg-1.0.2.tgz", @@ -19981,14 +20009,12 @@ "fsevents": "~2.3.2" } }, - "rollup-plugin-inject-process-env": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/rollup-plugin-inject-process-env/-/rollup-plugin-inject-process-env-1.3.1.tgz", - "integrity": "sha512-kKDoL30IZr0wxbNVJjq+OS92RJSKRbKV6B5eNW4q3mZTFqoWDh6lHy+mPDYuuGuERFNKXkG+AKxvYqC9+DRpKQ==", + "rollup-plugin-baked-env": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-baked-env/-/rollup-plugin-baked-env-1.0.0.tgz", + "integrity": "sha512-I1aJur0aXloQVQ/h30/3teCOQJameMETJr0MNRjx7pKa/cdj4L2TMgUil3whmqqp+Yo7VYYMbhywtFB6ZT2s1w==", "dev": true, - "requires": { - "magic-string": "^0.25.7" - } + "requires": {} }, "rollup-plugin-node-externals": { "version": "5.0.2", diff --git a/package.json b/package.json index 8f491347e1..87e691194f 100644 --- a/package.json +++ b/package.json @@ -102,13 +102,13 @@ "gettext-extractor": "^3.6.0", "gettext-parser": "^6.0.0", "jsdom": "^20.0.3", - "rollup-plugin-inject-process-env": "^1.3.1", + "rollup-plugin-baked-env": "^1.0.0", "rollup-plugin-node-externals": "^5.0.2", "sanitize-filename": "^1.6.3", "sass": "^1.56.2", "vite": "^4.0.0", - "vitest": "^0.25.7", "vitepress": "^1.0.0-alpha.31", + "vitest": "^0.25.7", "vue-docgen-cli": "^4.56.1", "vue-eslint-parser": "^9.1.0", "vue-live": "^2.3.2" diff --git a/src/components/NcMultiselect/NcMultiselect.vue b/src/components/NcMultiselect/NcMultiselect.vue index cad81fbf61..ecc23585f1 100644 --- a/src/components/NcMultiselect/NcMultiselect.vue +++ b/src/components/NcMultiselect/NcMultiselect.vue @@ -238,7 +238,8 @@ import NcListItemIcon from '../NcListItemIcon/index.js' import NcLoadingIcon from '../NcLoadingIcon/index.js' import Tooltip from '../../directives/Tooltip/index.js' import l10n from '../../mixins/l10n.js' - +// eslint-disable-next-line import/no-unresolved, node/no-missing-import +import { SCOPE_VERSION } from 'process.env' import { Multiselect as VueMultiselect } from 'vue-multiselect' export default { @@ -364,7 +365,7 @@ export default { return { elWidth: 0, ariaExpanded: false, - scoping: { [`data-v-${process.env.SCOPE_VERSION}`]: '' }, + scoping: { [`data-v-${SCOPE_VERSION}`]: '' }, } }, computed: { diff --git a/src/l10n.js b/src/l10n.js index 42b8ba797d..a4efc8867f 100644 --- a/src/l10n.js +++ b/src/l10n.js @@ -1,11 +1,13 @@ import { getGettextBuilder } from '@nextcloud/l10n/dist/gettext.js' +// eslint-disable-next-line import/no-unresolved, node/no-missing-import +import { TRANSLATIONS } from 'process.env' const gtBuilder = getGettextBuilder() .detectLocale() // Decompress Translations to gettext format and add to gtBuilder -if (Array.isArray(process.env.TRANSLATIONS)) { - process.env.TRANSLATIONS.forEach((lang) => { +if (Array.isArray(TRANSLATIONS)) { + TRANSLATIONS.forEach((lang) => { const translations = {} for (const key in lang.translations) { diff --git a/src/utils/ScopeComponent.js b/src/utils/ScopeComponent.js index 3289ab8820..ffdcedf014 100644 --- a/src/utils/ScopeComponent.js +++ b/src/utils/ScopeComponent.js @@ -19,6 +19,8 @@ * along with this program. If not, see . * */ +// eslint-disable-next-line import/no-unresolved, node/no-missing-import +import { SCOPE_VERSION } from 'process.env' const ScopeComponent = (Component) => { // Init mounted vue if none @@ -30,7 +32,7 @@ const ScopeComponent = (Component) => { // Inject root scoping function Component.mounted.push(function() { - this.$el.setAttribute(`data-v-${process.env.SCOPE_VERSION}`, '') + this.$el.setAttribute(`data-v-${SCOPE_VERSION}`, '') }) } diff --git a/vite.config.mjs b/vite.config.mjs index 111e218f91..4c54b54f84 100644 --- a/vite.config.mjs +++ b/vite.config.mjs @@ -1,8 +1,8 @@ import md5 from 'md5' import vue from '@vitejs/plugin-vue' -import { externals } from 'rollup-plugin-node-externals' import browserslistToEsbuild from 'browserslist-to-esbuild' -import injectProcessEnv from 'rollup-plugin-inject-process-env' +import bakedEnv from 'rollup-plugin-baked-env' +import { externals } from 'rollup-plugin-node-externals' import { loadTranslations } from './resources/translations.mjs' import { fileURLToPath, URL } from 'url' import { dirname, resolve } from 'path' @@ -66,7 +66,7 @@ export default defineConfig({ rollupOptions: { plugins: [ externals(), - injectProcessEnv(processEnvironment), + bakedEnv(processEnvironment), ], external: [ ...Object.keys(loadJSON('./package.json').peerDependencies),