@startupjs/bundler 0.60.0-canary.2 → 0.60.0-canary.25

package/lib/mdxLoader.js

@@ -0,0 +1,42 @@
+const remarkGfm = require('remark-gfm').default
+const { compileSync } = require('@mdx-js/mdx')
+const { readFileSync } = require('fs')
+const path = require('path')
+
+const OLD_MDX_IMPORT = '@startupjs/mdx/useMDXComponents'
+const MDX_IMPORT = '@startupjs-ui/mdx'
+
+module.exports = function getMDXLoader (source) {
+  try {
+    source = compileSync(source, {
+      providerImportSource: getMDXComponentsImport(),
+      remarkPlugins: [remarkGfm],
+      jsx: true
+    }).value
+  } catch (err) {
+    if (err) {
+      console.log('>> mdx compile error', err)
+      throw err
+    }
+  }
+  return source
+}
+
+let mdxComponentsImport
+// check if the project's package.json has an old @startupjs/ui dependency
+// and use old mdx library in this case for backward compatibility
+function getMDXComponentsImport () {
+  if (mdxComponentsImport) return mdxComponentsImport
+  let hasOldStartupUi = false
+  try {
+    const projectPkgPath = path.join(process.cwd(), 'package.json')
+    const packageJson = readFileSync(projectPkgPath, 'utf8')
+    if (/"@startupjs\/ui"/.test(packageJson)) hasOldStartupUi = true
+  } catch (err) {}
+  if (hasOldStartupUi) {
+    mdxComponentsImport = OLD_MDX_IMPORT
+  } else {
+    mdxComponentsImport = MDX_IMPORT
+  }
+  return mdxComponentsImport
+}

package/metro-babel-transformer.js

@@ -1,7 +1,7 @@
 const stylusToCssLoader = require('cssxjs/loaders/stylusToCssLoader')
 const cssToReactNativeLoader = require('cssxjs/loaders/cssToReactNativeLoader')
 const mdxExamplesLoader = require('./lib/mdxExamplesLoader')
-const getMDXLoader = require('./lib/getMDXLoader')
+const mdxLoader = require('./lib/mdxLoader')
 const callLoader = require('./lib/callLoader')
 const asyncSvgLoader = require('./lib/asyncSvgLoader')
 
@@ -20,7 +20,6 @@ module.exports.transform = async function startupjsMetroBabelTransform ({
   } else if (/\.svg$/.test(filename)) {
     src = await callLoader(asyncSvgLoader, src, filename)
   } else if (/\.mdx?$/.test(filename)) {
-    const mdxLoader = await getMDXLoader()
     src = callLoader(mdxExamplesLoader, src, filename)
     src = callLoader(mdxLoader, src, filename)
   }

package/metro-config.js

@@ -48,7 +48,12 @@ exports.getDefaultConfig = function getDefaultConfig (projectRoot, {
 }
 
 function isBuild () {
-  return process.env.IS_BUILD || process.env.CI || process.env.EAS_BUILD
+  return (
+    process.env.IS_BUILD ||
+    process.env.CI ||
+    process.env.EAS_BUILD ||
+    (process.env.NODE_ENV === 'production' && !process.env.FORCE_SERVER)
+  )
 }
 
 function addServer (config) {
@@ -150,9 +155,15 @@ function getMonorepoRootPackageJson (projectRoot) {
 
 function _checkStartupjsBabel (projectRoot) {
   const babelConfigPath = join(projectRoot, 'babel.config.cjs')
-  if (!existsSync(babelConfigPath)) throw Error(ERRORS.missingBabelConfig)
+  if (!existsSync(babelConfigPath)) {
+    console.error('ERROR:', ERRORS.missingBabelConfig)
+    throw Error(ERRORS.missingBabelConfig)
+  }
   const babelConfig = readFileSync(join(projectRoot, 'babel.config.cjs'), 'utf8')
-  if (!babelConfig.includes('startupjs/babel')) throw Error(ERRORS.noStartupjsBabelPreset)
+  if (!babelConfig.includes('startupjs/babel')) {
+    console.error('ERROR:', ERRORS.noStartupjsBabelPreset)
+    throw Error(ERRORS.noStartupjsBabelPreset)
+  }
 }
 
 const ERRORS = {
@@ -161,14 +172,16 @@ const ERRORS = {
     Please create babel.config.cjs following the instructions from Expo (or pure React Native) documentation,
     and add 'startupjs/babel' as the LAST item in the 'presets' array.
 
-    To ignore this error, you can pass the option 'checkStartupjsBabel: false'
+    To ignore this error (if you want to use a custom babel preset to transform startupjs code),
+    you can pass the option 'checkStartupjsBabel: false'
     when calling 'getDefaultConfig(projectRoot, options)' from 'metro.config.cjs'.
   `,
   noStartupjsBabelPreset: `
     Your babel.config.cjs is missing 'startupjs/babel' preset.
     Please add 'startupjs/babel' as the LAST item in the 'presets' array of your babel.config.cjs.
 
-    To ignore this error, you can pass the option 'checkStartupjsBabel: false'
+    To ignore this error (if you want to use a custom babel preset to transform startupjs code),
+    you can pass the option 'checkStartupjsBabel: false'
     when calling 'getDefaultConfig(projectRoot, options)' from 'metro.config.cjs'.
   `
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startupjs/bundler",
-  "version": "0.60.0-canary.2",
+  "version": "0.60.0-canary.25",
   "description": "Opinionated scripts and configs to develop a react-native-web project",
   "main": "index.js",
   "publishConfig": {
@@ -17,21 +17,21 @@
   "dependencies": {
     "@babel/core": "^7.9.0",
     "@babel/plugin-syntax-jsx": "^7.0.0",
-    "@mdx-js/mdx": "^2.3.0",
-    "@startupjs/babel-plugin-eliminator": "^0.60.0-canary.2",
-    "@startupjs/babel-plugin-startupjs-plugins": "^0.60.0-canary.1",
-    "@startupjs/server": "^0.60.0-canary.0",
+    "@mdx-js/mdx": "^3.0.0",
+    "@startupjs/babel-plugin-eliminator": "^0.60.0-canary.7",
+    "@startupjs/babel-plugin-startupjs-plugins": "^0.60.0-canary.7",
+    "@startupjs/server": "^0.60.0-canary.7",
     "@svgr/core": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
     "@svgr/plugin-svgo": "^8.1.0",
-    "babel-preset-startupjs": "^0.60.0-canary.2",
+    "babel-preset-startupjs": "^0.60.0-canary.18",
     "connect": "^3.7.0",
     "lodash": "^4.17.20",
-    "remark-gfm": "^1.0.0"
+    "remark-gfm": "4.0.1"
   },
   "peerDependencies": {
     "cssxjs": "*",
     "react-native-svg": "*"
   },
-  "gitHead": "cbea3f3fe0689dfca50dcf5ddf9ef67730a680e2"
+  "gitHead": "ba95fc7ae8c34cf70de204049501e47963824e43"
 }

package/lib/getMDXLoader.js

@@ -1,23 +0,0 @@
-const DEFAULT_MDX_RENDERER = `
-import { mdx } from '@mdx-js/react'
-`
-const remarkGfm = require('remark-gfm')
-
-module.exports = async function getMDXLoader () {
-  const mdx = await import('@mdx-js/mdx')
-
-  return (source) => {
-    source = mdx.compileSync(source, {
-      providerImportSource: '@startupjs/mdx/client/MDXProvider/index.js',
-      remarkPlugins: [remarkGfm]
-    })
-    source = DEFAULT_MDX_RENDERER + '\n' + source
-    // To make mdx works, we should remove somehow the \n character child
-    // from the children of MDXContent in the output source.
-    // MDX v2 has made some changes in how it handles newlines and whitespace
-    // compared to MDX v1. In MDX v1 newline are not inclided in the output,
-    // but in MDX v2 it included.
-    // console.log(source)
-    return source
-  }
-}

package/lib/startupjsLoader.js

@@ -1,27 +0,0 @@
-// Only used for React Native
-const babel = require('@babel/core')
-
-module.exports = function startupjsLoader (source) {
-  const filename = this.resourcePath
-  const platform = this.query.platform
-
-  // There is a bug in metro when BABEL_ENV is a string "undefined".
-  // We have to workaround it and use NODE_ENV.
-  const env = (process.env.BABEL_ENV !== 'undefined' && process.env.BABEL_ENV) || process.env.NODE_ENV
-
-  return babel.transformSync(source, {
-    filename,
-    babelrc: false,
-    configFile: false,
-    presets: [
-      [require('babel-preset-startupjs'), {
-        // in Program: state.file.opts.caller.platform when used in metro
-        // when used in metro - state.file.opts.caller.bundler === 'metro'
-        platform,
-        // in Program: state.file.opts.envName when used in metro
-        env
-      }],
-      [require('cssxjs/babel'), { platform }]
-    ]
-  }).code
-}