@startupjs/bundler 0.57.0-canary.59 → 0.57.0-canary.61

package/lib/eliminatorLoader.js

@@ -15,10 +15,11 @@ module.exports = function eliminatorLoader (source) {
   // - remove accessControl() calls
   const clientModel = this.query.clientModel
 
-  // ensure that this loader is only used on plugins, startupjs.config.js and loadStartupjsConfig.js files
+  // ensure that this loader is only used on plugins, startupjs.config.js and loadStartupjsConfig.js files.
+  // Or on the client it should also run in model/*.js files
   if (!(
     isStartupjsPluginEcosystemFile(filename) ||
-    (clientModel && hasOrmImport(source))
+    (clientModel && isModelFile(filename, source))
   )) return source
 
   const envs = this.query.envs
@@ -106,7 +107,7 @@ module.exports = function eliminatorLoader (source) {
                 //   __aggregationHeader({ collection: 'games', name: '$$byGameId' })
                 //
                 functionName: 'aggregation',
-                magicImports: ['@startupjs/orm', 'startupjs/orm'],
+                magicImports: ['startupjs'],
                 requirements: {
                   directNamedExportedAsConst: true
                 },
@@ -138,7 +139,7 @@ module.exports = function eliminatorLoader (source) {
                 //   __aggregationHeader({ collection: 'games', name: 'byGameId' })
                 //
                 functionName: 'aggregation',
-                magicImports: ['@startupjs/orm', 'startupjs/orm'],
+                magicImports: ['startupjs'],
                 requirements: {
                   argumentsAmount: 2
                 },
@@ -150,7 +151,7 @@ module.exports = function eliminatorLoader (source) {
               }, {
                 // remove accessControl() calls (replace with undefined)
                 functionName: 'accessControl',
-                magicImports: ['@startupjs/orm', 'startupjs/orm'],
+                magicImports: ['startupjs'],
                 replaceWith: {
                   remove: true // replace the whole function call with undefined
                 }
@@ -165,6 +166,8 @@ module.exports = function eliminatorLoader (source) {
   return code
 }
 
-function hasOrmImport (code) {
-  return /['"]@?startupjs\/orm['"]/.test(code)
+const MODEL_FILE_REGEX = /(?:^|[.\\/])model[\\/].*\.[mc]?[jt]sx?$/
+const STARTUPJS_REGEX = /['"]startupjs['"]/
+function isModelFile (filename, code) {
+  return MODEL_FILE_REGEX.test(filename) && STARTUPJS_REGEX.test(code)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startupjs/bundler",
-  "version": "0.57.0-canary.59",
+  "version": "0.57.0-canary.61",
   "description": "Opinionated scripts and configs to develop a react-native-web project",
   "main": "index.js",
   "publishConfig": {
@@ -27,7 +27,7 @@
     "@startupjs/babel-plugin-startupjs-plugins": "^0.57.0-canary.0",
     "@startupjs/babel-plugin-transform-react-pug": "^7.0.1-0",
     "@startupjs/css-to-react-native-transform": "^1.9.0-2",
-    "@startupjs/server": "^0.57.0-canary.59",
+    "@startupjs/server": "^0.57.0-canary.61",
     "@svgr/core": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
     "@svgr/plugin-svgo": "^8.1.0",
@@ -35,7 +35,7 @@
     "assets-webpack-plugin": "^7.1.1",
     "autoprefixer": "^10.4.0",
     "babel-loader": "^8.2.3",
-    "babel-preset-startupjs": "^0.57.0-canary.59",
+    "babel-preset-startupjs": "^0.57.0-canary.61",
     "connect": "^3.7.0",
     "css-loader": "^6.5.0",
     "css-minimizer-webpack-plugin": "^5.0.0",
@@ -59,5 +59,5 @@
   "peerDependencies": {
     "react-native-svg": "*"
   },
-  "gitHead": "06ffc4bcb7f89cb64ff554ccbbde2a8c102de3a2"
+  "gitHead": "2bf998486cadc27fbc371bb264c49680aa1c3b22"
 }