changes from node_modules to using rollup-plugin-alias, fixes tests

packages/builder/package.json

@@ -20,7 +20,9 @@
     "testURL": "http://jest-breaks-if-this-does-not-exist",
     "moduleNameMapper": {
       "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/internals/mocks/fileMock.js",
-      "\\.(css|less|sass|scss)$": "identity-obj-proxy"
+      "\\.(css|less|sass|scss)$": "identity-obj-proxy",
+      "components(.*)$": "<rootDir>/src/components$1",
+      "builderStore(.*)$": "<rootDir>/src/builderStore$1"
     },
     "moduleFileExtensions": [
       "js"
@@ -55,6 +57,7 @@
     "@babel/plugin-transform-runtime": "^7.5.5",
     "@babel/preset-env": "^7.5.5",
     "@babel/runtime": "^7.5.5",
+    "@rollup/plugin-alias": "^3.0.1",
     "@sveltech/routify": "1.5.0-beta.16",
     "babel-jest": "^24.8.0",
     "browser-sync": "^2.26.7",
@@ -77,4 +80,4 @@
     "svelte": "^3.0.0"
   },
   "gitHead": "115189f72a850bfb52b65ec61d932531bf327072"
-}
+}

packages/builder/rollup.config.js

@@ -1,3 +1,4 @@
+import alias from "@rollup/plugin-alias"
 import svelte from "rollup-plugin-svelte"
 import resolve from "rollup-plugin-node-resolve"
 import commonjs from "rollup-plugin-commonjs"
@@ -11,6 +12,8 @@ import browsersync from "rollup-plugin-browsersync"
 import proxy from "http-proxy-middleware"
 import replace from "rollup-plugin-replace"
 
+import path from "path"
+
 const target = "http://localhost:4001"
 const _builderProxy = proxy("/_builder", {
   target: "http://localhost:3000",
@@ -142,6 +145,11 @@ const coreExternal = [
   "@nx-js/compiler-util",
 ]
 
+const customResolver = resolve({
+  extensions: [".mjs", ".js", ".jsx", ".json", ".sass", ".scss", ".svelte"]
+})
+const projectRootDir = path.resolve(__dirname)
+
 export default {
   input: "src/main.js",
   output: {
@@ -151,6 +159,13 @@ export default {
     file: `${outputpath}/bundle.js`,
   },
   plugins: [
+    alias({
+      entries: [
+        { find: "components", replacement: path.resolve(projectRootDir, 'src/components') },
+        { find: "builderStore", replacement: path.resolve(projectRootDir, 'src/builderStore') }
+      ],
+      customResolver
+    }),
     copy({
       targets: [
         { src: "src/index.html", dest: outputpath, rename: "__app.html" },

packages/builder/src/builderStore/createPackage.js

@@ -1,4 +1,4 @@
-import { createNewHierarchy } from "../common/core"
+import { createNewHierarchy } from "components/common/core"
 
 export const createPackage = (packageInfo, store) => {
   packageInfo.createNewPackage("")

packages/builder/src/builderStore/store/backend.js

@@ -1,7 +1,7 @@
 import { writable } from "svelte/store"
 import api from "../api"
 import { cloneDeep, sortBy, find, remove } from "lodash/fp"
-import { hierarchy as hierarchyFunctions } from "../../../../../core/src"
+import { hierarchy as hierarchyFunctions } from "../../../../core/src"
 import {
   getNode,
   validate,

packages/builder/src/components/common/core.js

@@ -3,17 +3,17 @@ import {
   common,
   getTemplateApi,
   getAuthApi,
-} from "../../../../../core/src"
+} from "../../../../core/src"
-import { _getNew } from "../../../../../core/src/recordApi/getNew"
+import { _getNew } from "../../../../core/src/recordApi/getNew"
 import { find, filter, keyBy, flatten, map } from "lodash/fp"
-import { generateSchema } from "../../../../../core/src/indexing/indexSchemaCreator"
+import { generateSchema } from "../../../../core/src/indexing/indexSchemaCreator"
 import { generate } from "shortid"
 
-export { canDeleteIndex } from "../../../../../core/src/templateApi/canDeleteIndex"
+export { canDeleteIndex } from "../../../../core/src/templateApi/canDeleteIndex"
-export { canDeleteRecord } from "../../../../../core/src/templateApi/canDeleteRecord"
+export { canDeleteRecord } from "../../../../core/src/templateApi/canDeleteRecord"
-export { userWithFullAccess } from "../../../../../core/src/index"
+export { userWithFullAccess } from "../../../../core/src/index"
-export { joinKey } from "../../../../../core/src/common"
+export { joinKey } from "../../../../core/src/common"
-export { getExactNodeForKey } from "../../../../../core/src/templateApi/hierarchy"
+export { getExactNodeForKey } from "../../../../core/src/templateApi/hierarchy"
 export const pipe = common.$
 
 export const events = common.eventsList

packages/builder/src/components/common/eventHandlers.js

@@ -1,7 +1,7 @@
-import { eventHandlers } from "../../../../../client/src/state/eventHandlers"
+import { eventHandlers } from "../../../../client/src/state/eventHandlers"
 import { writable } from "svelte/store"
-export { EVENT_TYPE_MEMBER_NAME } from "../../../../../client/src/state/eventHandlers"
+export { EVENT_TYPE_MEMBER_NAME } from "../../../../client/src/state/eventHandlers"
-import { createCoreApi } from "../../../../../client/src/core"
+import { createCoreApi } from "../../../../client/src/core"
 
 export const allHandlers = (appDefinition, user) => {
   const coreApi = createCoreApi(appDefinition, user)

packages/builder/src/components/database/IndexView.svelte

@@ -8,7 +8,7 @@
   import {
     hierarchy as hierarchyFunctions,
     common,
-  } from "../../../../../core/src/"
+  } from "../../../../core/src/"
   import ErrorsBox from "components/common/ErrorsBox.svelte"
   import ActionButton from "components/common/ActionButton.svelte"
 

packages/builder/src/components/database/ModelView.svelte

@@ -19,7 +19,7 @@
     isDate,
   } from "lodash/fp"
   import { store, backendUiStore } from "builderStore"
-  import { common, hierarchy } from "../../../../../core/src/"
+  import { common, hierarchy } from "../../../../core/src/"
   import { getNode } from "components/common/core"
   import { templateApi, pipe, validate } from "components/common/core"
   import ErrorsBox from "components/common/ErrorsBox.svelte"