diff --git a/lerna.json b/lerna.json index 2739b40732..547f5d382e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,21 +1,7 @@ { "version": "2.7.25-alpha.3", "npmClient": "yarn", - "packages": [ - "packages/backend-core", - "packages/bbui", - "packages/builder", - "packages/cli", - "packages/client", - "packages/frontend-core", - "packages/sdk", - "packages/server", - "packages/shared-core", - "packages/string-templates", - "packages/types", - "packages/worker", - "packages/pro/packages/pro" - ], + "packages": ["packages/*"], "useWorkspaces": true, "command": { "publish": { @@ -31,4 +17,4 @@ "loadEnvFiles": false } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 56f015f8c0..d097474309 100644 --- a/package.json +++ b/package.json @@ -95,19 +95,7 @@ }, "workspaces": { "packages": [ - "packages/backend-core", - "packages/bbui", - "packages/builder", - "packages/cli", - "packages/client", - "packages/frontend-core", - "packages/sdk", - "packages/server", - "packages/shared-core", - "packages/string-templates", - "packages/types", - "packages/worker", - "packages/pro/packages/pro" + "packages/*" ] }, "resolutions": { diff --git a/packages/pro b/packages/pro index f4b8449aac..d89fb653d6 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit f4b8449aac9bd265214396afbdce7ff984a2ae34 +Subproject commit d89fb653d6faf2886d580d43bc546d2f09a54989 diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts index a7710d1e33..7458420643 100644 --- a/packages/server/jest.config.ts +++ b/packages/server/jest.config.ts @@ -21,9 +21,8 @@ const baseConfig: Config.InitialProjectOptions = { } // add pro sources if they exist -if (fs.existsSync("../pro/packages")) { - baseConfig.moduleNameMapper!["@budibase/pro"] = - "/../pro/packages/pro/src" +if (fs.existsSync("../pro/src")) { + baseConfig.moduleNameMapper!["@budibase/pro"] = "/../pro" } const config: Config.InitialOptions = { diff --git a/packages/server/nodemon.json b/packages/server/nodemon.json index 77375546e1..47c60d0966 100644 --- a/packages/server/nodemon.json +++ b/packages/server/nodemon.json @@ -1,5 +1,5 @@ { - "watch": ["src", "../backend-core", "../pro/packages/pro"], + "watch": ["src", "../backend-core", "../pro"], "ext": "js,ts,json", "ignore": [ "src/**/*.spec.ts", diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json index 355b7ed6da..4e509bd14e 100644 --- a/packages/server/tsconfig.build.json +++ b/packages/server/tsconfig.build.json @@ -17,7 +17,7 @@ "@budibase/backend-core": ["../backend-core/src"], "@budibase/backend-core/*": ["../backend-core/*"], "@budibase/shared-core": ["../shared-core/src"], - "@budibase/pro": ["../pro/packages/pro/src"] + "@budibase/pro": ["../pro/src"] } }, "include": ["src/**/*"], diff --git a/packages/worker/jest.config.ts b/packages/worker/jest.config.ts index 49b6c5d425..1cbf22c22a 100644 --- a/packages/worker/jest.config.ts +++ b/packages/worker/jest.config.ts @@ -21,11 +21,9 @@ const config: Config.InitialOptions = { } // add pro sources if they exist -if (fs.existsSync("../pro/packages")) { - config.moduleNameMapper!["@budibase/pro/(.*)"] = - "/../pro/packages/pro/$1" - config.moduleNameMapper!["@budibase/pro"] = - "/../pro/packages/pro/src" +if (fs.existsSync("../pro/src")) { + config.moduleNameMapper!["@budibase/pro/(.*)"] = "/../pro/$1" + config.moduleNameMapper!["@budibase/pro"] = "/../pro/src" } export default config diff --git a/packages/worker/nodemon.json b/packages/worker/nodemon.json index d92cfe22b5..9585d85af5 100644 --- a/packages/worker/nodemon.json +++ b/packages/worker/nodemon.json @@ -1,5 +1,5 @@ { - "watch": ["src", "../backend-core", "../pro/packages/pro"], + "watch": ["src", "../backend-core", "../pro"], "ext": "js,ts,json", "ignore": [ "src/**/*.spec.ts", diff --git a/packages/worker/tsconfig.build.json b/packages/worker/tsconfig.build.json index 59e4bf7d8a..bc477abe4d 100644 --- a/packages/worker/tsconfig.build.json +++ b/packages/worker/tsconfig.build.json @@ -16,7 +16,7 @@ "@budibase/backend-core": ["../backend-core/src"], "@budibase/backend-core/*": ["../backend-core/*"], "@budibase/shared-core": ["../shared-core/src"], - "@budibase/pro": ["../pro/packages/pro/src"] + "@budibase/pro": ["../pro/src"] } }, "include": ["src/**/*"], diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 9a0bc18a28..a5a4fc0108 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,4 +1,4 @@ -if [ -d "packages/pro/packages" ]; then +if [ -d "packages/pro/src" ]; then cd packages/pro yarn diff --git a/scripts/link-dependencies.sh b/scripts/link-dependencies.sh index 9b85f9895d..ed42f29b4a 100755 --- a/scripts/link-dependencies.sh +++ b/scripts/link-dependencies.sh @@ -34,7 +34,7 @@ yarn unlink yarn link cd - -if [ -d packages/pro/packages ]; then +if [ -d packages/pro/src ]; then pro_loaded_locally=true else pro_loaded_locally=false @@ -42,7 +42,7 @@ fi if [ $pro_loaded_locally = true ]; then echo "Linking pro" - cd packages/pro/packages/pro + cd packages/pro yarn unlink yarn link cd - diff --git a/scripts/syncProPackage.js b/scripts/syncProPackage.js index bbbe33f44b..5ea49142ee 100755 --- a/scripts/syncProPackage.js +++ b/scripts/syncProPackage.js @@ -3,7 +3,7 @@ const path = require("path") const { execSync } = require("child_process") let version = "0.0.0" -const localPro = fs.existsSync("packages/pro/packages") +const localPro = fs.existsSync("packages/pro/src") if (!localPro) { const branchName = execSync("git rev-parse --abbrev-ref HEAD") .toString() diff --git a/yarn.lock b/yarn.lock index b15c549640..ec4a060f15 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2489,6 +2489,11 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@fontsource/source-sans-pro@^5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/@fontsource/source-sans-pro/-/source-sans-pro-5.0.3.tgz#7d6e84a8169ba12fa5e6ce70757aa2ca7e74d855" + integrity sha512-mQnjuif/37VxwRloHZ+wQdoozd2VPWutbFSt1AuSkk7nFXIBQxHJLw80rgCF/osL0t7N/3Gx1V7UJuOX2zxzhQ== + "@fortawesome/fontawesome-common-types@6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz#51f734e64511dbc3674cd347044d02f4dd26e86b" @@ -8406,7 +8411,7 @@ chmodr@1.2.0: resolved "https://registry.yarnpkg.com/chmodr/-/chmodr-1.2.0.tgz#720e96caa09b7f1cdbb01529b7d0ab6bc5e118b9" integrity sha512-Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA== -chokidar@3.5.3, chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2: +chokidar@3.5.3, chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -11850,7 +11855,7 @@ fast-glob@3.2.7: merge2 "^1.3.0" micromatch "^4.0.4" -fast-glob@^3.0.3: +fast-glob@^3.0.3, fast-glob@^3.2.11: version "3.2.12" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== @@ -13661,6 +13666,11 @@ humanize-ms@^1.2.0, humanize-ms@^1.2.1: dependencies: ms "^2.0.0" +husky@^7.0.1: + version "7.0.4" + resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535" + integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ== + husky@^8.0.3: version "8.0.3" resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184" @@ -25423,6 +25433,16 @@ vite-node@0.29.8: picocolors "^1.0.0" vite "^3.0.0 || ^4.0.0" +vite-plugin-static-copy@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vite-plugin-static-copy/-/vite-plugin-static-copy-0.16.0.tgz#2f65227037f17fc99c0782fd0b344e962935e69e" + integrity sha512-dMVEg5Z2SwYRgQnHZaeokvSKB4p/TOTf65JU4sP3U6ccSBsukqdtDOjpmT+xzTFHAA8WJjcS31RMLjUdWQCBzw== + dependencies: + chokidar "^3.5.3" + fast-glob "^3.2.11" + fs-extra "^11.1.0" + picocolors "^1.0.0" + "vite@^3.0.0 || ^4.0.0": version "4.2.2" resolved "https://registry.yarnpkg.com/vite/-/vite-4.2.2.tgz#014c30e5163844f6e96d7fe18fbb702236516dc6"