startupjs 0.55.0-alpha.9 → 0.55.0

package/app/server.js

@@ -1 +1 @@
-export * from '@startupjs/app/server'
+export * from '@startupjs/app/server/index.js'

package/backend.js

@@ -1 +1,2 @@
 export { default } from '@startupjs/backend'
+export * from '@startupjs/backend'

package/bundler/helpers.js

@@ -0,0 +1 @@
+export * from '@startupjs/bundler/helpers.js'

package/cli.js

@@ -10,4 +10,4 @@ const __dirname = dirname(__filename)
 
 const templatesPath = path.join(__dirname, 'templates')
 
-cli.run({ templatesPath: templatesPath })
+cli.run({ templatesPath })

package/i18n/model.js

@@ -1 +1 @@
-export { default } from '@startupjs/i18n/model'
+export { default } from '@startupjs/i18n/model/index.js'

package/i18n/server.js

@@ -1 +1 @@
-export * from '@startupjs/i18n/server'
+export * from '@startupjs/i18n/server/index.js'

package/init/server.js

@@ -0,0 +1 @@
+export { default } from '@startupjs/init/server.js'

package/nconf.js

@@ -1 +1 @@
-export { default } from '@startupjs/server/nconf'
+export { default } from '@startupjs/server/nconf.js'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "startupjs",
   "type": "module",
-  "version": "0.55.0-alpha.9",
+  "version": "0.55.0",
   "engines": {
     "node": ">= 14"
   },
@@ -10,21 +10,21 @@
   "bin": "./cli.js",
   "license": "MIT",
   "dependencies": {
-    "@startupjs/app": "^0.55.0-alpha.1",
-    "@startupjs/backend": "^0.55.0-alpha.1",
-    "@startupjs/bundler": "^0.55.0-alpha.1",
-    "@startupjs/cli": "^0.55.0-alpha.9",
+    "@startupjs/app": "^0.55.0",
+    "@startupjs/backend": "^0.55.0",
+    "@startupjs/bundler": "^0.55.0",
+    "@startupjs/cli": "^0.55.0",
     "@startupjs/docker": "^0.54.0",
-    "@startupjs/hooks": "^0.55.0-alpha.1",
-    "@startupjs/i18n": "^0.55.0-alpha.1",
-    "@startupjs/init": "^0.55.0-alpha.1",
-    "@startupjs/isomorphic-helpers": "^0.55.0-alpha.1",
-    "@startupjs/orm": "^0.55.0-alpha.1",
-    "@startupjs/patches": "^0.55.0-alpha.1",
-    "@startupjs/react-sharedb": "^0.55.0-alpha.1",
-    "@startupjs/server": "^0.55.0-alpha.1",
-    "babel-preset-startupjs": "^0.55.0-alpha.1",
+    "@startupjs/hooks": "^0.55.0",
+    "@startupjs/i18n": "^0.55.0",
+    "@startupjs/init": "^0.55.0",
+    "@startupjs/isomorphic-helpers": "^0.55.0",
+    "@startupjs/orm": "^0.55.0",
+    "@startupjs/patches": "^0.55.0",
+    "@startupjs/react-sharedb": "^0.55.0",
+    "@startupjs/server": "^0.55.0",
+    "babel-preset-startupjs": "^0.55.0",
     "react-native-web": "^0.18.0"
   },
-  "gitHead": "2c8a2d6d1f32741c62c5d4e85edc7c599d07dad7"
+  "gitHead": "96bd7446a242b5c096b03a25a99e8a1fae3bb9a7"
 }

package/server.js

@@ -1 +1,2 @@
 export { default } from '@startupjs/server'
+export * from '@startupjs/server'

package/startupjs.config.cjs

@@ -7,14 +7,6 @@ module.exports = {
         'startupjs/i18n',
         'startupjs/init',
         'startupjs/plugin'
-      ],
-      server: [
-        'startupjs/app',
-        'startupjs/i18n',
-        'startupjs/init',
-        'startupjs/nconf',
-        'startupjs/orm',
-        'startupjs/server'
       ]
     }
   }

package/templates/routing/server/index.js

@@ -1,8 +1,8 @@
-import init from 'startupjs/init'
-import startupjsServer from 'startupjs/server'
-import { initApp } from 'startupjs/app/server'
-import orm from '../model'
-import api from './api'
+import init from 'startupjs/init/server.js'
+import startupjsServer from 'startupjs/server.js'
+import { initApp } from 'startupjs/app/server.js'
+import orm from '../model/index.js'
+import api from './api/index.js'
 
 // Init startupjs ORM.
 init({ orm })

package/templates/simple/.eslintrc.json

@@ -3,39 +3,34 @@
   "env": {
     "browser": true,
     "es6": true,
-    "node": true,
-    "mocha": true
+    "node": true
   },
   "extends": [
     "standard",
     "standard-react",
-    "plugin:react-pug/all"
+    "plugin:react/recommended",
+    "plugin:react-pug/all",
+    "plugin:wdio/recommended"
   ],
   "globals": {
     "Atomics": "readonly",
     "SharedArrayBuffer": "readonly"
   },
-  "parser": "@babel/eslint-parser",
   "parserOptions": {
     "ecmaFeatures": {
-      "legacyDecorators": true,
-      "jsx": true
+      "legacyDecorators": true
     },
-    "ecmaVersion": 10,
-    "sourceType": "module",
-    "babelOptions": {
-      "parserOpts": {
-        "plugins": ["jsx"]
-      }
-    }
+    "ecmaVersion": "latest",
+    "sourceType": "module"
   },
   "plugins": [
     "react",
     "react-pug",
-    "eslint-plugin-import-helpers"
+    "eslint-plugin-import-helpers",
+    "wdio"
   ],
   "rules": {
-    "prefer-const": "off",
+    "prefer-const": "error",
     "eol-last": "error",
     "react/jsx-handler-names": "off",
     "react/prop-types": "off",
@@ -55,8 +50,8 @@
           "/^@?startupjs.*/",
           "/^@?dmapper.*/",
           "module",
-          "/components/",
-          ["/helpers/", "/hooks/"],
+          "/^components/",
+          ["/^helpers/", "/^hooks/"],
           ["sibling", "parent"],
           "/.\/index.styl/"
         ]

package/templates/simple/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:21.2-alpine
 
 # !!! REQUIRED !!! env vars:
 # - MONGO_URL

package/templates/simple/model/TestThingModel.js

@@ -1,4 +1,4 @@
-import { BaseModel } from 'startupjs/orm'
+import { BaseModel } from 'startupjs/orm.js'
 
 export default class TestThingModel extends BaseModel {
   async addSelf () {

package/templates/simple/model/index.js

@@ -1,4 +1,4 @@
-import TestThing from './TestThingModel'
+import TestThing from './TestThingModel.js'
 
 export default function (racer) {
   racer.orm('testThings.*', TestThing)

package/templates/simple/server/api/index.js

@@ -1,5 +1,5 @@
 import express from 'express'
-import testThing from './testThing'
+import testThing from './testThing.js'
 
 const router = express.Router()
 

package/templates/simple/server/index.js

@@ -1,7 +1,7 @@
-import init from 'startupjs/init'
-import startupjsServer from 'startupjs/server'
-import orm from '../model'
-import api from './api'
+import init from 'startupjs/init/server.js'
+import startupjsServer from 'startupjs/server.js'
+import orm from '../model/index.js'
+import api from './api/index.js'
 
 // Init startupjs ORM.
 init({ orm })

package/templates/simple/tsconfig.json

@@ -14,7 +14,6 @@
   "exclude": [
     "node_modules",
     "babel.config.js",
-    "metro.config.js",
-    "jest.config.js"
+    "metro.config.js"
   ]
 }

package/templates/ui/Root/index.jsx

@@ -3,8 +3,7 @@ import { Platform } from 'react-native'
 import init from 'startupjs/init'
 import App from 'startupjs/app'
 import { pug, observer, model } from 'startupjs'
-import { registerPlugins } from 'startupjs/plugin'
-import { uiAppPlugin } from '@startupjs/ui'
+import { UiProvider } from '@startupjs/ui'
 import { BASE_URL } from '@env'
 import i18n, { useI18nGlobalInit } from '../i18n'
 import orm from '../model'
@@ -20,17 +19,12 @@ if (Platform.OS === 'web') window.model = model
 // Initialization must start before doing any subscribes to data.
 init({ baseUrl: BASE_URL, orm })
 
-registerPlugins({
-  '@startupjs/app': [
-    [uiAppPlugin, { defaultEnabled: true }]
-  ]
-})
-
 export default observer(() => {
   return pug`
-    App(
-      apps={ i18n, main }
-      useGlobalInit=useI18nGlobalInit
-    )
+    UiProvider
+      App(
+        apps={ i18n, main }
+        useGlobalInit=useI18nGlobalInit
+      )
   `
 })

package/templates/ui/model/TestThingModel.js

@@ -1,4 +1,4 @@
-import { BaseModel } from 'startupjs/orm'
+import { BaseModel } from 'startupjs/orm.js'
 
 export default class TestThingModel extends BaseModel {
   async addSelf () {

package/templates/ui/model/index.js

@@ -1,6 +1,6 @@
-import initI18nModel from 'startupjs/i18n/model'
+import initI18nModel from 'startupjs/i18n/model.js'
 
-import TestThing from './TestThingModel'
+import TestThing from './TestThingModel.js'
 
 export default function (racer) {
   initI18nModel(racer)

package/templates/ui/server/index.js

@@ -1,10 +1,10 @@
-import init from 'startupjs/init'
-import startupjsServer from 'startupjs/server'
-import { initApp } from 'startupjs/app/server'
-import { initI18n } from 'startupjs/i18n/server'
-import { getUiHead, initUi } from '@startupjs/ui/server'
-import orm from '../model'
-import api from './api'
+import init from 'startupjs/init/server.js'
+import startupjsServer from 'startupjs/server.js'
+import { initApp } from 'startupjs/app/server.js'
+import { initI18n } from 'startupjs/i18n/server.js'
+import { getUiHead, initUi } from '@startupjs/ui/server/index.js'
+import orm from '../model/index.js'
+import api from './api/index.js'
 
 // Init startupjs ORM.
 init({ orm })

package/bundler/babel.config.cjs

@@ -1 +0,0 @@
-module.exports = require('@startupjs/bundler/babel.config')

package/bundler/helpers.cjs

@@ -1 +0,0 @@
-module.exports = require('@startupjs/bundler/helpers')

package/bundler/react-native.config.cjs

@@ -1 +0,0 @@
-module.exports = require('@startupjs/bundler/react-native.config')

package/bundler/vite.config.cjs

@@ -1 +0,0 @@
-module.exports = require('@startupjs/bundler/vite.config')

package/bundler/webpack.server.config.cjs

@@ -1 +0,0 @@
-module.exports = require('@startupjs/bundler/webpack.server.config')

package/bundler.cjs

@@ -1,39 +0,0 @@
-throw new Error(`
-[startupjs/bundler] ERROR! StartupJS bundler api has changed.
-
-Now instead of using general \`require('startupjs/bundler.cjs')\` you have to require
-a specific file you need.
-
-Here is what you need to change:
-
-1. \`require('startupjs/bundler.cjs').webpackWebConfig\`
-    v v v
-   \`require('startupjs/bundler/webpack.web.config.cjs')\`
-
-2. \`require('startupjs/bundler.cjs').webpackServerConfig\`
-    v v v
-   \`require('startupjs/bundler/webpack.server.config.cjs')\`
-
-3. \`require('startupjs/bundler.cjs').babelConfig\`
-    v v v
-   \`require('startupjs/bundler/babel.config.cjs')\`
-
-4. \`require('startupjs/bundler.cjs').metroConfig\`
-    v v v
-   \`require('startupjs/bundler/metro.config.cjs')\`
-
-5. \`require('startupjs/bundler.cjs').rnConfig\`
-    v v v
-   \`require('startupjs/bundler/react-native.config.cjs')\`
-
-6. \`require('startupjs/bundler.cjs').viteConfig\`
-    v v v
-   \`require('startupjs/bundler/vite.config.cjs')\`
-
-Additionally, if you did override .js/.jsx compilation in your webpack.web.config.cjs, you
-might have used \`getJsxRule\` function there. In which case you should now get it from helpers:
-
-7. \`const { getJsxRule } = require('startupjs/bundler.cjs')\`
-    v v v
-   \`const { getJsxRule } = require('startupjs/bundler/helpers.cjs')\`
-`)

package/templates/simple/react-native.config.js

@@ -1,6 +0,0 @@
-const getConfig = require('startupjs/bundler/react-native.config.cjs')
-
-module.exports = getConfig({
-  project: {},
-  assets: []
-})

package/templates/simple/vite.config.mjs

@@ -1,9 +0,0 @@
-import startupjsPlugin from '@startupjs/vite-plugin-startupjs'
-import { defineConfig } from 'vite'
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [
-    startupjsPlugin()
-  ]
-})

package/templates/simple/webpack.server.config.cjs

@@ -1,6 +0,0 @@
-const getConfig = require('startupjs/bundler/webpack.server.config.cjs')
-
-module.exports = getConfig(undefined, {
-  forceCompileModules: [],
-  alias: {}
-})

package/templates/ui/startupjs.config.cjs

@@ -1,3 +0,0 @@
-module.exports = {
-  // StartupJS configuration and plugins
-}