startupjs 0.40.15 → 0.41.2

package/index.d.ts

@@ -4,5 +4,6 @@ export * from '@startupjs/hooks'
 //        on the server and on the client
 export * from '@startupjs/isomorphic-helpers'
 // dummy babel macro functions for @startupjs/babel-plugin-rn-stylename-inline
-export function css (): void
-export function styl (): void
+export function css (css: TemplateStringsArray): any
+export function styl (styl: TemplateStringsArray): any
+export function pug (pug: TemplateStringsArray): any

package/index.js

@@ -4,6 +4,8 @@ export * from '@startupjs/hooks'
 //        on the server and on the client
 export * from '@startupjs/isomorphic-helpers'
 // dummy babel macro functions for @startupjs/babel-plugin-rn-stylename-inline
-export function css () {}
-export function styl () {}
+export function css (cssString) { return cssString }
+export function styl (stylString) { return stylString }
+// dummy pug function (it gets compiled to jsx by babel pug plugin)
+export function pug (pugString) { return pugString }
 export { default as t } from '@startupjs/i18n/client/t.js'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "startupjs",
   "type": "module",
-  "version": "0.40.15",
+  "version": "0.41.2",
   "engines": {
     "node": ">= 14"
   },
@@ -10,20 +10,20 @@
   "bin": "./cli.js",
   "license": "MIT",
   "dependencies": {
-    "@startupjs/app": "^0.40.9",
-    "@startupjs/backend": "^0.40.6",
-    "@startupjs/bundler": "^0.40.9",
-    "@startupjs/cli": "^0.40.15",
-    "@startupjs/hooks": "^0.40.2",
-    "@startupjs/i18n": "^0.40.0",
-    "@startupjs/init": "^0.40.2",
-    "@startupjs/isomorphic-helpers": "^0.40.0",
-    "@startupjs/orm": "^0.40.0",
-    "@startupjs/patches": "^0.40.0",
-    "@startupjs/react-sharedb": "^0.40.2",
-    "@startupjs/server": "^0.40.15",
-    "babel-preset-startupjs": "^0.40.9",
+    "@startupjs/app": "^0.41.2",
+    "@startupjs/backend": "^0.41.2",
+    "@startupjs/bundler": "^0.41.2",
+    "@startupjs/cli": "^0.41.2",
+    "@startupjs/hooks": "^0.41.2",
+    "@startupjs/i18n": "^0.41.2",
+    "@startupjs/init": "^0.41.2",
+    "@startupjs/isomorphic-helpers": "^0.41.2",
+    "@startupjs/orm": "^0.41.2",
+    "@startupjs/patches": "^0.41.2",
+    "@startupjs/react-sharedb": "^0.41.2",
+    "@startupjs/server": "^0.41.2",
+    "babel-preset-startupjs": "^0.41.2",
     "react-native-web": "^0.14.3"
   },
-  "gitHead": "39bf6b32f295a12394989edddc2a5972779b2fcf"
+  "gitHead": "521a4e72e2630b1fb71b246b2cc7b375c4c68792"
 }

package/templates/routing/Root/index.jsx

@@ -2,7 +2,7 @@ import React from 'react'
 import { Platform } from 'react-native'
 import init from 'startupjs/init'
 import App from 'startupjs/app'
-import { observer, model } from 'startupjs'
+import { pug, observer, model } from 'startupjs'
 import { BASE_URL } from '@env'
 import orm from '../model'
 

package/templates/routing/main/Layout/index.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { View, TouchableOpacity, Text } from 'react-native'
-import { observer, emit } from 'startupjs'
+import { pug, observer, emit } from 'startupjs'
 import './index.styl'
 
 export default observer(function ({ children }) {

package/templates/routing/main/pages/PAbout/index.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Text, ScrollView } from 'react-native'
-import { observer } from 'startupjs'
+import { pug, observer } from 'startupjs'
 import './index.styl'
 
 export default observer(function PAbout () {

package/templates/routing/main/pages/PHome/index.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { ScrollView } from 'react-native'
-import { observer } from 'startupjs'
+import { pug, observer } from 'startupjs'
 import { TestComponent } from 'components'
 import './index.styl'
 

package/templates/simple/.eslintrc.json

@@ -15,7 +15,7 @@
     "Atomics": "readonly",
     "SharedArrayBuffer": "readonly"
   },
-  "parser": "babel-eslint",
+  "parser": "@babel/eslint-parser",
   "parserOptions": {
     "ecmaFeatures": {
       "legacyDecorators": true,

package/templates/simple/Dockerfile

@@ -15,7 +15,7 @@ RUN \
   # optionally use a custom npm token (if defined above)
   echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc && \
   # install build tools
-  apk add --no-cache make gcc g++ python git && \
+  apk add --no-cache make gcc g++ python3 git && \
   # ffmpeg is required at runtime for video & audio conversion libraries
   apk add --no-cache ffmpeg && \
   # install dependencies
@@ -25,7 +25,7 @@ RUN \
   # cleanup yarn
   yarn cache clean && \
   # cleanup build tools
-  apk del make gcc g++ python git
+  apk del make gcc g++ python3 git
 
 CMD yarn start-production
 

package/templates/simple/Root/index.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Platform } from 'react-native'
-import { observer, model } from 'startupjs'
+import { pug, observer, model } from 'startupjs'
 import init from 'startupjs/init'
 import { BASE_URL } from '@env'
 import { TestComponent } from 'components'

package/templates/simple/components/TestComponent/index.jsx

@@ -5,6 +5,7 @@ import {
   TouchableOpacity
 } from 'react-native'
 import {
+  pug,
   observer,
   useDoc,
   useApi

package/templates/simple/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "allowJs": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "isolatedModules": true,
+    "jsx": "react",
+    "lib": ["es6"],
+    "moduleResolution": "node",
+    "noEmit": true,
+    "strict": false,
+    "target": "esnext"
+  },
+  "exclude": [
+    "node_modules",
+    "babel.config.js",
+    "metro.config.js",
+    "jest.config.js"
+  ]
+}

package/templates/ui/Root/index.jsx

@@ -2,7 +2,7 @@ import React from 'react'
 import { Platform } from 'react-native'
 import init from 'startupjs/init'
 import App from 'startupjs/app'
-import { observer, model } from 'startupjs'
+import { pug, observer, model } from 'startupjs'
 import { registerPlugins } from 'startupjs/plugin'
 import { uiAppPlugin } from '@startupjs/ui'
 import { BASE_URL } from '@env'

package/templates/ui/components/TestComponent/index.jsx

@@ -1,9 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import {
-  observer,
-  useApi,
-  useDoc
-} from 'startupjs'
+import { pug, observer, useApi, useDoc } from 'startupjs'
 import { Br, Button, Card, Div, Row, Span } from '@startupjs/ui'
 import axios from 'axios'
 import { faPlus, faMinus } from '@fortawesome/free-solid-svg-icons'

package/templates/ui/main/Layout/index.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { observer, emit, useValue, useLocal } from 'startupjs'
+import { pug, observer, emit, useValue, useLocal } from 'startupjs'
 import { Button, Div, H1, Layout, Menu, Row, SmartSidebar } from '@startupjs/ui'
 import { faBars } from '@fortawesome/free-solid-svg-icons'
 import APP from '../../app.json'

package/templates/ui/main/pages/PAbout/index.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Text, ScrollView } from 'react-native'
-import { observer } from 'startupjs'
+import { pug, observer } from 'startupjs'
 import { Content } from '@startupjs/ui'
 import './index.styl'
 

package/templates/ui/main/pages/PHome/index.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { ScrollView } from 'react-native'
-import { observer } from 'startupjs'
+import { pug, observer } from 'startupjs'
 import { Content } from '@startupjs/ui'
 import { TestComponent } from 'components'
 import './index.styl'

package/templates/ui/.eslintrc.json

@@ -1,60 +0,0 @@
-{
-  "root": true,
-  "env": {
-    "browser": true,
-    "es6": true,
-    "node": true,
-    "mocha": true
-  },
-  "extends": [
-    "standard",
-    "standard-react",
-    "plugin:react-pug/all"
-  ],
-  "globals": {
-    "Atomics": "readonly",
-    "SharedArrayBuffer": "readonly"
-  },
-  "parser": "babel-eslint",
-  "parserOptions": {
-    "ecmaFeatures": {
-      "legacyDecorators": true,
-      "jsx": true
-    },
-    "ecmaVersion": 10,
-    "sourceType": "module"
-  },
-  "plugins": [
-    "react",
-    "react-pug",
-    "eslint-plugin-import-helpers"
-  ],
-  "rules": {
-    "prefer-const": "off",
-    "react/jsx-handler-names": "off",
-    "react/prop-types": "off",
-    "react-pug/empty-lines": "off",
-    "react-pug/no-interpolation": "off",
-    "react-pug/prop-types": "off",
-    "react-pug/quotes": "off",
-    "import-helpers/order-imports": [
-      "warn",
-      {
-        "newlinesBetween": "ignore",
-        "groups": [
-          "/^react$/",
-          "/react-native/",
-          "/^react.*/",
-          "/^startupjs/",
-          "/^@?startupjs.*/",
-          "/^@?dmapper.*/",
-          "module",
-          "/components/",
-          ["/helpers/", "/hooks/"],
-          ["sibling", "parent"],
-          "/.\/index.styl/"
-        ]
-      }
-    ]
-  }
-}