aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--app/fn/fn.php5
-rw-r--r--app/view/templates/layout.php3
-rw-r--r--index.php9
-rw-r--r--package-lock.json55
-rw-r--r--package.json2
-rw-r--r--webpack.config.js7
7 files changed, 48 insertions, 35 deletions
diff --git a/Makefile b/Makefile
index 803b57e..f4e80b4 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,7 @@ dist/w_cms_%.zip: all
webpack.config.js
# Generate the js bundles (and sourcemaps).
-assets/js/%.bundle.js assets/js/%.bundle.js.map: $(js_src_dir)/%.js node_modules
+assets/js/%.bundle.js assets/js/%.bundle.js.map: $(js_src_dir)/%.js node_modules webpack.config.js
@echo Building JS Bundles...
mkdir -p $(dir $@)
webpack $< -o $@ --env $(ENV) $(WEBPACK_FLAGS)
diff --git a/app/fn/fn.php b/app/fn/fn.php
index f96b8ba..ccccfb9 100644
--- a/app/fn/fn.php
+++ b/app/fn/fn.php
@@ -72,6 +72,11 @@ function idclean(string $input)
return $input;
}
+function isreportingerrors()
+{
+ return function_exists('Sentry\init') && !empty(Wcms\Config::sentrydsn());
+}
+
function getversion()
{
diff --git a/app/view/templates/layout.php b/app/view/templates/layout.php
index ef28748..9259fda 100644
--- a/app/view/templates/layout.php
+++ b/app/view/templates/layout.php
@@ -17,7 +17,7 @@
if (!empty(Wcms\Config::interfacecss())) {
echo '<link rel="stylesheet" href="' . Wcms\Model::csspath() . Wcms\Config::interfacecss() . '">';
}
- if (!empty(Wcms\Config::sentrydsn())) {
+ if (isreportingerrors()) {
?>
<script>
const sentrydsn = '<?= Wcms\Config::sentrydsn() ?>';
@@ -25,6 +25,7 @@
const url = '<?= Wcms\Config::url() ?>';
const basepath = '<?= Wcms\Config::basepath() ?>';
</script>
+ <script src="https://browser.sentry-cdn.com/5.9.0/bundle.min.js"></script>
<script src="<?= Wcms\Model::jspath() ?>sentry.bundle.js"></script>
<?php } ?>
</head>
diff --git a/index.php b/index.php
index 13f7bfa..fd9fdaa 100644
--- a/index.php
+++ b/index.php
@@ -13,7 +13,8 @@ require('./vendor/autoload.php');
$app = new Wcms\Application();
$app->wakeup();
-try {
+
+if (isreportingerrors()) {
Sentry\init([
'dsn' => Wcms\Config::sentrydsn(),
'release' => getversion(),
@@ -25,8 +26,6 @@ try {
'username' => Wcms\Config::basepath(),
]);
});
-} catch (Throwable $th) {
- // No problem: Sentry is optionnal
}
try {
@@ -34,10 +33,8 @@ try {
$matchoper->match();
} catch (Exception $e) {
- try {
+ if (isreportingerrors()) {
Sentry\captureException($e);
- } catch (Throwable $th) {
- // No problem: Sentry is optionnal
}
echo '<h1>⚠ Woops ! There is a little problem : </h1>', $e->getMessage(), "\n";
}
diff --git a/package-lock.json b/package-lock.json
index 5d5decf..cc91b99 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -125,13 +125,14 @@
}
},
"@sentry/browser": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.7.1.tgz",
- "integrity": "sha512-K0x1XhsHS8PPdtlVOLrKZyYvi5Vexs9WApdd214bO6KaGF296gJvH1mG8XOY0+7aA5i2A7T3ttcaJNDYS49lzw==",
+ "version": "5.9.0",
+ "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.9.0.tgz",
+ "integrity": "sha512-KTpmAau98QyJZtoV7LVYEFd1cdKQGk5yHlRyP3pCkhDcRbgicBNR3umdRDpsI5Ozgix3zNlyQprz0iQPmrPNRQ==",
+ "dev": true,
"requires": {
- "@sentry/core": "5.7.1",
+ "@sentry/core": "5.8.0",
"@sentry/types": "5.7.1",
- "@sentry/utils": "5.7.1",
+ "@sentry/utils": "5.8.0",
"tslib": "^1.9.3"
}
},
@@ -150,33 +151,36 @@
}
},
"@sentry/core": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.7.1.tgz",
- "integrity": "sha512-AOn3k3uVWh2VyajcHbV9Ta4ieDIeLckfo7UMLM+CTk2kt7C89SayDGayJMSsIrsZlL4qxBoLB9QY4W2FgAGJrg==",
+ "version": "5.8.0",
+ "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.8.0.tgz",
+ "integrity": "sha512-aAh2KLidIXJVGrxmHSVq2eVKbu7tZiYn5ylW6yzJXFetS5z4MA+JYaSBaG2inVYDEEqqMIkb17TyWxxziUDieg==",
+ "dev": true,
"requires": {
- "@sentry/hub": "5.7.1",
- "@sentry/minimal": "5.7.1",
+ "@sentry/hub": "5.8.0",
+ "@sentry/minimal": "5.8.0",
"@sentry/types": "5.7.1",
- "@sentry/utils": "5.7.1",
+ "@sentry/utils": "5.8.0",
"tslib": "^1.9.3"
}
},
"@sentry/hub": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.7.1.tgz",
- "integrity": "sha512-evGh323WR073WSBCg/RkhlUmCQyzU0xzBzCZPscvcoy5hd4SsLE6t9Zin+WACHB9JFsRQIDwNDn+D+pj3yKsig==",
+ "version": "5.8.0",
+ "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.8.0.tgz",
+ "integrity": "sha512-VdApn1ZCNwH1wwQwoO6pu53PM/qgHG+DQege0hbByluImpLBhAj9w50nXnF/8KzV4UoMIVbzCb6jXzMRmqqp9A==",
+ "dev": true,
"requires": {
"@sentry/types": "5.7.1",
- "@sentry/utils": "5.7.1",
+ "@sentry/utils": "5.8.0",
"tslib": "^1.9.3"
}
},
"@sentry/minimal": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.7.1.tgz",
- "integrity": "sha512-nS/Dg+jWAZtcxQW8wKbkkw4dYvF6uyY/vDiz/jFCaux0LX0uhgXAC9gMOJmgJ/tYBLJ64l0ca5LzpZa7BMJQ0g==",
+ "version": "5.8.0",
+ "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.8.0.tgz",
+ "integrity": "sha512-MIlFOgd+JvAUrBBmq7vr9ovRH1HvckhnwzHdoUPpKRBN+rQgTyZy1o6+kA2fASCbrRqFCP+Zk7EHMACKg8DpIw==",
+ "dev": true,
"requires": {
- "@sentry/hub": "5.7.1",
+ "@sentry/hub": "5.8.0",
"@sentry/types": "5.7.1",
"tslib": "^1.9.3"
}
@@ -184,12 +188,14 @@
"@sentry/types": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.7.1.tgz",
- "integrity": "sha512-tbUnTYlSliXvnou5D4C8Zr+7/wJrHLbpYX1YkLXuIJRU0NSi81bHMroAuHWILcQKWhVjaV/HZzr7Y/hhWtbXVQ=="
+ "integrity": "sha512-tbUnTYlSliXvnou5D4C8Zr+7/wJrHLbpYX1YkLXuIJRU0NSi81bHMroAuHWILcQKWhVjaV/HZzr7Y/hhWtbXVQ==",
+ "dev": true
},
"@sentry/utils": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.7.1.tgz",
- "integrity": "sha512-nhirUKj/qFLsR1i9kJ5BRvNyzdx/E2vorIsukuDrbo8e3iZ11JMgCOVrmC8Eq9YkHBqgwX4UnrPumjFyvGMZ2Q==",
+ "version": "5.8.0",
+ "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.8.0.tgz",
+ "integrity": "sha512-KDxUvBSYi0/dHMdunbxAxD3389pcQioLtcO6CI6zt/nJXeVFolix66cRraeQvqupdLhvOk/el649W4fCPayTHw==",
+ "dev": true,
"requires": {
"@sentry/types": "5.7.1",
"tslib": "^1.9.3"
@@ -5589,7 +5595,8 @@
"tslib": {
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
- "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
+ "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
+ "dev": true
},
"tty-browserify": {
"version": "0.0.0",
diff --git a/package.json b/package.json
index 0e640bd..e2c0a41 100644
--- a/package.json
+++ b/package.json
@@ -3,10 +3,10 @@
"repository": "github:vincent-peugnet/wcms",
"license": "MIT",
"dependencies": {
- "@sentry/browser": "^5.7.1",
"codemirror": "^5.49.0"
},
"devDependencies": {
+ "@sentry/browser": "^5.9.0",
"@sentry/cli": "^1.49.0",
"css-loader": "^3.2.0",
"prettier": "^1.18.2",
diff --git a/webpack.config.js b/webpack.config.js
index 8cd7764..9c6607d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -19,8 +19,8 @@ module.exports = (env) => {
sentry: './src/sentry.js',
},
output: {
- filename: 'assets/js/[name].bundle.js',
- path: path.resolve(__dirname),
+ filename: '[name].bundle.js',
+ path: path.resolve(__dirname, 'assets', 'js'),
libraryTarget: 'window'
},
module: {
@@ -41,5 +41,8 @@ module.exports = (env) => {
singleQuote: true,
})
],
+ externals: {
+ '@sentry/browser': 'Sentry',
+ },
}
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-22 22:56:08 +0000