Skip to content

Commit 6bf31e4

Browse files
committed
Merge branch 'browser-happy-jsonlint' into fix-embed-default-file
2 parents 562602b + 34e64a8 commit 6bf31e4

File tree

6 files changed

+725
-46
lines changed

6 files changed

+725
-46
lines changed

packages/app/config/webpack.common.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,7 @@ module.exports = {
374374
],
375375
},
376376

377-
// To make jsonlint work
378-
externals: ['file', 'system', 'jsdom', 'prettier', 'cosmiconfig'],
377+
externals: ['jsdom', 'prettier', 'cosmiconfig'],
379378

380379
resolve: {
381380
mainFields: ['browser', 'module', 'jsnext:main', 'main'],

packages/app/src/app/pages/common/Modals/PreferencesModal/Experiments/index.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
PreferenceContainer,
99
PaddedPreference,
1010
} from '../elements';
11+
import track from '@codesandbox/common/lib/utils/analytics';
1112

1213
const windowWithOvermind: {
1314
useOvermind?: (val?: boolean) => 'true' | null;
@@ -41,6 +42,9 @@ export function Experiments() {
4142
setValue={val => {
4243
windowWithOvermind.useOvermind(val);
4344
setUsingOvermind(val);
45+
track('Overmind Enabled', {
46+
enabled: val,
47+
});
4448
}}
4549
/>
4650
<SubDescription>

packages/common/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"humps": "CompuIves/humps",
3939
"image-extensions": "^1.1.0",
4040
"immer": "^3.2.0",
41-
"jsonlint": "^1.6.3",
4241
"lodash": "^4.17.11",
4342
"markty-toml": "^0.0.9",
4443
"memoize-one": "^3.1.1",

0 commit comments

Comments
 (0)