Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Switched to type: module.

Mike Cao4e37e10b6dc9
diff --git a/next.config.mjs b/next.config.ts
similarity index 99%
rename from next.config.mjs
rename to next.config.ts
index 14d09ccec..dc24db2be 100644
--- a/next.config.mjs
+++ b/next.config.ts
@@ -2,6 +2,7 @@ import 'dotenv/config';
import { createRequire } from 'module';
const require = createRequire(import.meta.url);
+
const pkg = require('./package.json');
const TRACKER_SCRIPT = '/script.js';
diff --git a/package.json b/package.json
index 936412d12..d096916e0 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
"type": "git",
"url": "https://github.com/umami-software/umami.git"
},
+ "type": "module",
"scripts": {
"dev": "next dev -p 3000",
"dev-turbo": "next dev -p 3000 --turbo",
@@ -16,36 +17,36 @@
"start": "next start",
"build-docker": "npm-run-all build-db build-tracker build-geo build-app",
"start-docker": "npm-run-all check-db update-tracker set-routes-manifest start-server",
- "start-env": "node scripts/start-env.mjs",
+ "start-env": "node scripts/start-env.js",
"start-server": "node server.js",
"build-app": "next build",
- "build-components": "rollup -c rollup.components.config.mjs",
- "build-tracker": "rollup -c rollup.tracker.config.mjs",
+ "build-components": "rollup -c rollup.components.config.js",
+ "build-tracker": "rollup -c rollup.tracker.config.js",
"build-db": "npm-run-all copy-db-files build-db-client",
"build-lang": "npm-run-all format-lang compile-lang clean-lang download-country-names download-language-names",
- "build-geo": "node scripts/build-geo.mjs",
+ "build-geo": "node scripts/build-geo.js",
"build-db-schema": "prisma db pull",
"build-db-client": "prisma generate",
"build-icons": "svgr ./src/assets --out-dir ./src/components/svg --typescript",
- "set-routes-manifest": "node scripts/set-routes-manifest.mjs",
- "update-tracker": "node scripts/update-tracker.mjs",
+ "set-routes-manifest": "node scripts/set-routes-manifest.js",
+ "update-tracker": "node scripts/update-tracker.js",
"update-db": "prisma migrate deploy",
- "check-db": "node scripts/check-db.mjs",
- "check-env": "node scripts/check-env.mjs",
- "copy-db-files": "node scripts/copy-db-files.mjs",
+ "check-db": "node scripts/check-db.js",
+ "check-env": "node scripts/check-env.js",
+ "copy-db-files": "node scripts/copy-db-files.js",
"extract-messages": "formatjs extract \"src/components/messages.ts\" --out-file build/extracted-messages.json",
- "merge-messages": "node scripts/merge-messages.mjs",
+ "merge-messages": "node scripts/merge-messages.js",
"generate-lang": "npm-run-all extract-messages merge-messages",
- "format-lang": "node scripts/format-lang.mjs",
+ "format-lang": "node scripts/format-lang.js",
"compile-lang": "formatjs compile-folder --ast build/messages public/intl/messages",
"clean-lang": "prettier --write ./public/intl/messages/*.json",
- "check-lang": "node scripts/check-lang.mjs",
- "download-country-names": "node scripts/download-country-names.mjs",
- "download-language-names": "node scripts/download-language-names.mjs",
+ "check-lang": "node scripts/check-lang.js",
+ "download-country-names": "node scripts/download-country-names.js",
+ "download-language-names": "node scripts/download-language-names.js",
"change-password": "node scripts/change-password.js",
"lint": "next lint --quiet",
"prepare": "node -e \"if (process.env.NODE_ENV !== 'production'){process.exit(1)} \" || husky install",
- "postbuild": "node scripts/postbuild.mjs",
+ "postbuild": "node scripts/postbuild.js",
"test": "jest",
"cypress-open": "cypress open cypress run",
"cypress-run": "cypress run cypress run"
@@ -164,7 +165,6 @@
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-import": "^15.1.0",
"postcss-preset-env": "7.8.3",
- "postcss-rtlcss": "^4.0.1",
"prettier": "^2.6.2",
"prompts": "2.4.2",
"rollup": "^3.28.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 74a357c94..b2137d0f2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -294,9 +294,6 @@ importers:
postcss-preset-env:
specifier: 7.8.3
version: 7.8.3([email protected])
- postcss-rtlcss:
- specifier: ^4.0.1
- version: 4.0.9([email protected])
prettier:
specifier: ^2.6.2
version: 2.8.8
@@ -6317,12 +6314,6 @@ packages:
resolution: {integrity: sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==}
- resolution: {integrity: sha512-dCNKEf+FgTv+EA3XI8ysg2RnpS5s3/iZmU+9qpCNFxHU/BhK+4hz7jyCsCAfo0CLnDrMPtaQENhwb+EGm1wh7Q==}
- engines: {node: '>=18.0.0'}
- peerDependencies:
- postcss: ^8.4.21
-
resolution: {integrity: sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==}
engines: {node: '>=12.0'}
@@ -6742,11 +6733,6 @@ packages:
engines: {node: '>=14.18.0', npm: '>=8.0.0'}
hasBin: true
- resolution: {integrity: sha512-/oVHgBtnPNcggP2aVXQjSy6N1mMAfHg4GSag0QtZBlD5bdDgAHwr4pydqJGd+SUCu9260+Pjqbjwtvu7EMH1KQ==}
- engines: {node: '>=12.0.0'}
- hasBin: true
-
resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
@@ -14723,11 +14709,6 @@ snapshots:
- dependencies:
- postcss: 8.5.3
- rtlcss: 4.1.1
-
dependencies:
postcss: 8.5.3
@@ -15283,13 +15264,6 @@ snapshots:
optionalDependencies:
fsevents: 2.3.3
- dependencies:
- escalade: 3.2.0
- picocolors: 1.1.1
- postcss: 8.5.3
- strip-json-comments: 3.1.1
-
dependencies:
queue-microtask: 1.2.3
diff --git a/postcss.config.js b/postcss.config.js
index c71feca52..fc1bf988b 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
plugins: [
'postcss-flexbugs-fixes',
[
diff --git a/rollup.components.config.mjs b/rollup.components.config.js
similarity index 100%
rename from rollup.components.config.mjs
rename to rollup.components.config.js
diff --git a/rollup.tracker.config.mjs b/rollup.tracker.config.js
similarity index 71%
rename from rollup.tracker.config.mjs
rename to rollup.tracker.config.js
index 596f32dde..202db36c9 100644
--- a/rollup.tracker.config.mjs
+++ b/rollup.tracker.config.js
@@ -10,8 +10,8 @@ export default {
},
plugins: [
replace({
- '__COLLECT_API_HOST__': process.env.COLLECT_API_HOST || '',
- '__COLLECT_API_ENDPOINT__': process.env.COLLECT_API_ENDPOINT || '/api/send',
+ __COLLECT_API_HOST__: process.env.COLLECT_API_HOST || '',
+ __COLLECT_API_ENDPOINT__: process.env.COLLECT_API_ENDPOINT || '/api/send',
delimiters: ['', ''],
preventAssignment: true,
}),
diff --git a/scripts/build-geo.mjs b/scripts/build-geo.js
similarity index 100%
rename from scripts/build-geo.mjs
rename to scripts/build-geo.js
diff --git a/scripts/check-db.mjs b/scripts/check-db.js
similarity index 100%
rename from scripts/check-db.mjs
rename to scripts/check-db.js
diff --git a/scripts/check-env.mjs b/scripts/check-env.js
similarity index 100%
rename from scripts/check-env.mjs
rename to scripts/check-env.js
diff --git a/scripts/check-lang.mjs b/scripts/check-lang.js
similarity index 96%
rename from scripts/check-lang.mjs
rename to scripts/check-lang.js
index c6568d9bd..9a4dc67e8 100644
--- a/scripts/check-lang.mjs
+++ b/scripts/check-lang.js
@@ -2,7 +2,7 @@
import fs from 'node:fs';
import path from 'node:path';
import chalk from 'chalk';
-import { createRequire } from "module";
+import { createRequire } from 'module';
const require = createRequire(import.meta.url);
const messages = require(path.resolve(process.cwd(), 'src/lang/en-US.json'));
diff --git a/scripts/copy-db-files.mjs b/scripts/copy-db-files.js
similarity index 100%
rename from scripts/copy-db-files.mjs
rename to scripts/copy-db-files.js
diff --git a/scripts/download-country-names.mjs b/scripts/download-country-names.js
similarity index 100%
rename from scripts/download-country-names.mjs
rename to scripts/download-country-names.js
diff --git a/scripts/download-language-names.mjs b/scripts/download-language-names.js
similarity index 100%
rename from scripts/download-language-names.mjs
rename to scripts/download-language-names.js
diff --git a/scripts/format-lang.mjs b/scripts/format-lang.js
similarity index 92%
rename from scripts/format-lang.mjs
rename to scripts/format-lang.js
index 42f630258..a1b0baa31 100644
--- a/scripts/format-lang.mjs
+++ b/scripts/format-lang.js
@@ -19,7 +19,7 @@ async function run() {
await fs.ensureDir(dest);
files.forEach(file => {
- const lang = require(path.resolve(process.cwd() `src/lang/${file}`));
+ const lang = require(path.resolve(process.cwd()`src/lang/${file}`));
const keys = Object.keys(lang).sort();
const formatted = keys.reduce((obj, key) => {
diff --git a/scripts/merge-messages.mjs b/scripts/merge-messages.js
similarity index 96%
rename from scripts/merge-messages.mjs
rename to scripts/merge-messages.js
index 6bd4c0fc0..d81ba564b 100644
--- a/scripts/merge-messages.mjs
+++ b/scripts/merge-messages.js
@@ -3,7 +3,7 @@ import fs from 'node:fs';
import path from 'node:path';
import prettier from 'prettier';
import messages from '../build/extracted-messages.json';
-import { createRequire } from "module";
+import { createRequire } from 'module';
const require = createRequire(import.meta.url);
const dest = path.resolve(process.cwd(), 'src/lang');
diff --git a/scripts/postbuild.mjs b/scripts/postbuild.js
similarity index 73%
rename from scripts/postbuild.mjs
rename to scripts/postbuild.js
index fca4b36ca..2a4404c74 100644
--- a/scripts/postbuild.mjs
+++ b/scripts/postbuild.js
@@ -1,5 +1,5 @@
import 'dotenv/config';
-import { sendTelemetry } from './telemetry.mjs';
+import { sendTelemetry } from './telemetry.js';
async function run() {
if (!process.env.DISABLE_TELEMETRY) {
diff --git a/scripts/set-routes-manifest.mjs b/scripts/set-routes-manifest.js
similarity index 98%
rename from scripts/set-routes-manifest.mjs
rename to scripts/set-routes-manifest.js
index ea291c1a1..0527ba9c8 100644
--- a/scripts/set-routes-manifest.mjs
+++ b/scripts/set-routes-manifest.js
@@ -2,7 +2,7 @@
import 'dotenv/config';
import fs from 'node:fs';
import path from 'node:path';
-import { createRequire } from "module";
+import { createRequire } from 'module';
const require = createRequire(import.meta.url);
diff --git a/scripts/start-env.mjs b/scripts/start-env.js
similarity index 100%
rename from scripts/start-env.mjs
rename to scripts/start-env.js
diff --git a/scripts/telemetry.mjs b/scripts/telemetry.js
similarity index 100%
rename from scripts/telemetry.mjs
rename to scripts/telemetry.js
diff --git a/scripts/update-tracker.mjs b/scripts/update-tracker.js
similarity index 100%
rename from scripts/update-tracker.mjs
rename to scripts/update-tracker.js