get build to work

paperclip-ui · May 21, 2022 · 9eebdab · 9eebdab
1 parent e78e710
commit 9eebdab
Show file tree

Hide file tree

Showing 80 changed files with 501 additions and 488 deletions.
diff --git a/.yarn/cache/@types-fs-extra-npm-5.1.0-11646f6d9f-9b4abc891a.zip b/.yarn/cache/@types-fs-extra-npm-5.1.0-11646f6d9f-9b4abc891a.zip
diff --git a/.yarn/cache/@types-node-npm-10.17.60-63ac1f669f-2cdb3a77d0.zip b/.yarn/cache/@types-node-npm-10.17.60-63ac1f669f-2cdb3a77d0.zip
diff --git a/.yarn/cache/fs-extra-npm-7.0.1-b33a5e53e9-141b9dccb2.zip b/.yarn/cache/fs-extra-npm-7.0.1-b33a5e53e9-141b9dccb2.zip
diff --git a/.yarn/cache/react-dom-npm-16.14.0-516a97ad33-5a5c49da0f.zip b/.yarn/cache/react-dom-npm-16.14.0-516a97ad33-5a5c49da0f.zip
diff --git a/.yarn/cache/react-npm-16.14.0-932446ec69-8484f3ecb1.zip b/.yarn/cache/react-npm-16.14.0-932446ec69-8484f3ecb1.zip
diff --git a/.yarn/cache/scheduler-npm-0.19.1-a4dd0ffd3a-73e185a59e.zip b/.yarn/cache/scheduler-npm-0.19.1-a4dd0ffd3a-73e185a59e.zip
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/package.json b/package.json
@@ -9,7 +9,8 @@
   },
   "workspaces": [
     "./packages/legacy-tandem/*",
-    "./packages/@tandem-ui/*"
+    "./packages/@tandem-ui/*",
+    "./packages/@paperclip-lang/*"
   ],
   "main": "index.js",
   "author": "",

diff --git a/...lip/paperclip-autocomplete/.eslintrc.json → ...aperclip-lang/autocomplete/.eslintrc.json b/...lip/paperclip-autocomplete/.eslintrc.json → ...aperclip-lang/autocomplete/.eslintrc.json
diff --git a/...-paperclip/paperclip-autocomplete/LICENSE → ...ages/@paperclip-lang/autocomplete/LICENSE b/...-paperclip/paperclip-autocomplete/LICENSE → ...ages/@paperclip-lang/autocomplete/LICENSE
diff --git a/...aperclip/paperclip-autocomplete/README.md → ...es/@paperclip-lang/autocomplete/README.md b/...aperclip/paperclip-autocomplete/README.md → ...es/@paperclip-lang/autocomplete/README.md
diff --git a/...perclip/paperclip-autocomplete/index.d.ts → ...s/@paperclip-lang/autocomplete/index.d.ts b/...perclip/paperclip-autocomplete/index.d.ts → ...s/@paperclip-lang/autocomplete/index.d.ts
diff --git a/...paperclip/paperclip-autocomplete/index.js → ...ges/@paperclip-lang/autocomplete/index.js b/...paperclip/paperclip-autocomplete/index.js → ...ges/@paperclip-lang/autocomplete/index.js
diff --git a/...rclip/paperclip-autocomplete/package.json → ...@paperclip-lang/autocomplete/package.json b/...rclip/paperclip-autocomplete/package.json → ...@paperclip-lang/autocomplete/package.json
@@ -16,7 +16,7 @@
   "license": "ISC",
   "devDependencies": {
     "@types/mocha": "^7.0.2",
-    "@types/node": "^14.0.20",
+    "@types/node": "^17.0.35",
     "@typescript-eslint/eslint-plugin": "^3.6.1",
     "@typescript-eslint/parser": "^3.6.1",
     "chai": "^4.2.0",

diff --git a/...rclip/paperclip-autocomplete/src/index.ts → ...@paperclip-lang/autocomplete/src/index.ts b/...rclip/paperclip-autocomplete/src/index.ts → ...@paperclip-lang/autocomplete/src/index.ts
diff --git a/...erclip-autocomplete/src/string-scanner.ts → ...p-lang/autocomplete/src/string-scanner.ts b/...erclip-autocomplete/src/string-scanner.ts → ...p-lang/autocomplete/src/string-scanner.ts
diff --git a/...rclip-autocomplete/src/suggest-context.ts → ...-lang/autocomplete/src/suggest-context.ts b/...rclip-autocomplete/src/suggest-context.ts → ...-lang/autocomplete/src/suggest-context.ts
diff --git a/...complete/src/test/suggest-context-test.ts → ...complete/src/test/suggest-context-test.ts b/...complete/src/test/suggest-context-test.ts → ...complete/src/test/suggest-context-test.ts
diff --git a/...ip-autocomplete/src/test/tokenize-test.ts → ...ng/autocomplete/src/test/tokenize-test.ts b/...ip-autocomplete/src/test/tokenize-test.ts → ...ng/autocomplete/src/test/tokenize-test.ts
diff --git a/...p/paperclip-autocomplete/src/tokenizer.ts → ...erclip-lang/autocomplete/src/tokenizer.ts b/...p/paperclip-autocomplete/src/tokenizer.ts → ...erclip-lang/autocomplete/src/tokenizer.ts
diff --git a/...clip/paperclip-autocomplete/tsconfig.json → ...paperclip-lang/autocomplete/tsconfig.json b/...clip/paperclip-autocomplete/tsconfig.json → ...paperclip-lang/autocomplete/tsconfig.json
diff --git a/...lip/paperclip-web-renderer/.eslintrc.json → ...aperclip-lang/web-renderer/.eslintrc.json b/...lip/paperclip-web-renderer/.eslintrc.json → ...aperclip-lang/web-renderer/.eslintrc.json
diff --git a/...erclip/paperclip-web-renderer/.yo-rc.json → .../@paperclip-lang/web-renderer/.yo-rc.json b/...erclip/paperclip-web-renderer/.yo-rc.json → .../@paperclip-lang/web-renderer/.yo-rc.json
diff --git a/...-paperclip/paperclip-web-renderer/LICENSE → ...ages/@paperclip-lang/web-renderer/LICENSE b/...-paperclip/paperclip-web-renderer/LICENSE → ...ages/@paperclip-lang/web-renderer/LICENSE
diff --git a/...aperclip/paperclip-web-renderer/README.md → ...es/@paperclip-lang/web-renderer/README.md b/...aperclip/paperclip-web-renderer/README.md → ...es/@paperclip-lang/web-renderer/README.md
diff --git a/...perclip/paperclip-web-renderer/browser.js → ...s/@paperclip-lang/web-renderer/browser.js b/...perclip/paperclip-web-renderer/browser.js → ...s/@paperclip-lang/web-renderer/browser.js
diff --git a/...perclip/paperclip-web-renderer/index.d.ts → ...s/@paperclip-lang/web-renderer/index.d.ts b/...perclip/paperclip-web-renderer/index.d.ts → ...s/@paperclip-lang/web-renderer/index.d.ts
diff --git a/...paperclip/paperclip-web-renderer/index.js → ...ges/@paperclip-lang/web-renderer/index.js b/...paperclip/paperclip-web-renderer/index.js → ...ges/@paperclip-lang/web-renderer/index.js
diff --git a/...rclip/paperclip-web-renderer/package.json → ...@paperclip-lang/web-renderer/package.json b/...rclip/paperclip-web-renderer/package.json → ...@paperclip-lang/web-renderer/package.json
diff --git a/...erclip/paperclip-web-renderer/src/base.ts → .../@paperclip-lang/web-renderer/src/base.ts b/...erclip/paperclip-web-renderer/src/base.ts → .../@paperclip-lang/web-renderer/src/base.ts
diff --git a/...perclip-web-renderer/src/cssom-patcher.ts → ...ip-lang/web-renderer/src/cssom-patcher.ts b/...perclip-web-renderer/src/cssom-patcher.ts → ...ip-lang/web-renderer/src/cssom-patcher.ts
diff --git a/...paperclip-web-renderer/src/dom-patcher.ts → ...clip-lang/web-renderer/src/dom-patcher.ts b/...paperclip-web-renderer/src/dom-patcher.ts → ...clip-lang/web-renderer/src/dom-patcher.ts
diff --git a/...erclip-web-renderer/src/frame-renderer.ts → ...p-lang/web-renderer/src/frame-renderer.ts b/...erclip-web-renderer/src/frame-renderer.ts → ...p-lang/web-renderer/src/frame-renderer.ts
diff --git a/...rclip-web-renderer/src/frame2-renderer.ts → ...-lang/web-renderer/src/frame2-renderer.ts b/...rclip-web-renderer/src/frame2-renderer.ts → ...-lang/web-renderer/src/frame2-renderer.ts
diff --git a/...erclip-web-renderer/src/frames-patcher.ts → ...p-lang/web-renderer/src/frames-patcher.ts b/...erclip-web-renderer/src/frames-patcher.ts → ...p-lang/web-renderer/src/frames-patcher.ts
diff --git a/...rclip/paperclip-web-renderer/src/index.ts → ...@paperclip-lang/web-renderer/src/index.ts b/...rclip/paperclip-web-renderer/src/index.ts → ...@paperclip-lang/web-renderer/src/index.ts
diff --git a/...rclip-web-renderer/src/native-renderer.ts → ...-lang/web-renderer/src/native-renderer.ts b/...rclip-web-renderer/src/native-renderer.ts → ...-lang/web-renderer/src/native-renderer.ts
diff --git a/...ip/paperclip-web-renderer/src/renderer.ts → ...perclip-lang/web-renderer/src/renderer.ts b/...ip/paperclip-web-renderer/src/renderer.ts → ...perclip-lang/web-renderer/src/renderer.ts
diff --git a/...clip-web-renderer/src/test/change-test.ts → ...lang/web-renderer/src/test/change-test.ts b/...clip-web-renderer/src/test/change-test.ts → ...lang/web-renderer/src/test/change-test.ts
diff --git a/...rclip-web-renderer/src/test/frame-test.ts → ...-lang/web-renderer/src/test/frame-test.ts b/...rclip-web-renderer/src/test/frame-test.ts → ...-lang/web-renderer/src/test/frame-test.ts
diff --git a/...rclip-web-renderer/src/test/fuzzy-test.ts → ...-lang/web-renderer/src/test/fuzzy-test.ts b/...rclip-web-renderer/src/test/fuzzy-test.ts → ...-lang/web-renderer/src/test/fuzzy-test.ts
diff --git a/...-web-renderer/src/test/random/document.ts → .../web-renderer/src/test/random/document.ts b/...-web-renderer/src/test/random/document.ts → .../web-renderer/src/test/random/document.ts
diff --git a/...clip-web-renderer/src/test/random/html.ts → ...lang/web-renderer/src/test/random/html.ts b/...clip-web-renderer/src/test/random/html.ts → ...lang/web-renderer/src/test/random/html.ts
diff --git a/...lip-web-renderer/src/test/random/index.ts → ...ang/web-renderer/src/test/random/index.ts b/...lip-web-renderer/src/test/random/index.ts → ...ang/web-renderer/src/test/random/index.ts
diff --git a/...ip-web-renderer/src/test/random/styles.ts → ...ng/web-renderer/src/test/random/styles.ts b/...ip-web-renderer/src/test/random/styles.ts → ...ng/web-renderer/src/test/random/styles.ts
diff --git a/...lip-web-renderer/src/test/random/utils.ts → ...ang/web-renderer/src/test/random/utils.ts b/...lip-web-renderer/src/test/random/utils.ts → ...ang/web-renderer/src/test/random/utils.ts
diff --git a/.../paperclip-web-renderer/src/test/utils.ts → ...rclip-lang/web-renderer/src/test/utils.ts b/.../paperclip-web-renderer/src/test/utils.ts → ...rclip-lang/web-renderer/src/test/utils.ts
diff --git a/...paperclip-web-renderer/src/utils/index.ts → ...clip-lang/web-renderer/src/utils/index.ts b/...paperclip-web-renderer/src/utils/index.ts → ...clip-lang/web-renderer/src/utils/index.ts
diff --git a/.../paperclip-web-renderer/src/utils/misc.ts → ...rclip-lang/web-renderer/src/utils/misc.ts b/.../paperclip-web-renderer/src/utils/misc.ts → ...rclip-lang/web-renderer/src/utils/misc.ts
diff --git a/...clip/paperclip-web-renderer/tsconfig.json → ...paperclip-lang/web-renderer/tsconfig.json b/...clip/paperclip-web-renderer/tsconfig.json → ...paperclip-lang/web-renderer/tsconfig.json
diff --git a/...clip/paperclip-web-renderer/uis/loader.pc → ...paperclip-lang/web-renderer/uis/loader.pc b/...clip/paperclip-web-renderer/uis/loader.pc → ...paperclip-lang/web-renderer/uis/loader.pc
diff --git a/...ip-web-renderer/uis/paperclip.config.json → ...ng/web-renderer/uis/paperclip.config.json b/...ip-web-renderer/uis/paperclip.config.json → ...ng/web-renderer/uis/paperclip.config.json
diff --git a/.../paperclip-web-renderer/webpack.config.js → ...rclip-lang/web-renderer/webpack.config.js b/.../paperclip-web-renderer/webpack.config.js → ...rclip-lang/web-renderer/webpack.config.js
diff --git a/packages/@tandem-ui/designer/package.json b/packages/@tandem-ui/designer/package.json
@@ -72,10 +72,10 @@
     "mousetrap": "^1.6.5",
     "paperclip": "^10.1.33",
     "paperclip-migrator": "^10.1.33",
-    "react": "^16.4.2",
+    "react": "^18.1.0",
     "react-dnd": "^5.0.0",
     "react-dnd-html5-backend": "^5.0.1",
-    "react-dom": "^16.4.2",
+    "react-dom": "^18.1.0",
     "react-hammerjs": "^1.0.1",
     "react-redux": "^8.0.1",
     "recompose": "^0.28.2",

diff --git a/packages/@tandem-ui/designer/src/components/root/index.tsx b/packages/@tandem-ui/designer/src/components/root/index.tsx
@@ -13,12 +13,15 @@ import {
 } from "../../state";
 import { Chrome } from "./chrome.pc";
 
+console.log("DDASSS");
+
 export const RootComponent = () => {
   const root = useSelector((v) => v) as RootState;
   const dispatch = useDispatch();
 
   // TODO - add loading state here
   if (root.readyType === RootReadyType.LOADING) {
+    console.log("DDA");
     return null;
   }
 
@@ -65,6 +68,5 @@ export const RootComponent = () => {
       />
     );
   }
-
   return content;
 };
diff --git a/packages/@tandem-ui/designer/webpack/base.config.js b/packages/@tandem-ui/designer/webpack/base.config.js
@@ -7,7 +7,7 @@ module.exports = (createConfig) =>
     devtool: false,
     mode: "development",
     output: {
-      path: resolve(__dirname, "..", "lib", "front-end"),
+      path: resolve(__dirname, "..", "lib"),
       libraryTarget: "umd",
       filename: "[name].bundle.js",
     },

diff --git a/packages/@tandem-ui/workspace-client/src/paperclip.ts b/packages/@tandem-ui/workspace-client/src/paperclip.ts
@@ -2,7 +2,7 @@ import { RPCClientAdapter } from "@paperclip-ui/common";
 import { VirtNodeSource } from "@paperclip-ui/utils";
 import {
   inspectNodeStyleChannel,
-  loadInsertableNodesChannel,
+  // loadInsertableNodesChannel,
   revealNodeSourceByIdChannel,
   revealNodeSourceChannel,
 } from "@tandem-ui/workspace-core";
@@ -13,7 +13,7 @@ type LoadInsertableNodesOptions = {
 
 export class PaperclipManager {
   private _inspectNodeStyle: ReturnType<typeof inspectNodeStyleChannel>;
-  private _loadInsertableNodes: ReturnType<typeof loadInsertableNodesChannel>;
+  // private _loadInsertableNodes: ReturnType<typeof loadInsertableNodesChannel>;
   private _revealSource: ReturnType<typeof revealNodeSourceChannel>;
   private _revealBySourceId: ReturnType<typeof revealNodeSourceByIdChannel>;
 
@@ -22,7 +22,7 @@ export class PaperclipManager {
 
   constructor(client: RPCClientAdapter) {
     this._inspectNodeStyle = inspectNodeStyleChannel(client);
-    this._loadInsertableNodes = loadInsertableNodesChannel(client);
+    // this._loadInsertableNodes = loadInsertableNodesChannel(client);
     this._revealSource = revealNodeSourceChannel(client);
     this._revealBySourceId = revealNodeSourceByIdChannel(client);
   }
@@ -36,7 +36,7 @@ export class PaperclipManager {
   }
 
   async loadInsertableNodes({ activeUri }: LoadInsertableNodesOptions) {
-    return await this._loadInsertableNodes.call({ activeUri });
+    // return await this._loadInsertableNodes.call({ activeUri });
   }
 
   /**

diff --git a/packages/@tandem-ui/workspace-client/src/project.ts b/packages/@tandem-ui/workspace-client/src/project.ts
@@ -2,7 +2,6 @@ import { RPCClientAdapter } from "@paperclip-ui/common";
 import {
   getAllPaperclipFilesChannel,
   openProjectChannel,
-  popoutWindowChannel,
 } from "@tandem-ui/workspace-core";
 import { EditorClient } from "@paperclip-ui/editor-engine/lib/client/client";
 import { PCDocument } from "@paperclip-ui/editor-engine/lib/client/documents";

diff --git a/packages/@tandem-ui/workspace-core/src/channels.ts b/packages/@tandem-ui/workspace-core/src/channels.ts
@@ -26,11 +26,6 @@ export const revealNodeSourceByIdChannel = remoteChannel<string, void>(
   "revealNodeSourceByIdChannel"
 );
 
-export const loadInsertableNodesChannel = remoteChannel<
-  { activeUri: string },
-  AvailableNode[]
->("loadInsertableNodesChannel");
-
 export const openProjectChannel = remoteChannel<
   { uri?: string; branch?: string; id?: string },
   { id: string; directoryPath: string; directoryUri: string }

diff --git a/packages/@tandem-ui/workspace/src/controllers/designer.ts b/packages/@tandem-ui/workspace/src/controllers/designer.ts
@@ -4,7 +4,6 @@ import * as fs from "fs";
 
 const DESIGNER_DIST_PATH = path.join(
   path.dirname(require.resolve("@tandem-ui/designer")),
-  "..",
   "lib"
 );
 

diff --git a/packages/@tandem-ui/workspace/src/controllers/paperclip.ts b/packages/@tandem-ui/workspace/src/controllers/paperclip.ts
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ import * as fs from "fs"; @@
     const DESIGNER_DIST_PATH = path.join(
       path.dirname(require.resolve("@tandem-ui/designer")),
-      "..",
       "lib"
     );
@@ Expand Down @@