Merge pull request #135 from facebook/fix-relase

v0.2.2 Release preparation
facebookarchive · Jun 9, 2020 · ad7c3f6 · ad7c3f6
2 parents b7f7474 + 3e09cd1
commit ad7c3f6
Show file tree

Hide file tree

Showing 9 changed files with 8,618 additions and 9,336 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,56 +1,57 @@
 {
   "name": "facebook-instant-articles-builder",
   "productName": "Facebook Instant Articles Builder",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "App to create a template to build Instant Articles from articles on your website.",
   "license": "SEE LICENSE IN ./LICENSE",
   "main": "src/js/background.js",
   "dependencies": {
+    "@babel/cli": "^7.10.1",
+    "@babel/core": "^7.10.2",
+    "@babel/plugin-proposal-export-default-from": "^7.10.1",
+    "@babel/plugin-proposal-object-rest-spread": "^7.10.1",
+    "@babel/preset-env": "^7.10.2",
+    "@babel/preset-flow": "^7.10.1",
+    "@babel/preset-react": "^7.10.1",
+    "@babel/register": "^7.10.1",
+    "babel-eslint": "^10.1.0",
+    "babel-plugin-transform-class-properties": "^6.24.1",
     "@octokit/rest": "^14.0.9",
-    "classnames": "^2.2.5",
-    "compare-versions": "^3.1.0",
-    "electron-debug": "^1.4.0",
+    "classnames": "^2.2.6",
+    "compare-versions": "^3.6.0",
+    "electron-debug": "^1.5.0",
     "electron-devtools-installer": "^3.0.0",
-    "electron-settings": "^3.1.4",
+    "electron-settings": "^3.2.0",
     "flux": "^3.1.3",
-    "gulp-connect-php": "^1.0.1",
+    "gulp-connect-php": "^1.0.3",
     "immutable": "^4.0.0-rc.12",
-    "moment": "^2.22.2",
+    "moment": "^2.26.0",
     "react": "^15.6.1",
     "react-dom": "^15.6.1",
-    "react-joyride": "^1.11.2",
+    "react-joyride": "^1.11.4",
     "react-sortable-hoc": "^0.6.8",
-    "semantic-ui-react": "^0.77.2"
+    "semantic-ui-react": "^0.77.2",
+    "yargs-parser": "^18.1.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.8.4",
-    "@babel/core": "^7.9.6",
-    "@babel/plugin-proposal-export-default-from": "^7.8.3",
-    "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
-    "@babel/preset-env": "^7.9.6",
-    "@babel/preset-flow": "^7.9.0",
-    "@babel/preset-react": "^7.9.4",
-    "@babel/register": "^7.9.0",
-    "babel-eslint": "^10.1.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
     "devtron": "^1.4.0",
-    "electron": "^8.2.5",
+    "electron": "^8.3.1",
     "electron-packager": "^14.2.1",
-    "enzyme": "^3.8.0",
-    "enzyme-adapter-react-15": "^1.3.0",
+    "enzyme": "^3.11.0",
+    "enzyme-adapter-react-15": "^1.4.1",
     "eslint": "^4.11.0",
-    "eslint-config-fbjs": "^2.0.0",
+    "eslint-config-fbjs": "^2.1.0",
     "eslint-plugin-babel": "^4.1.2",
-    "eslint-plugin-flowtype": "^2.39.1",
-    "eslint-plugin-jsx-a11y": "^6.0.2",
-    "eslint-plugin-react": "^7.4.0",
+    "eslint-plugin-flowtype": "^2.50.3",
+    "eslint-plugin-jsx-a11y": "^6.2.3",
+    "eslint-plugin-react": "^7.20.0",
     "eslint-plugin-relay": "0.0.19",
     "flow-bin": "^0.124.0",
     "husky": "^0.14.3",
     "immutable-devtools": "0.0.7",
-    "jest-cli": "^24.8.0",
+    "jest-cli": "^26.0.1",
     "lint-staged": "^4.3.0",
-    "prettier-eslint-cli": "^4.7.1",
+    "prettier-eslint-cli": "^5.0.0",
     "react-test-renderer": "^15.6.2"
   },
   "scripts": {

diff --git a/src/css/home.css b/src/css/home.css
@@ -11,8 +11,7 @@ html {
   display: flex;
   align-items: center;
   justify-content: center;
-  width: 100%;
-  height: 100%;
+  height: 100vh;
 }
 .instructions {
   max-width: 500px;

diff --git a/src/css/style.css b/src/css/style.css
@@ -51,6 +51,7 @@ h1 {
   flex: 1;
   padding-top: 10px;
   padding-bottom: 10px;
+  height: 0;
 }
 
 #content {
@@ -708,3 +709,7 @@ header > img.logo {
   opacity: 1;
   margin: 10px;
 }
+
+code {
+  white-space: pre;
+}
diff --git a/src/html/index.html b/src/html/index.html
@@ -23,7 +23,10 @@
         <div id="root">
         </div>
         <script>
-            require('@babel/register');
+            const path = require('path');
+            require('@babel/register')({
+                root: path.resolve(__dirname, '..', '..')
+            });
             require('../../src/js/client');
             require('../../src/js/utils/analytics');
         </script>

diff --git a/src/js/components/NUX.react.js b/src/js/components/NUX.react.js
@@ -73,7 +73,8 @@ export class NUX extends React.Component<Props, State> {
             <a target="_blank" href="https://instantarticles.fb.com/">
               {' '}
               Facebook Instant Articles
-            </a>, you'll need:
+            </a>
+            , you'll need:
           </p>
           <ul>
             <li>A website with articles</li>
@@ -84,7 +85,7 @@ export class NUX extends React.Component<Props, State> {
           </ul>
           <p>
             Once you've finished and saved, upload the file to a public URL and
-            reference it by adding the following meta tag to the
+            reference it by adding the following meta tag to the{' '}
             <code>&lt;head&gt;</code> tag of your articles:
           </p>
           <p>

diff --git a/src/js/components/NUXTour.react.js b/src/js/components/NUXTour.react.js
@@ -59,11 +59,11 @@ class NUXTour extends React.Component<Props> {
   };
 
   buildStepText = (step: {
-  content: any,
-  nextLabel?: string,
-  icon?: string,
-  color?: string,
-  extraButtons?: any,
+    content: any,
+    nextLabel?: string,
+    icon?: string,
+    color?: string,
+    extraButtons?: any,
   }) => {
     return (
       <Segment.Group>
@@ -247,7 +247,7 @@ class NUXTour extends React.Component<Props> {
             <div>
               <p>
                 Let's keep going. The CSS selector for Author is{' '}
-                <code>.entry-author</code>
+                <code>.entry-authors-social .author</code>
               </p>
             </div>
           ),
@@ -442,7 +442,10 @@ class NUXTour extends React.Component<Props> {
             if (firstRule != null) {
               const property = firstRule.properties.get('author.name');
               if (property != null) {
-                const field = property.set('selector', '.entry-author');
+                const field = property.set(
+                  'selector',
+                  '.entry-authors-social .author'
+                );
                 RuleActions.editField(field);
                 EditorActions.focusField(field);
               }

diff --git a/src/js/injected.js b/src/js/injected.js
@@ -7,6 +7,8 @@
  *
  * @flow
  */
-
-require('@babel/register');
+const path = require('path');
+require('@babel/register')({
+  root: path.resolve(__dirname, '..', '..'),
+});
 require('./webview/webview.js');
diff --git a/src/js/version.js b/src/js/version.js
@@ -10,4 +10,4 @@
 
 // This is the Instant Articles Builder version constant.
 // Bump this version when releasing.
-export const version = '0.2.0';
+export const version = '0.2.2';