Chore: Cleanup package-lock.json after Gutenberg Mobile migration #23550

gziolo · 2020-06-29T07:00:04Z

Description

Follow-up for #22714.

This PR tries to hoist all dependencies used in the newly added React Native specific packages.

How has this been tested?

Continues integration – GitHub actions.

Types of changes

Checklist:

My code is tested.
My code follows the WordPress code style.
My code follows the accessibility standards.
My code has proper inline documentation.
I've included developer documentation if appropriate.
I've updated all React Native files affected by any refactorings/renamings in this PR.

gziolo · 2020-06-29T07:03:36Z

packages/react-native-editor/package.json

-    "@wordpress/react-native-bridge": "file:../react-native-bridge",
-    "fast-average-color": "^4.3.0",
-    "jed": "^1.1.1",
-    "jsc-android": "^241213.1.0",


jsc-android isn't explicitly used in the package. It's listed as a direct dependency of react-native though.

gziolo · 2020-06-29T07:04:27Z

packages/react-native-editor/package.json

+		"jsdom-jscore-rn": "git+https://github.com/iamcco/jsdom-jscore-rn.git#a562f3d57c27c13e5bfc8cf82d496e69a3ba2800",
+		"metro-react-native-babel-preset": "0.57.0",
+		"metro-react-native-babel-transformer": "0.56.0",
+		"node-fetch": "^2.6.0",


I updated node-fetch to the latest version here and in @wordpress/e2e-test-utils.

gziolo · 2020-06-29T07:05:52Z

packages/react-native-editor/package.json

@@ -1,123 +1,122 @@
 {
-  "name": "@wordpress/react-native-editor",


I saved this file with IDE and .editorconfig kicked in which promotes tabs over spaces. The best way to review is to use:

github-actions · 2020-06-29T07:07:09Z

Size Change: 0 B

Total Size: 1.13 MB

ℹ️ View Unchanged

Filename	Size	Change
`build/a11y/index.js`	1.14 kB	0 B
`build/annotations/index.js`	3.62 kB	0 B
`build/api-fetch/index.js`	3.4 kB	0 B
`build/autop/index.js`	2.82 kB	0 B
`build/blob/index.js`	620 B	0 B
`build/block-directory/index.js`	7.39 kB	0 B
`build/block-directory/style-rtl.css`	941 B	0 B
`build/block-directory/style.css`	942 B	0 B
`build/block-editor/index.js`	109 kB	0 B
`build/block-editor/style-rtl.css`	10.7 kB	0 B
`build/block-editor/style.css`	10.7 kB	0 B
`build/block-library/editor-rtl.css`	7.48 kB	0 B
`build/block-library/editor.css`	7.49 kB	0 B
`build/block-library/index.js`	129 kB	0 B
`build/block-library/style-rtl.css`	8.04 kB	0 B
`build/block-library/style.css`	8.05 kB	0 B
`build/block-library/theme-rtl.css`	730 B	0 B
`build/block-library/theme.css`	732 B	0 B
`build/block-serialization-default-parser/index.js`	1.88 kB	0 B
`build/block-serialization-spec-parser/index.js`	3.1 kB	0 B
`build/blocks/index.js`	48.2 kB	0 B
`build/components/index.js`	198 kB	0 B
`build/components/style-rtl.css`	15.9 kB	0 B
`build/components/style.css`	15.9 kB	0 B
`build/compose/index.js`	9.65 kB	0 B
`build/core-data/index.js`	11.4 kB	0 B
`build/data-controls/index.js`	1.29 kB	0 B
`build/data/index.js`	8.44 kB	0 B
`build/date/index.js`	5.47 kB	0 B
`build/deprecated/index.js`	772 B	0 B
`build/dom-ready/index.js`	569 B	0 B
`build/dom/index.js`	3.19 kB	0 B
`build/edit-navigation/index.js`	9.87 kB	0 B
`build/edit-navigation/style-rtl.css`	1.02 kB	0 B
`build/edit-navigation/style.css`	1.02 kB	0 B
`build/edit-post/index.js`	303 kB	0 B
`build/edit-post/style-rtl.css`	5.51 kB	0 B
`build/edit-post/style.css`	5.5 kB	0 B
`build/edit-site/index.js`	16.6 kB	0 B
`build/edit-site/style-rtl.css`	3.03 kB	0 B
`build/edit-site/style.css`	3.03 kB	0 B
`build/edit-widgets/index.js`	9.32 kB	0 B
`build/edit-widgets/style-rtl.css`	2.42 kB	0 B
`build/edit-widgets/style.css`	2.42 kB	0 B
`build/editor/editor-styles-rtl.css`	537 B	0 B
`build/editor/editor-styles.css`	539 B	0 B
`build/editor/index.js`	44.8 kB	0 B
`build/editor/style-rtl.css`	3.85 kB	0 B
`build/editor/style.css`	3.86 kB	0 B
`build/element/index.js`	4.65 kB	0 B
`build/escape-html/index.js`	733 B	0 B
`build/format-library/index.js`	7.73 kB	0 B
`build/format-library/style-rtl.css`	547 B	0 B
`build/format-library/style.css`	548 B	0 B
`build/hooks/index.js`	2.13 kB	0 B
`build/html-entities/index.js`	622 B	0 B
`build/i18n/index.js`	3.56 kB	0 B
`build/is-shallow-equal/index.js`	711 B	0 B
`build/keyboard-shortcuts/index.js`	2.51 kB	0 B
`build/keycodes/index.js`	1.94 kB	0 B
`build/list-reusable-blocks/index.js`	3.12 kB	0 B
`build/list-reusable-blocks/style-rtl.css`	450 B	0 B
`build/list-reusable-blocks/style.css`	451 B	0 B
`build/media-utils/index.js`	5.29 kB	0 B
`build/notices/index.js`	1.79 kB	0 B
`build/nux/index.js`	3.4 kB	0 B
`build/nux/style-rtl.css`	671 B	0 B
`build/nux/style.css`	668 B	0 B
`build/plugins/index.js`	2.56 kB	0 B
`build/primitives/index.js`	1.5 kB	0 B
`build/priority-queue/index.js`	788 B	0 B
`build/redux-routine/index.js`	2.85 kB	0 B
`build/rich-text/index.js`	14 kB	0 B
`build/server-side-render/index.js`	2.67 kB	0 B
`build/shortcode/index.js`	1.7 kB	0 B
`build/token-list/index.js`	1.28 kB	0 B
`build/url/index.js`	4.06 kB	0 B
`build/viewport/index.js`	1.85 kB	0 B
`build/warning/index.js`	1.14 kB	0 B
`build/wordcount/index.js`	1.17 kB	0 B

_{compressed-size-action}

gziolo · 2020-06-29T07:43:48Z

There an issue with one of the development dependencies:

It looks more like an issue with the didyoumean package configuration that is listed as licensed Apache in `package.json file:
https://github.com/dcporter/didyoumean.js/blob/94aecc770ada684d9209a20ade956ce2fa0ae63d/package.json#L26

In fact, it's licensed as Apache License, Version 2.0:

https://github.com/dcporter/didyoumean.js/blob/master/LICENSE

Now the question is, whether we should extend the list of allowed values:

gutenberg/packages/scripts/scripts/check-licenses.js

Lines 78 to 81 in e421896

    
           'Apache-2.0', 
        
           'Apache 2.0', 
        
           'Apache License, Version 2.0', 
        
           'Apache version 2.0',

or explicitly exclude this package from the check? We could also change the logic that scans LICENSE files and use that as fallback when the license is incorrect in package.json file:

gutenberg/packages/scripts/scripts/check-licenses.js

Line 113 in e421896

'Apache-2.0': [ 'Licensed under the Apache License, Version 2.0' ],

It probably would allow us also to remove all the variations people use to describe Apache v2.0 license since those packages most likely have this phrase there. It's the case for didyoumean.

pento · 2020-06-29T08:48:28Z

Changing the logic of check-licenses.js to fall back to the LICENSE file if it can't match the value in package.json seems reasonable to me. The LICENSE file is probably the canonical source, the value in package.json is just a shortcut.

gziolo · 2020-06-29T11:28:04Z

Updated the logic in check-licenses with 96365c2. I was able to remove some of the listed licenses types that seem like a mix of multiple licenses or wrong classification.

ceyhun

Tested Android and iOS demo apps and they work fine. Thank you for this!

gziolo requested review from ajitbohra, nerrad and ntwb as code owners June 29, 2020 07:00

gziolo requested review from Tug, ceyhun, hypest and cameronvoell June 29, 2020 07:00

gziolo self-assigned this Jun 29, 2020

gziolo added the Mobile App - i.e. Android or iOS Native mobile impl of the block editor. (Note: used in scripts, ping mobile folks to change) label Jun 29, 2020

gziolo commented Jun 29, 2020

View reviewed changes

ntwb approved these changes Jun 29, 2020

View reviewed changes

gziolo requested a review from pento June 29, 2020 07:43

gziolo force-pushed the update/gutenberg-mobiile-lock-cleanup branch from d13ccec to 96365c2 Compare June 29, 2020 11:24

ceyhun approved these changes Jun 29, 2020

View reviewed changes

gziolo added 3 commits June 30, 2020 12:28

Chore: Cleanup package-lock.json after Gutenberg Mobile migration

92f8c4f

Scripts: Improve the way licenses are validated with check-licenses

80253fb

Bring back Apache License, Version 2.0

7ea622f

gziolo force-pushed the update/gutenberg-mobiile-lock-cleanup branch from b09bb39 to 7ea622f Compare June 30, 2020 10:28

gziolo merged commit 3e9015f into master Jun 30, 2020

gziolo deleted the update/gutenberg-mobiile-lock-cleanup branch June 30, 2020 10:52

github-actions bot added this to the Gutenberg 8.5 milestone Jun 30, 2020

cameronvoell mentioned this pull request Jul 3, 2020

Re-adding jsc-android to fix android demo build #23694

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Chore: Cleanup package-lock.json after Gutenberg Mobile migration #23550

Chore: Cleanup package-lock.json after Gutenberg Mobile migration #23550

gziolo commented Jun 29, 2020 •

edited

Loading

gziolo Jun 29, 2020

gziolo Jun 29, 2020

gziolo Jun 29, 2020 •

edited

Loading

github-actions bot commented Jun 29, 2020 •

edited

Loading

gziolo commented Jun 29, 2020 •

edited

Loading

pento commented Jun 29, 2020

gziolo commented Jun 29, 2020

ceyhun left a comment

		@@ -1,123 +1,122 @@
		{
		"name": "@wordpress/react-native-editor",

Chore: Cleanup package-lock.json after Gutenberg Mobile migration #23550

Chore: Cleanup package-lock.json after Gutenberg Mobile migration #23550

Conversation

gziolo commented Jun 29, 2020 • edited Loading

Description

How has this been tested?

Types of changes

Checklist:

gziolo Jun 29, 2020

Choose a reason for hiding this comment

gziolo Jun 29, 2020

Choose a reason for hiding this comment

gziolo Jun 29, 2020 • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Jun 29, 2020 • edited Loading

gziolo commented Jun 29, 2020 • edited Loading

pento commented Jun 29, 2020

gziolo commented Jun 29, 2020

ceyhun left a comment

Choose a reason for hiding this comment

gziolo commented Jun 29, 2020 •

edited

Loading

gziolo Jun 29, 2020 •

edited

Loading

github-actions bot commented Jun 29, 2020 •

edited

Loading

gziolo commented Jun 29, 2020 •

edited

Loading