Skip to content

Commit aa09a96

Browse files
committed
Merge branch 'remove-rollup-preserve-directives' of Arnei/opencast-admin-interface into main
Pull request #1144 Fixes #708 Remove rollup-preserve-directives
2 parents ac21ce6 + 6c3fbd3 commit aa09a96

3 files changed

Lines changed: 1 addition & 16 deletions

File tree

package-lock.json

Lines changed: 0 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
"@vitejs/plugin-react-swc": "^3.8.1",
7171
"eslint": "^9.23.0",
7272
"prop-types": "^15.8.1",
73-
"rollup-preserve-directives": "^1.1.3",
7473
"sass": "^1.86.1",
7574
"typescript": "^5.8.2",
7675
"typescript-eslint": "^8.29.0",

vite.config.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ import { defineConfig } from "vite";
22
import react from "@vitejs/plugin-react-swc";
33
import svgr from "vite-plugin-svgr";
44
import viteTsconfigPaths from "vite-tsconfig-paths";
5-
import preserveDirectives from "rollup-preserve-directives";
65
import child from "child_process";
76

87
const commitHash = child.execSync("git rev-parse HEAD || cat commit || echo 'unknown'").toString().trim();
98

109
export default defineConfig({
1110
base: process.env.PUBLIC_URL || "",
12-
plugins: [react(), svgr(), viteTsconfigPaths(), preserveDirectives()],
11+
plugins: [react(), svgr(), viteTsconfigPaths()],
1312
define: {
1413
'import.meta.env.VITE_GIT_COMMIT_HASH': JSON.stringify(commitHash),
1514
'import.meta.env.VITE_APP_BUILD_DATE': JSON.stringify(new Date().toISOString()),

0 commit comments

Comments
 (0)