Skip to content

Commit 743a6a6

Browse files
committed
Merge branch 'trunk' into update/release-prep-workflow
* trunk: (92 commits) <1024 <600px Use analytics Fix Migration Event Endpoint bump version to 3.0.1 Logo upload error fallback Translations Bump version in bootstrap.php Remove dev minimum stability bump onboarding data Bump version to 3.0.0 Retire old onboarding Canvas preview scale Introduce abandoned status Previous fixes build Fix migration fatal error Add dashboard button to the design studio Prevent onboarding re-entry Canvas icon buttons tooltip(s) Logo drag-drop fix build ... # Conflicts: # package-lock.json # package.json
2 parents 6fa4819 + 2ea46d0 commit 743a6a6

File tree

763 files changed

+60622
-60427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

763 files changed

+60622
-60427
lines changed

.eslintrc.js

Lines changed: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ const restrictedImports = [
66
},
77
{
88
name: 'lodash',
9-
// [TODO] Update this list as we start moving away from lodash.
9+
// [TODO] Update this list as we start moving away from lodash.
1010
importNames: [
11-
'memoize'
11+
'memoize',
1212
],
1313
message:
1414
'This Lodash method is not recommended. Please use native functionality instead. If using `memoize`, please use `memize` instead.',
@@ -50,16 +50,47 @@ const restrictedImports = [
5050
];
5151

5252
module.exports = {
53-
root: true,
54-
extends: [
55-
'plugin:@wordpress/eslint-plugin/recommended',
53+
root: true,
54+
extends: [
55+
'plugin:@wordpress/eslint-plugin/recommended-with-formatting',
5656
],
57-
rules: {
58-
'no-restricted-imports': [
57+
settings: {
58+
'import/resolver': {
59+
alias: {
60+
map: [
61+
[ '@', './src/app' ],
62+
],
63+
extensions: [ '.js', '.jsx', '.json', '.css', '.scss' ],
64+
},
65+
},
66+
},
67+
globals: {
68+
__: true,
69+
_n: true,
70+
sprintf: true,
71+
useContext: true,
72+
useEffect: true,
73+
useState: true,
74+
useLocation: true,
75+
useNavigate: true,
76+
},
77+
rules: {
78+
'no-restricted-imports': [
5979
'error',
6080
{
6181
paths: restrictedImports,
6282
},
6383
],
64-
}
65-
}
84+
'jsdoc/check-param-names': 'off',
85+
'jsdoc/no-undefined-types': [
86+
'error',
87+
{
88+
definedTypes: [
89+
'React',
90+
'JSX',
91+
'ReactNode',
92+
],
93+
},
94+
],
95+
},
96+
};

.prettierrc.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
const wordpressPrettierConfig = require( '@wordpress/prettier-config' );
2+
3+
module.exports = {
4+
...wordpressPrettierConfig,
5+
printWidth: 100, // Default print width for all files. Override if needed.
6+
singleQuote: true,
7+
tabWidth: 2,
8+
trailingComma: 'es5',
9+
overrides: [
10+
{
11+
files: '*.css',
12+
options: {
13+
printWidth: 160,
14+
},
15+
},
16+
],
17+
};

bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function nfd_wp_module_onboarding_register() {
2424

2525
// Set Global Constants
2626
if ( ! defined( 'NFD_ONBOARDING_VERSION' ) ) {
27-
define( 'NFD_ONBOARDING_VERSION', '2.7.4' );
27+
define( 'NFD_ONBOARDING_VERSION', '3.0.1' );
2828
}
2929
if ( ! defined( 'NFD_ONBOARDING_DIR' ) ) {
3030
define( 'NFD_ONBOARDING_DIR', __DIR__ );

build/2.7.4/100-rtl.css

Lines changed: 0 additions & 3 deletions
This file was deleted.

build/2.7.4/100.css

Lines changed: 0 additions & 3 deletions
This file was deleted.

build/2.7.4/100.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/2.7.4/127.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/2.7.4/202.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/2.7.4/206.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)