@startupjs/bundler 0.60.0-canary.9 → 0.61.2

package/lib/mdxLoader.js

@@ -1,10 +1,15 @@
 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: '@startupjs/mdx/useMDXComponents',
+      providerImportSource: getMDXComponentsImport(),
       remarkPlugins: [remarkGfm],
       jsx: true
     }).value
@@ -16,3 +21,22 @@ module.exports = function getMDXLoader (source) {
   }
   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-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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startupjs/bundler",
-  "version": "0.60.0-canary.9",
+  "version": "0.61.2",
   "description": "Opinionated scripts and configs to develop a react-native-web project",
   "main": "index.js",
   "publishConfig": {
@@ -18,13 +18,13 @@
     "@babel/core": "^7.9.0",
     "@babel/plugin-syntax-jsx": "^7.0.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",
+    "@startupjs/babel-plugin-eliminator": "^0.61.0",
+    "@startupjs/babel-plugin-startupjs-plugins": "^0.61.0",
+    "@startupjs/server": "^0.61.0",
     "@svgr/core": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
     "@svgr/plugin-svgo": "^8.1.0",
-    "babel-preset-startupjs": "^0.60.0-canary.9",
+    "babel-preset-startupjs": "^0.61.2",
     "connect": "^3.7.0",
     "lodash": "^4.17.20",
     "remark-gfm": "4.0.1"
@@ -33,5 +33,5 @@
     "cssxjs": "*",
     "react-native-svg": "*"
   },
-  "gitHead": "d314ca5e6c7b96f6692fb0eb31990eebab31566f"
+  "gitHead": "00533aa32f235351daadab676a87ca9db0252cbd"
 }

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
-}