Merge 3.3.0 to Master

README.md

@@ -1,12 +1,8 @@
 # Create React WP Theme <!-- omit in toc -->
 
-Dec. 15, 2019
+Dec. 24, 2019
 <br />
-[v3.3.0](https://github.com/facebook/create-react-app/releases/tag/v3.3.0) of [Create React App](https://create-react-app.dev/) was released. It's a major change and it's going take me another week to make the changes to `create-react-wptheme`.
-
-But don't let that stop you from creating a new theme now, as updating your theme is quite painless (see [Updating Existing Themes](#updating-existing-themes)) below.
-
-The current release of `create-react-wptheme` is based on [v3.2.0](https://github.com/facebook/create-react-app/releases/tag/v3.2.0) of [Create React App](https://create-react-app.dev/).
+Updated to use [Create React App](https://create-react-app.dev/) version [3.3.0](https://github.com/facebook/create-react-app/releases/tag/v3.3.0).
 
 ---
 

lerna.json

@@ -0,0 +1,6 @@
+{
+  "packages": [
+    "packages/*"
+  ],
+  "version": "0.0.0"
+}

package.json

@@ -1,54 +1,7 @@
 {
-    "name": "@devloco/create-react-wptheme",
-    "version": "3.2.0-wp.6",
-    "description": "Create React WP themes with no build configuration.",
-    "main": "index.js",
-    "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/devloco/create-react-wptheme.git"
-    },
-    "keywords": [
-        "wordpress",
-        "create-react-app",
-        "wordpress-theme",
-        "wordpress-development",
-        "wordpress-starter-theme",
-        "wordpress-api",
-        "reactjs",
-        "react",
-        "react-theme",
-        "wordpress-server",
-        "react-tutorial",
-        "react-wordpress-themes",
-        "php"
-    ],
-    "author": "devloco",
-    "license": "MIT",
-    "engines": {
-        "node": ">=8"
-    },
-    "bugs": {
-        "url": "https://github.com/devloco/create-react-wptheme/issues"
-    },
-    "files": [
-        "index.js",
-        "createReactWpTheme.js"
-    ],
-    "homepage": "https://github.com/devloco/create-react-wptheme#readme",
-    "bin": {
-        "create-react-wptheme": "./index.js"
-    },
-    "dependencies": {
-        "chalk": "2.4.2",
-        "commander": "2.20.0",
-        "cross-spawn": "6.0.5",
-        "envinfo": "7.3.1",
-        "fs-extra": "7.0.1",
-        "semver": "6.3.0",
-        "tmp": "0.0.33",
-        "validate-npm-package-name": "3.0.0"
+    "name": "root",
+    "private": true,
+    "devDependencies": {
+        "lerna": "^3.19.0"
     }
 }

packages/cra-template-wptheme-typescript/README.md

@@ -0,0 +1,11 @@
+# cra-template-wptheme-typescript
+
+This is the official TypeScript template for [Create React WPTheme](https://github.com/devloco/create-react-wptheme).
+
+To use this template, add `--template typescript` when creating a new wp theme.
+
+For example:
+
+```sh
+npx create-react-wptheme my-theme --template typescript
+```

packages/cra-template-wptheme-typescript/package.json

@@ -0,0 +1,38 @@
+{
+    "name": "cra-template-wptheme-typescript",
+    "version": "3.3.0-wp.1",
+    "keywords": [
+        "wordpress",
+        "create-react-app",
+        "wordpress-theme",
+        "wordpress-development",
+        "wordpress-starter-theme",
+        "wordpress-api",
+        "reactjs",
+        "react",
+        "react-theme",
+        "wordpress-server",
+        "react-tutorial",
+        "react-wordpress-themes",
+        "php",
+        "typescript",
+        "template"
+    ],
+    "description": "The TypeScript template for Create React WPTheme.",
+    "main": "template.json",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/devloco/create-react-wptheme.git"
+    },
+    "license": "MIT",
+    "engines": {
+        "node": ">=8"
+    },
+    "bugs": {
+        "url": "https://github.com/devloco/create-react-wptheme/issues"
+    },
+    "files": [
+        "template",
+        "template.json"
+    ]
+}

packages/cra-template-wptheme-typescript/template.json

@@ -0,0 +1,8 @@
+{
+    "dependencies": {
+        "@types/node": "^12.0.0",
+        "@types/react": "^16.9.0",
+        "@types/react-dom": "^16.9.0",
+        "typescript": "~3.7.2"
+    }
+}

packages/cra-template-wptheme-typescript/template/README.md

@@ -0,0 +1,44 @@
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.<br />
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+
+The page will reload if you make edits.<br />
+You will also see any lint errors in the console.
+
+### `npm test`
+
+Launches the test runner in the interactive watch mode.<br />
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `npm run build`
+
+Builds the app for production to the `build` folder.<br />
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.<br />
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm run eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).

packages/cra-template-wptheme-typescript/template/gitignore

@@ -0,0 +1,23 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

packages/cra-template-wptheme-typescript/template/public/index.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="Web site created using create-react-app"
+    />
+    <link rel="apple-touch-icon" href="logo192.png" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>React App</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>

packages/cra-template-wptheme-typescript/template/public/index.php

@@ -0,0 +1,37 @@
+<?php
+  $_reactSrc = realpath(__DIR__) . "/react-src";
+  $_publicPath = $_reactSrc . "/public";
+  $_postInstallerPath = $_publicPath . "/post_installer.php";
+
+  if (file_exists($_postInstallerPath)) {
+    // read the package.json file
+    $packagePath = $_reactSrc . "/package.json";
+    $json = json_decode(file_get_contents($packagePath), true);
+
+    // set the "homepage" correctly in the JSON
+    // this ensures all WebPack produced links will work
+    $templatePath = get_template_directory_uri();
+    $templatePath = parse_url($templatePath, PHP_URL_PATH);
+    $json["homepage"] = $templatePath;
+    // set browserLaunchTo to the site's root
+    $json["browserLaunchTo"] = site_url();
+
+    // rewrite the package.json file with the new value for "homepage"
+    $fp = fopen($packagePath, "w");
+    fwrite($fp, json_encode($json, JSON_PRETTY_PRINT));
+    fclose($fp);
+
+    // delete the current index.php page (which is this page you are currently reading)
+    unlink($_publicPath . "/index.php");
+    // rename the "post_installer.php" to make it the new index.php file
+    rename($_postInstallerPath, $_publicPath . "/index.php");
+  }
+?>
+
+Now, back in your command prompt, rerun the "start" script again...
+
+<script>
+  setTimeout(function() {
+    window.location.replace(window.location);
+  }, 3000);
+</script>

packages/cra-template-wptheme-typescript/template/public/manifest.json

@@ -0,0 +1,25 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    },
+    {
+      "src": "logo192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "logo512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

packages/cra-template-wptheme-typescript/template/public/post_installer.php

@@ -0,0 +1,52 @@
+<?php
+  $TEMPLATE_PATH = parse_url(get_template_directory_uri(), PHP_URL_PATH);
+?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" />
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="Web site created using create-react-wptheme"
+    />
+    <link rel="apple-touch-icon" href="<?php echo $TEMPLATE_PATH; ?>/logo192.png" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="<?php echo $TEMPLATE_PATH; ?>/manifest.json" />
+    <!--
+        If you're reading this from "view source" in your browser, it might not make sense as
+        these tokens have already been evaluated and replaced, even in this remark blurb.
+
+        Notice the use of "php echo $TEMPLATE_PATH;" and %PUBLIC_URL% in the tags above.
+        Both will be replaced with the URL of the `public` folder during the build (%PUBLIC_URL%) or
+        at render time (php echo $TEMPLATE_PATH;)
+        Only files inside the `public` folder can be referenced like this.
+
+        Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+        work correctly both with client-side routing and a non-root public URL.
+        Learn how to configure a non-root public URL by running `npm run wpbuild`.
+    -->
+    <title>React WordPress Theme</title>
+</head>
+    <body>
+    <noscript>
+        You need to enable JavaScript to run this app.
+    </noscript>
+    <div id="root"></div>
+    <!--
+        This PHP file is a template.
+        If you open it directly in the browser, you will see an empty page.
+
+        You can add webfonts, meta tags, or analytics to this file.
+        The build step will place the bundled scripts into the <body> tag.
+
+        To begin the development, run `npm run wpstart` or `yarn wpstart`.
+        To create a production bundle, use `npm run wpbuild` or `yarn wpbuild`.
+    -->
+    </body>
+</html>

packages/cra-template-wptheme-typescript/template/public/robots.txt

@@ -0,0 +1,2 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *

packages/cra-template-wptheme-typescript/template/public/style.css

@@ -0,0 +1,13 @@
+/*
+Theme Name: REPLACE_WITH_THEME_NAME
+Author: your-name
+Author URI: https://github.com/your-github
+Description: Create React WP Themes with no build configuration
+Version: 0.1
+License: GNU General Public License v2 or later
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
+Tags: starter
+Text Domain: your-domain
+
+This theme, like WordPress, is licensed under the GPL.
+*/