From d9e36ec49b58d7e62ce1242f9b13b9b4ad28ad4d Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 20 Apr 2022 12:54:20 +0100 Subject: [PATCH 1/9] Update reference to Jetpack --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 73cf5eb620..66ffbe69c9 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 73cf5eb62029f23d05bd84fc0a724383eb4d09db +Subproject commit 66ffbe69c97cae763757814268b26bf182ffef51 From 676162b4a42eb45ce703458835283fe0467c53ad Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 20 Apr 2022 16:30:13 +0100 Subject: [PATCH 2/9] Update reference to Jetpack --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 66ffbe69c9..188f200a03 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 66ffbe69c97cae763757814268b26bf182ffef51 +Subproject commit 188f200a032b9b45aaeea34237b1ecbf3b8c79ca From 5d3ce629edd4f53c4cb4be50748fa94cbe95cb0e Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 20 Apr 2022 16:53:49 +0100 Subject: [PATCH 3/9] Add 'jetpack-base-styles' package --- package-lock.json | 5 +++++ package.json | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 1a558c9470..276be2ea01 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,11 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@automattic/jetpack-base-styles": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@automattic/jetpack-base-styles/-/jetpack-base-styles-0.3.0.tgz", + "integrity": "sha512-pvHY3G2rMjIChA1+AybDnGrclr32Jbj1TOinuvEzronwsTbFYXNX4p5pkoc0x7c6Kui8Nzs00oH1msReQqDDFQ==" + }, "@babel/code-frame": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", diff --git a/package.json b/package.json index 52966f6c06..9b7e772832 100644 --- a/package.json +++ b/package.json @@ -94,5 +94,7 @@ "lint:fix": "npm run lint -- --fix", "version": "npm run bundle && git add -A bundle" }, - "dependencies": {} + "dependencies": { + "@automattic/jetpack-base-styles": "^0.3.0" + } } From fd4b27a94c367392fffb24e3879783365a1fcf92 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 20 Apr 2022 16:58:11 +0100 Subject: [PATCH 4/9] Update Jetpack reference --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 188f200a03..404102398d 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 188f200a032b9b45aaeea34237b1ecbf3b8c79ca +Subproject commit 404102398de9055a437c203620dc8bc61cd8bed8 From 37ff0cb4e7c58218aafb3b5a8d96525853f83303 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 20 Apr 2022 18:30:11 +0100 Subject: [PATCH 5/9] Update devDependencies with new Jetpack package --- package-lock.json | 3 ++- package.json | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 276be2ea01..808230354e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,8 @@ "@automattic/jetpack-base-styles": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@automattic/jetpack-base-styles/-/jetpack-base-styles-0.3.0.tgz", - "integrity": "sha512-pvHY3G2rMjIChA1+AybDnGrclr32Jbj1TOinuvEzronwsTbFYXNX4p5pkoc0x7c6Kui8Nzs00oH1msReQqDDFQ==" + "integrity": "sha512-pvHY3G2rMjIChA1+AybDnGrclr32Jbj1TOinuvEzronwsTbFYXNX4p5pkoc0x7c6Kui8Nzs00oH1msReQqDDFQ==", + "dev": true }, "@babel/code-frame": { "version": "7.8.3", diff --git a/package.json b/package.json index 9b7e772832..d86e1db9e6 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "npm": ">=6.9.0 <7" }, "devDependencies": { + "@automattic/jetpack-base-styles": "^0.3.0", "@babel/core": "^7.14.3", "@babel/runtime": "^7.14.0", "@react-native-community/cli": "^6.0.0", @@ -93,8 +94,5 @@ "lint": "eslint . --ext .js", "lint:fix": "npm run lint -- --fix", "version": "npm run bundle && git add -A bundle" - }, - "dependencies": { - "@automattic/jetpack-base-styles": "^0.3.0" } } From f2050ac5e50fb3252ba4de5927fe078d7ce61530 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 20 Apr 2022 18:35:58 +0100 Subject: [PATCH 6/9] Add empty dependency object --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index d86e1db9e6..56bdaa1858 100644 --- a/package.json +++ b/package.json @@ -94,5 +94,6 @@ "lint": "eslint . --ext .js", "lint:fix": "npm run lint -- --fix", "version": "npm run bundle && git add -A bundle" - } + }, + "dependencies": {} } From b78aca16d9e25b748ce7e1fd16a80861648a2058 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 21 Apr 2022 00:03:28 +0100 Subject: [PATCH 7/9] Revert dependency addition --- package-lock.json | 6 ------ package.json | 1 - 2 files changed, 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 808230354e..1a558c9470 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,12 +4,6 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@automattic/jetpack-base-styles": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@automattic/jetpack-base-styles/-/jetpack-base-styles-0.3.0.tgz", - "integrity": "sha512-pvHY3G2rMjIChA1+AybDnGrclr32Jbj1TOinuvEzronwsTbFYXNX4p5pkoc0x7c6Kui8Nzs00oH1msReQqDDFQ==", - "dev": true - }, "@babel/code-frame": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", diff --git a/package.json b/package.json index 56bdaa1858..52966f6c06 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,6 @@ "npm": ">=6.9.0 <7" }, "devDependencies": { - "@automattic/jetpack-base-styles": "^0.3.0", "@babel/core": "^7.14.3", "@babel/runtime": "^7.14.0", "@react-native-community/cli": "^6.0.0", From e9a1e165816faae23b7e0bbfaeb731c23d2d17b8 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 21 Apr 2022 00:03:45 +0100 Subject: [PATCH 8/9] Update Jetpack reference --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 404102398d..deeec30424 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 404102398de9055a437c203620dc8bc61cd8bed8 +Subproject commit deeec3042475d30c80ca8e897183c866940e56b4 From 6b5451bdad58ecb76822e066f18dc9d3c2555a83 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Fri, 22 Apr 2022 10:39:27 +0100 Subject: [PATCH 9/9] Update Jetpack reference --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index deeec30424..0911928529 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit deeec3042475d30c80ca8e897183c866940e56b4 +Subproject commit 0911928529d2a30d09054fc4cca247e765bc53a7