Support v2 content

next.config.js

@@ -14,13 +14,15 @@ const config = withTypescript({
   },
   env: {
     productionLocale: process.env.PRODUCTION_LOCALE,
+    productionContentVersion: process.env.PRODUCTION_CONTENT_VERSION,
     isDevelopment: process.env.IS_DEVELOPMENT
   },
   // For locale, if running 2 servers (JP and EN) locally, if you use build-time config
   // (env instead of publicRuntimeConfig) then the config overlaps in both servers.
   // So must use publicRuntimeConfig instead.
   publicRuntimeConfig: {
-    devLocale: process.env.DEV_LOCALE
+    devLocale: process.env.DEV_LOCALE,
+    devContentVersion: process.env.DEV_CONTENT_VERSION
   },
   exportPathMap(defaultPathMap, { dev, outDir }) {
     if (!dev) {

package.json

@@ -18,22 +18,21 @@
   "scripts": {
     "jp": "IS_DEVELOPMENT=true DEV_LOCALE=jp next -p 9991",
     "en": "IS_DEVELOPMENT=true DEV_LOCALE=en next -p 9990",
+    "jp:v2": "IS_DEVELOPMENT=true DEV_LOCALE=jp DEV_CONTENT_VERSION=v2 next -p 9992",
     "jp:hide-cards": "DEV_LOCALE=jp next -p 9991",
     "en:hide-cards": "DEV_LOCALE=en next -p 9990",
-    "dev": "rm -rf .next && concurrently \"yarn jp\" \"yarn en\" \"yarn contents:watch\" \"yarn twemoji:watch\"",
-    "dev:hide-cards": "rm -rf .next && concurrently \"yarn jp:hide-cards\" \"yarn en:hide-cards\" \"yarn contents:watch\" \"yarn twemoji:watch\"",
+    "dev": "rm -rf .next && concurrently \"yarn jp\" \"yarn jp:v2\" \"yarn en\" \"yarn twemoji:watch\"",
+    "dev:hide-cards": "rm -rf .next && concurrently \"yarn jp:hide-cards\" \"yarn en:hide-cards\" \"yarn twemoji:watch\"",
     "ts-node": "ts-node --project tsconfig.scripts.json",
     "ts-node:add-paths-no-watch": "yarn ts-node -r tsconfig-paths/register",
-    "contents": "yarn ts-node ./scripts/generateContentsBundle.ts",
     "sitemap": "yarn ts-node:add-paths-no-watch ./scripts/generateSitemap.ts",
-    "contents:watch": "yarn ts-node ./scripts/generateContentsBundle.ts watch",
     "precompute": "yarn ts-node:add-paths-no-watch ./scripts/precomputeExpressionContainers.ts",
     "tsc": "tsc",
     "eslint": "eslint --ext .js,.ts,.tsx .",
     "eslint:fix": "eslint --ext .js,.ts,.tsx --fix .",
     "build:en": "yarn tsc && yarn eslint && PRODUCTION_LOCALE=en yarn sitemap && PRODUCTION_LOCALE=en next build && PRODUCTION_LOCALE=en next export",
     "build:jp": "yarn tsc && yarn eslint && PRODUCTION_LOCALE=jp yarn sitemap && PRODUCTION_LOCALE=jp next build && PRODUCTION_LOCALE=jp next export",
-    "twemoji": "mkdir -p .twemoji && rm -f src/components/Twemoji/* && rm -f .twemoji/* && cp `yarn ts-node ./scripts/copyUsedEmojis.ts` .twemoji && svgr --ext tsx --no-svgo --filename-case kebab --no-dimensions -d src/components/Twemoji .twemoji && eslint --ext .tsx --fix src/components/Twemoji && yarn twemoji:bundle",
+    "twemoji": "mkdir -p .twemoji && rm -f src/components/Twemoji/* && rm -f .twemoji/* && cp `yarn --silent ts-node ./scripts/copyUsedEmojis.ts` .twemoji && svgr --ext tsx --no-svgo --filename-case kebab --no-dimensions -d src/components/Twemoji .twemoji && eslint --ext .tsx --fix src/components/Twemoji && yarn twemoji:bundle",
     "twemoji:bundle": "yarn ts-node ./scripts/generateEmojisBundle.ts",
     "twemoji:watch": "yarn ts-node ./scripts/generateEmojisBundle.ts watch",
     "type-check": "tsc -w",

scripts/copyUsedEmojis.ts

@@ -104,7 +104,8 @@ const allUsedEmojis = uniq<string>([
   '📼',
   '🔠',
   '🐍',
-  '💡'
+  '💡',
+  '🎁'
 ])
 
 // Copied from Twemoji

src/components/Twemoji/1f381.tsx

@@ -0,0 +1,25 @@
+import * as React from 'react'
+
+const Svg1F381 = (props: React.SVGProps<SVGSVGElement>) => (
+  <svg viewBox="0 0 36 36" {...props}>
+    <path
+      fill="#FDD888"
+      d="M33 31c0 2.2-1.8 4-4 4H7c-2.2 0-4-1.8-4-4V14c0-2.2 1.8-4 4-4h22c2.2 0 4 1.8 4 4v17z"
+    />
+    <path
+      fill="#FDD888"
+      d="M36 11c0 2.2-1.8 4-4 4H4c-2.2 0-4-1.8-4-4s1.8-4 4-4h28c2.2 0 4 1.8 4 4z"
+    />
+    <path fill="#FCAB40" d="M3 15h30v2H3z" />
+    <path
+      fill="#DA2F47"
+      d="M19 3h-2c-1.657 0-3 1.343-3 3v29h8V6c0-1.656-1.343-3-3-3z"
+    />
+    <path
+      fill="#DA2F47"
+      d="M16 7c1.1 0 1.263-.516.361-1.147L9.639 1.147c-.902-.631-2.085-.366-2.631.589L4.992 5.264C4.446 6.219 4.9 7 6 7h10zm4 0c-1.1 0-1.263-.516-.361-1.147l6.723-4.706c.901-.631 2.085-.366 2.631.589l2.016 3.527C31.554 6.219 31.1 7 30 7H20z"
+    />
+  </svg>
+)
+
+export default Svg1F381