merged master and fixed conflict in yarn.lock

HubSpot · May 7, 2021 · 66028cc · 66028cc
2 parents 53faa4e + 5ce71cc
commit 66028cc
Show file tree

Hide file tree

Showing 6 changed files with 153 additions and 574 deletions.
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "eslint": "^6.5.1",
     "husky": "^1.3.1",
     "lerna": "^4.0.0",
-    "lint-staged": "^8.1.4",
+    "lint-staged": "^10.5.4",
     "madge": "^4.0.1",
     "prettier": "^1.19.1"
   },

diff --git a/packages/cli-lib/api/appPipeline.js b/packages/cli-lib/api/appPipeline.js
@@ -13,6 +13,7 @@ async function deployApp(accountId, appFolderPath) {
 async function deployAppSync(accountId, appFolderPath) {
   return http.post(accountId, {
     uri: `${APP_PIPELINE_API_PATH}/deploy/sync`,
+    timeout: 60000,
     body: {
       appPath: appFolderPath,
     },

diff --git a/packages/cli-lib/lib/__tests__/uploadFolder.js b/packages/cli-lib/lib/__tests__/uploadFolder.js
@@ -14,6 +14,7 @@ describe('uploadFolder', () => {
         'folder/templates/blog.html',
         'folder/css/file.css',
         'folder/js/file.js',
+        'folder/fields.json',
         'folder/images/image.png',
         'folder/images/image.jpg',
         'folder/sample.module/module.css',
@@ -41,11 +42,12 @@ describe('uploadFolder', () => {
         'folder/js/file.js',
         'folder/templates/blog.html',
         'folder/templates/page.html',
+        'folder/fields.json',
       ];
 
       await uploadFolder(accountId, src, dest, { mode: 'publish' });
 
-      expect(upload).toReturnTimes(10);
+      expect(upload).toReturnTimes(11);
 
       uploadedFilesInOrder.forEach((file, index) => {
         expect(upload).nthCalledWith(index + 1, accountId, file, file, {

diff --git a/packages/cli-lib/lib/uploadFolder.js b/packages/cli-lib/lib/uploadFolder.js
@@ -28,6 +28,7 @@ function getFilesByType(files) {
   const cssAndJsFiles = [];
   const otherFiles = [];
   const templateFiles = [];
+  const jsonFiles = [];
 
   files.forEach(file => {
     const parts = splitLocalPath(file);
@@ -40,12 +41,14 @@ function getFilesByType(files) {
       cssAndJsFiles.push(file);
     } else if (extension === 'html') {
       templateFiles.push(file);
+    } else if (extension === 'json') {
+      jsonFiles.push(file);
     } else {
       otherFiles.push(file);
     }
   });
 
-  return [otherFiles, moduleFiles, cssAndJsFiles, templateFiles];
+  return [otherFiles, moduleFiles, cssAndJsFiles, templateFiles, jsonFiles];
 }
 /**
  *

diff --git a/packages/webpack-cms-plugins/README.md b/packages/webpack-cms-plugins/README.md
@@ -56,4 +56,5 @@ module.exports = ({ account, autoupload }) => ({
 });
 ```
 
-3. Run `webpack --watch --env.account 123 --env.autoupload` to compile your project and automatically upload assets.
+3. Run `webpack --watch --env.account 123 --env.autoupload` to compile your project and automatically upload assets. Replace `123` with your unique Hub ID.
+