@startupjs/bundler 0.56.0-alpha.4 → 0.56.0-alpha.40

package/lib/eliminatorLoader.js

@@ -2,9 +2,9 @@
 const babel = require('@babel/core')
 const { isStartupjsPluginEcosystemFile, CONFIG_FILENAME_REGEX } = require('./utils')
 
-const PLUGIN_KEYS = ['name', 'for']
+const PLUGIN_KEYS = ['name', 'for', 'order', 'enabled']
 const PROJECT_KEYS = ['plugins', 'modules']
-const ALL_ENVS = ['client', 'isomorphic', 'server', 'build']
+const ALL_ENVS = ['features', 'isomorphic', 'client', 'server', 'build']
 const MAGIC_IMPORTS = ['startupjs/registry', '@startupjs/registry']
 
 module.exports = function eliminatorLoader (source) {
@@ -14,7 +14,9 @@ module.exports = function eliminatorLoader (source) {
   if (!(isStartupjsPluginEcosystemFile(filename))) return source
 
   const envs = this.query.envs
-  if (!envs) throw Error("eliminatorLoader: envs not provided (for example ['client', 'isomorphic'])")
+  if (!envs) throw Error("eliminatorLoader: envs not provided (for example ['features', 'isomorphic', 'client'])")
+
+  const useRequireContext = this.query.useRequireContext
 
   let code = source
 
@@ -37,7 +39,7 @@ module.exports = function eliminatorLoader (source) {
       }],
       // traverse "exports" of package.json and all dependencies to find all startupjs plugins
       // and automatically import them in the main startupjs.config.js file
-      require('@startupjs/babel-plugin-startupjs-plugins')
+      [require('@startupjs/babel-plugin-startupjs-plugins'), { useRequireContext }]
     ]
   }).code
 

package/metro-babel-transformer.js

@@ -32,7 +32,10 @@ module.exports.transform = async function startupjsMetroBabelTransform ({
 
   // js transformations
   if (/\.[mc]?[jt]sx?$/.test(filename)) {
-    src = callLoader(eliminatorLoader, src, filename, { envs: ['client', 'isomorphic'] })
+    src = callLoader(eliminatorLoader, src, filename, {
+      envs: ['features', 'isomorphic', 'client'],
+      useRequireContext: true
+    })
   }
   if ((/\.mdx?$/.test(filename) || /\.[mc]?[jt]sx?$/.test(filename)) && /['"](?:startupjs|@env)['"]/.test(src)) {
     src = callLoader(startupjsLoader, src, filename, { platform })

package/metro-config.js

@@ -1,39 +1,75 @@
+const { getFeatures } = require('@startupjs/babel-plugin-startupjs-plugins/loader')
 const connect = require('connect')
+const { readFileSync } = require('fs')
+const { join, resolve } = require('path')
 
 // To pass existing config for modification, pass it as 'upstreamConfig' in options:
 //   config = getDefaultConfig(__dirname, { upstreamConfig })
 exports.getDefaultConfig = function getDefaultConfig (projectRoot, { upstreamConfig } = {}) {
+  let packageJson = {}
+  try {
+    packageJson = JSON.parse(readFileSync(join(projectRoot, 'package.json'), 'utf8'))
+  } catch (err) {}
+  const features = getFeatures(projectRoot)
   upstreamConfig ??= getUpstreamConfig(projectRoot)
   const isExpo = checkIfExpo(upstreamConfig)
-  return {
+
+  const config = {
     ...upstreamConfig,
     transformer: {
       ...upstreamConfig.transformer,
-      babelTransformerPath: require.resolve('./metro-babel-transformer.js')
+      babelTransformerPath: require.resolve('./metro-babel-transformer.js'),
+      unstable_allowRequireContext: true
     },
     resolver: {
       ...upstreamConfig.resolver,
       assetExts: upstreamConfig.resolver.assetExts.filter(ext => ext !== 'svg'),
-      sourceExts: Array.from(new Set([
+      sourceExts: [...new Set([
         ...(isExpo ? ['expo.ts', 'expo.tsx', 'expo.js', 'expo.jsx', 'expo.mjs', 'expo.cjs'] : []),
         ...(upstreamConfig.resolver.sourceExts || []),
         ...['mjs', 'cjs', 'md', 'mdx', 'css', 'styl', 'svg']
-      ])),
+      ])],
       unstable_enablePackageExports: true
-    },
-    server: {
-      ...upstreamConfig.server,
-      // TODO: implement a simple parsing of startupjs.config.js
-      //       to figure out whether we need to load 'server' and 'isomorphic'
-      //       envs or only the 'build' one.
-      //       If $.isomorphic.server is turned off then we don't need the enhanceMiddleware at all
-      enhanceMiddleware: metroMiddleware => {
-        return connect()
-          .use(metroMiddleware)
-          .use(getStartupjsMiddleware())
-      }
     }
   }
+
+  // Add startupjs server middleware
+  if (features.enableServer) addServer(config)
+
+  // Support Yarn's `resolutions` field from doing `yarn link`
+  if (packageJson.resolutions) addYarnLink(config, { packageJson, projectRoot })
+
+  return config
+}
+
+function addServer (config) {
+  config.server ??= {}
+  config.server.enhanceMiddleware = metroMiddleware =>
+    connect()
+      .use(metroMiddleware)
+      .use(getStartupjsMiddleware())
+}
+
+function addYarnLink (config, { packageJson, projectRoot }) {
+  // `yarn link` adds paths with a prefix 'portal:' so we handle only those
+  const linkPaths = Object.values(packageJson.resolutions)
+    .filter(path => path.startsWith('portal:'))
+    .map(path => path.replace(/^portal:/, ''))
+    // paths might be relative to the project root
+    .map(path => resolve(projectRoot, path))
+  if (linkPaths.length === 0) return
+
+  config.watchFolders = [...new Set([
+    ...(config.watchFolders || []),
+    projectRoot,
+    ...linkPaths
+  ])]
+  config.resolver.nodeModulesPaths = [...new Set([
+    ...(config.resolver.nodeModulesPaths || []),
+    // this is supposed to be the default behavior of Metro, but after changing
+    // the watchFolders it stops working for some reason
+    resolve(projectRoot, 'node_modules')
+  ])]
 }
 
 function getUpstreamConfig (projectRoot) {
@@ -69,9 +105,6 @@ function checkIfExpo (upstreamConfig) {
 function getStartupjsMiddleware () {
   const middlewarePromise = (async () => {
     await import('./nodeRegister.mjs')
-    await import('@startupjs/registry/loadStartupjsConfig.auto')
-    const { ROOT_MODULE: MODULE } = await import('@startupjs/registry')
-    if (!MODULE.options.server) return
     const { createMiddleware } = await import('@startupjs/server')
     return (await createMiddleware()).middleware
   })()

package/nodeLoader.mjs

@@ -37,7 +37,7 @@ export async function load (url, context, nextLoad) {
   if (isStartupjsPluginEcosystemFile(url)) {
     const filePath = fileURLToPath(url)
     let source = await readFile(filePath, 'utf8')
-    source = callLoader(eliminatorLoader, source, filePath, { envs: ['server', 'isomorphic'] })
+    source = callLoader(eliminatorLoader, source, filePath, { envs: ['features', 'isomorphic', 'server'] })
     return {
       format: 'module',
       shortCircuit: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startupjs/bundler",
-  "version": "0.56.0-alpha.4",
+  "version": "0.56.0-alpha.40",
   "description": "Opinionated scripts and configs to develop a react-native-web project",
   "main": "index.js",
   "publishConfig": {
@@ -24,12 +24,11 @@
     "@startupjs/babel-plugin-eliminator": "^0.56.0-alpha.1",
     "@startupjs/babel-plugin-react-css-modules": "^6.5.4-1",
     "@startupjs/babel-plugin-react-pug-classnames": "^0.56.0-alpha.0",
-    "@startupjs/babel-plugin-startupjs-plugins": "^0.56.0-alpha.1",
+    "@startupjs/babel-plugin-startupjs-plugins": "^0.56.0-alpha.40",
     "@startupjs/babel-plugin-transform-react-pug": "^7.0.1-0",
     "@startupjs/css-to-react-native-transform": "^1.9.0-2",
     "@startupjs/plugin": "^0.56.0-alpha.0",
-    "@startupjs/registry": "^0.56.0-alpha.2",
-    "@startupjs/server": "^0.56.0-alpha.3",
+    "@startupjs/server": "^0.56.0-alpha.40",
     "@svgr/core": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
     "@svgr/plugin-svgo": "^8.1.0",
@@ -37,7 +36,7 @@
     "assets-webpack-plugin": "^7.1.1",
     "autoprefixer": "^10.4.0",
     "babel-loader": "^8.2.3",
-    "babel-preset-startupjs": "^0.56.0-alpha.4",
+    "babel-preset-startupjs": "^0.56.0-alpha.40",
     "connect": "^3.7.0",
     "css-loader": "^6.5.0",
     "css-minimizer-webpack-plugin": "^5.0.0",
@@ -61,5 +60,5 @@
   "peerDependencies": {
     "react-native-svg": "*"
   },
-  "gitHead": "c0ecc933d28d52cf2e269b390f692ad87216ec23"
+  "gitHead": "5cc104689190f938f95fffefa3563555a2506778"
 }