{"commit":{"revision":"d9b9554948899f92b7f8afc354e77393370866c2","authoredAt":"2022-12-19T10:00:16-08:00","shortRevision":"d9b9554948","authorEmail":"joesavona@fb.com","authorName":"Joe Savona","subject":"Remove old architecture from playground"},"parents":["5db523a98a617842bb45500ff82491184d8ecacd"],"files":[{"status":"M","path":"compiler\/forget\/packages\/playground\/components\/Editor\/Input.tsx"},{"status":"M","path":"compiler\/forget\/packages\/playground\/components\/Editor\/Output.tsx"},{"status":"M","path":"compiler\/forget\/packages\/playground\/components\/Editor\/index.tsx"},{"status":"D","path":"compiler\/forget\/packages\/playground\/components\/GraphView.tsx"},{"status":"M","path":"compiler\/forget\/packages\/playground\/components\/StoreContext.tsx"},{"status":"M","path":"compiler\/forget\/packages\/playground\/components\/TabbedWindow.tsx"},{"status":"D","path":"compiler\/forget\/packages\/playground\/lib\/compilerDriver.ts"},{"status":"M","path":"compiler\/forget\/packages\/playground\/lib\/defaultStore.ts"},{"status":"D","path":"compiler\/forget\/packages\/playground\/lib\/dotProgramGenerator.ts"},{"status":"D","path":"compiler\/forget\/packages\/playground\/lib\/forgetMonacoDiagnostics.ts"},{"status":"M","path":"compiler\/forget\/packages\/playground\/lib\/stores\/store.ts"},{"status":"M","path":"compiler\/forget\/packages\/playground\/lib\/utils.ts"},{"status":"M","path":"compiler\/forget\/packages\/playground\/scripts\/setup.sh"}],"body":"Removes the old architecture from the playground. Next step deletion.","patch":"diff --git a\/compiler\/forget\/packages\/playground\/components\/Editor\/Input.tsx b\/compiler\/forget\/packages\/playground\/components\/Editor\/Input.tsx\nindex ed7fed39e9..cf3e19e0ef 100644\n--- a\/compiler\/forget\/packages\/playground\/components\/Editor\/Input.tsx\n+++ b\/compiler\/forget\/packages\/playground\/components\/Editor\/Input.tsx\n@@ -3,30 +3,20 @@\n *\/\n \n import MonacoEditor, { type Monaco } from \"@monaco-editor\/react\";\n-import type { Diagnostic } from \"babel-plugin-react-forget-legacy\";\n import invariant from \"invariant\";\n import type { editor } from \"monaco-editor\";\n import { useEffect, useState } from \"react\";\n-import { renderForgetMarkers } from \"..\/..\/lib\/forgetMonacoDiagnostics\";\n import { useStore, useStoreDispatch } from \"..\/StoreContext\";\n import { monacoOptions } from \".\/monacoOptions\";\n \/\/ TODO: Make TS recognize .d.ts files, in addition to loading them with webpack.\n \/\/ @ts-ignore\n import React$Types from \"..\/..\/node_modules\/@types\/react\/index.d.ts\";\n \n-export default function Input({ diagnostics }: { diagnostics: Diagnostic[] }) {\n+export default function Input({}: {}) {\n const [monaco, setMonaco] = useState(null);\n const store = useStore();\n const dispatchStore = useStoreDispatch();\n \n- useEffect(() => {\n- if (!monaco) return;\n- const uri = monaco.Uri.parse(`file:\/\/\/index.js`);\n- const model = monaco.editor.getModel(uri);\n- invariant(model, \"Model must exist for the selected input file.\");\n- renderForgetMarkers({ monaco, model, diagnostics });\n- }, [diagnostics, monaco]);\n-\n \/\/ Set tab width to 2 spaces for the selected input file.\n useEffect(() => {\n if (!monaco) return;\ndiff --git a\/compiler\/forget\/packages\/playground\/components\/Editor\/Output.tsx b\/compiler\/forget\/packages\/playground\/components\/Editor\/Output.tsx\nindex 3740984245..22cb39aa90 100644\n--- a\/compiler\/forget\/packages\/playground\/components\/Editor\/Output.tsx\n+++ b\/compiler\/forget\/packages\/playground\/components\/Editor\/Output.tsx\n@@ -7,15 +7,9 @@\n import generate from \"@babel\/generator\";\n import MonacoEditor from \"@monaco-editor\/react\";\n import { HIR } from \"babel-plugin-react-forget\";\n-import {\n- Diagnostic,\n- OutputKind,\n- stringifyCompilerOutputs,\n-} from \"babel-plugin-react-forget-legacy\";\n import prettier from \"prettier\";\n import prettierParserBabel from \"prettier\/parser-babel\";\n import { memo, useMemo } from \"react\";\n-import compileOldArchitecture from \"..\/..\/lib\/compilerDriver\";\n import type { Store } from \"..\/..\/lib\/stores\";\n import TabbedWindow, { TabTypes } from \"..\/TabbedWindow\";\n import { monacoOptions } from \".\/monacoOptions\";\n@@ -44,7 +38,6 @@ export default MemoizedOutput;\n \n type Props = {\n store: Store;\n- updateDiagnostics: (newDiags: Diagnostic[]) => void;\n tabsOpen: Map;\n setTabsOpen: (newTab: Map) => void;\n };\n@@ -146,16 +139,6 @@ function compile(source: string): CompilerOutput | CompilerError {\n \/\/ TODO(gsn: Update diagnostics ƒrom HIR output\n function Output({ store, setTabsOpen, tabsOpen }: Props) {\n const compilerOutput = useMemo(() => compile(store.source), [store.source]);\n- const { outputs: oldCompilerOutputs } = useMemo(\n- () => compileOldArchitecture(store.source, store.compilerFlags),\n- [store]\n- );\n- const prettyOldCompilerOutput = useMemo(\n- () => stringifyCompilerOutputs(oldCompilerOutputs),\n- [oldCompilerOutputs]\n- );\n- const prettyOldCompilerOutputJS =\n- prettyOldCompilerOutput[OutputKind.JS] ?? \"(Empty)\";\n \n if (typeof compilerOutput === \"string\") {\n if (compilerOutput === \"\") return

<\/div>;\n@@ -221,7 +204,6 @@ function Output({ store, setTabsOpen, tabsOpen }: Props) {\n )}\n <\/>\n ),\n- OldArchitecture: ,\n }}\n \/>\n );\ndiff --git a\/compiler\/forget\/packages\/playground\/components\/Editor\/index.tsx b\/compiler\/forget\/packages\/playground\/components\/Editor\/index.tsx\nindex 3fab08ae91..a9923ac92e 100644\n--- a\/compiler\/forget\/packages\/playground\/components\/Editor\/index.tsx\n+++ b\/compiler\/forget\/packages\/playground\/components\/Editor\/index.tsx\n@@ -5,11 +5,10 @@\n * LICENSE file in the root directory of this source tree.\n *\/\n \n-import type { Diagnostic } from \"babel-plugin-react-forget-legacy\";\n import clsx from \"clsx\";\n import invariant from \"invariant\";\n import { useSnackbar } from \"notistack\";\n-import { useCallback, useDeferredValue, useState } from \"react\";\n+import { useDeferredValue, useState } from \"react\";\n import { useMountEffect } from \"..\/..\/hooks\";\n import { defaultStore } from \"..\/..\/lib\/defaultStore\";\n import {\n@@ -29,11 +28,6 @@ export default function Editor() {\n const deferredStore = useDeferredValue(store);\n const dispatchStore = useStoreDispatch();\n const { enqueueSnackbar } = useSnackbar();\n- const [diagnostics, setDiagnostics] = useState([]);\n- const updateDiagnostics = useCallback(\n- (newDiags: Diagnostic[]) => setDiagnostics(newDiags),\n- [setDiagnostics]\n- );\n const [tabsOpen, setTabsOpen] = useState>(new Map());\n \n useMountEffect(() => {\n@@ -61,15 +55,17 @@ export default function Editor() {\n return (\n <>\n

\n-

\n- \n+ \n+ \n <\/div>\n

\n \n <\/div>\n <\/div>\ndiff --git a\/compiler\/forget\/packages\/playground\/components\/GraphView.tsx b\/compiler\/forget\/packages\/playground\/components\/GraphView.tsx\ndeleted file mode 100644\nindex 4f187171ef..0000000000\n--- a\/compiler\/forget\/packages\/playground\/components\/GraphView.tsx\n+++ \/dev\/null\n@@ -1,51 +0,0 @@\n-import { graphviz, wasmFolder } from \"@hpcc-js\/wasm\";\n-import {\n- OutputKind,\n- type CompilerOutputs,\n-} from \"babel-plugin-react-forget-legacy\";\n-import { memo, useEffect, useState } from \"react\";\n-import genDotProgram from \"..\/lib\/dotProgramGenerator\";\n-\n-\/*\n- Look for graphvizlib.wasm in the \/public folder.\n- It's recommended to put the WASM files along with the JS files.\n- See https:\/\/github.com\/hpcc-systems\/hpcc-js-wasm\/#contents.\n-*\/\n-wasmFolder(\"\/\");\n-\n-const MemoizedGraphView = memo(GraphView);\n-\n-export default MemoizedGraphView;\n-\n-function GraphView({\n- graphs,\n-}: {\n- graphs:\n- | CompilerOutputs[OutputKind.ValGraph]\n- | CompilerOutputs[OutputKind.SCCGraph]\n- | CompilerOutputs[OutputKind.RedGraph];\n-}) {\n- const [renderedGraphs, setRenderedGraphs] = useState([]);\n-\n- useEffect(() => {\n- async function generateGraph() {\n- const svgs = [];\n- for (const graph of graphs) {\n- const svg = await graphviz.layout(genDotProgram(graph), \"svg\", \"dot\");\n- svgs.push(svg);\n- }\n- setRenderedGraphs(svgs);\n- }\n-\n- generateGraph();\n- }, [graphs]);\n-\n- return (\n- <>\n- {renderedGraphs.map((graph, i) => (\n- \/\/ TODO: Make an ID for each graph snapshot and use it as key here.\n-

\n- ))}\n- <\/>\n- );\n-}\ndiff --git a\/compiler\/forget\/packages\/playground\/components\/StoreContext.tsx b\/compiler\/forget\/packages\/playground\/components\/StoreContext.tsx\nindex e0e54b8315..a58acf400a 100644\n--- a\/compiler\/forget\/packages\/playground\/components\/StoreContext.tsx\n+++ b\/compiler\/forget\/packages\/playground\/components\/StoreContext.tsx\n@@ -8,7 +8,6 @@ import createContext from \"..\/lib\/createContext\";\n import { emptyStore } from \"..\/lib\/defaultStore\";\n import type { Store } from \"..\/lib\/stores\";\n import { saveStore } from \"..\/lib\/stores\";\n-import { ForgetCompilerFlags } from \"..\/lib\/compilerDriver\";\n \n const StoreContext = createContext();\n \n@@ -51,10 +50,6 @@ type ReducerAction =\n payload: {\n source: string;\n };\n- }\n- | {\n- type: \"setCompilerFlag\";\n- payload: { flag: keyof ForgetCompilerFlags; value: boolean };\n };\n \n function storeReducer(store: Store, action: ReducerAction): Store {\n@@ -76,16 +71,5 @@ function storeReducer(store: Store, action: ReducerAction): Store {\n saveStore(newStore);\n return newStore;\n }\n- case \"setCompilerFlag\": {\n- const { flag, value } = action.payload;\n-\n- const newStore = {\n- ...store,\n- compilerFlags: { ...store.compilerFlags },\n- };\n- newStore.compilerFlags[flag] = value;\n- saveStore(newStore);\n- return newStore;\n- }\n }\n }\ndiff --git a\/compiler\/forget\/packages\/playground\/components\/TabbedWindow.tsx b\/compiler\/forget\/packages\/playground\/components\/TabbedWindow.tsx\nindex a888a9cd35..b755992943 100644\n--- a\/compiler\/forget\/packages\/playground\/components\/TabbedWindow.tsx\n+++ b\/compiler\/forget\/packages\/playground\/components\/TabbedWindow.tsx\n@@ -18,8 +18,7 @@ export type TabTypes =\n | \"ReactiveFunctions\"\n | \"LeaveSSA\"\n | \"JS\"\n- | \"SourceMap\"\n- | \"OldArchitecture\";\n+ | \"SourceMap\";\n \n type TabsRecord = Record;\n \ndiff --git a\/compiler\/forget\/packages\/playground\/lib\/compilerDriver.ts b\/compiler\/forget\/packages\/playground\/lib\/compilerDriver.ts\ndeleted file mode 100644\nindex a6d071ade3..0000000000\n--- a\/compiler\/forget\/packages\/playground\/lib\/compilerDriver.ts\n+++ \/dev\/null\n@@ -1,126 +0,0 @@\n-\/*\n- * Copyright (c) Facebook, Inc. and its affiliates.\n- *\/\n-\n-import type { TransformOptions } from \"@babel\/core\";\n-import { transform } from \"@babel\/standalone\";\n-import {\n- createArrayLogger,\n- createCompilerOutputs,\n- getMostRecentCompilerContext,\n- NoUseBeforeDefineRule,\n- OutputKind,\n- type CompilerContext,\n- type CompilerOptions,\n- type CompilerOutputs,\n- type Diagnostic,\n-} from \"babel-plugin-react-forget-legacy\";\n-import { PassName } from \"..\/..\/babel-plugin-react-forget-legacy\/dist\/Pass\";\n-\/\/ @ts-ignore\n-import ESLint from \"eslint-browser\";\n-import { getBabelPlugins } from \".\/utils\";\n-\n-declare global {\n- var Forget$Context: CompilerContext;\n-}\n-export type ForgetCompilerFlags = CompilerOptions[\"flags\"];\n-\n-interface CompileResult {\n- outputs: CompilerOutputs;\n- diagnostics: Diagnostic[];\n-}\n-\n-const ESLINT_CONFIG = {\n- parserOptions: {\n- ecmaVersion: \"latest\",\n- sourceType: \"module\",\n- },\n- rules: {\n- \"custom-no-use-before-define\": \"error\",\n- },\n-};\n-\n-\/**\n- * Post-codegen pass to validate that the generated code does not introduce bugs.\n- * Note that the compiler currently incorrectly reorders code in some cases: this\n- * step detects this using ESLint's no-use-before-define rule at its strictest\n- * setting.\n- *\/\n-function validateNoUseBeforeDefine(source: string) {\n- const linter = new ESLint.index.Linter();\n- linter.defineRule(\"custom-no-use-before-define\", NoUseBeforeDefineRule);\n- return linter.verify(source, ESLINT_CONFIG);\n-}\n-\n-export default function compile(\n- source: string,\n- compilerFlags: ForgetCompilerFlags\n-): CompileResult {\n- const outputs = createCompilerOutputs();\n-\n- const forgetLogs: string[] = [];\n- const forgetPlaygroundOptions: Partial = {\n- logger: createArrayLogger(forgetLogs),\n- outputKinds: Object.values(OutputKind),\n- stopPass: PassName.Validator,\n- };\n- if (compilerFlags) {\n- forgetPlaygroundOptions.flags = compilerFlags;\n- }\n-\n- const babelPlugins = getBabelPlugins(\n- \"javascript\",\n- true,\n- forgetPlaygroundOptions\n- );\n- const babelOptions: TransformOptions = {\n- compact: true,\n- plugins: babelPlugins,\n- filename: \"index.js\",\n- };\n-\n- try {\n- const result = transform(source, babelOptions);\n-\n- \/\/ Don't throw if resulting code is any string. This includes the\n- \/\/ empty string, which is when `source` is an empty string.\n- if (typeof result?.code !== \"string\") {\n- throw new Error(\"Compilation Failed.\");\n- }\n-\n- const context = getMostRecentCompilerContext();\n- \/\/ assign to global for interactive debugging\n- globalThis.Forget$Context = context;\n- const { outputs } = context;\n- let code = result.code;\n-\n- const errors: Array<{ ruleId: string; message: string }> =\n- validateNoUseBeforeDefine(code);\n- \/\/ Filter out parse errors\n- const noUseBeforeDefineErrors =\n- errors != null\n- ? errors.filter((error) => error.ruleId === \"no-use-before-define\")\n- : [];\n- if (noUseBeforeDefineErrors.length !== 0) {\n- const comments = noUseBeforeDefineErrors\n- .map((error) => `\/\/ - ${error.message}`)\n- .join(\"\\n\");\n- code = `\/\/ !!! INVALID OUTPUT !!!!\\n${comments}\\n${code}`;\n- } else if (errors != null && errors.length !== 0) {\n- code = `\/\/ NOTE: Could not validate output, the validator does not yet support JSX\\n${code}`;\n- }\n- outputs[OutputKind.JS] = code;\n-\n- return {\n- outputs,\n- diagnostics: context.diagnostics,\n- };\n- } catch (e) {\n- const context = getMostRecentCompilerContext();\n-\n- return {\n- outputs,\n- diagnostics: context.diagnostics,\n- };\n- }\n-}\ndiff --git a\/compiler\/forget\/packages\/playground\/lib\/defaultStore.ts b\/compiler\/forget\/packages\/playground\/lib\/defaultStore.ts\nindex e9a7d19956..a3759ace32 100644\n--- a\/compiler\/forget\/packages\/playground\/lib\/defaultStore.ts\n+++ b\/compiler\/forget\/packages\/playground\/lib\/defaultStore.ts\n@@ -2,7 +2,6 @@\n * Copyright (c) Facebook, Inc. and its affiliates.\n *\/\n \n-import { createCompilerFlags } from \"babel-plugin-react-forget-legacy\";\n import type { Store } from \".\/stores\";\n \n const index = `\\\n@@ -21,7 +20,6 @@ function fibbonacci(n) {\n \n export const defaultStore: Store = {\n source: index,\n- compilerFlags: createCompilerFlags(),\n };\n \n const minimalIndex = `\\\n@@ -32,10 +30,8 @@ export default function MyApp() {\n \n export const minimalStore: Store = {\n source: minimalIndex,\n- compilerFlags: createCompilerFlags(),\n };\n \n export const emptyStore: Store = {\n source: \"\",\n- compilerFlags: createCompilerFlags(),\n };\ndiff --git a\/compiler\/forget\/packages\/playground\/lib\/dotProgramGenerator.ts b\/compiler\/forget\/packages\/playground\/lib\/dotProgramGenerator.ts\ndeleted file mode 100644\nindex c383998506..0000000000\n--- a\/compiler\/forget\/packages\/playground\/lib\/dotProgramGenerator.ts\n+++ \/dev\/null\n@@ -1,173 +0,0 @@\n-\/*\n- * Copyright (c) Facebook, Inc. and its affiliates.\n- *\/\n-\n-\/\/ TODO: Add transform tests for these.\n-\n-import { SCCGraph, ValGraph } from \"babel-plugin-react-forget-legacy\";\n-import invariant from \"invariant\";\n-\n-const dotPrologue = `\\\n- compound=true;\n- node [shape=rect, fontsize=11];\n-`;\n-\n-export default function genDotProgram(graph: ValGraph | SCCGraph): string {\n- return graph instanceof ValGraph\n- ? genValGraphDotProgram(graph)\n- : genSCCGraphDotProgram(graph);\n-}\n-\n-function genValGraphDotProgram(graph: ValGraph): string {\n- const stmts: string[] = [];\n- \/\/ Stringified Val => Node ID.\n- const nodeTable = new Map();\n-\n- \/\/ Nodes\n- graph.vertices.forEach(({ val }, i) => {\n- const id = `node${i}`;\n- const node = genDotNode(id, val.pretty);\n- stmts.push(node);\n- nodeTable.set(val.toString(), id);\n- });\n-\n- \/\/ Edges (dependency => dependent)\n- graph.vertices.forEach(({ val, incomings }) => {\n- const destinationId = getNodeId(nodeTable, val.toString());\n- incomings.forEach((sourceVal) => {\n- const sourceId = getNodeId(nodeTable, sourceVal.toString());\n- const edge = genDotEdge(sourceId, destinationId);\n- stmts.push(edge);\n- });\n- });\n-\n- return `\\\n- digraph G {\n- ${dotPrologue}\n- ${stmts.join(\"\\n\")}\n- }\n- `;\n-}\n-\n-function genSCCGraphDotProgram(graph: SCCGraph): string {\n- const stmts: string[] = [];\n- \/\/ Stringified SCCVertex => subgraph ID + representative node ID.\n- const subGraphTable = new Map();\n- \/\/ Stringified Val => Node ID.\n- const nodeTable = new Map();\n- let nodeCount = 0;\n-\n- \/\/ Subgraphs\n- graph.vertices.forEach((sccVertex, i) => {\n- const id = `cluster_${i}`;\n-\n- \/\/ Nodes\n- const nodes = sccVertex.members.map(({ val }) => {\n- const nodeId = `node${nodeCount++}`;\n- nodeTable.set(val.toString(), nodeId);\n- return genDotNode(nodeId, val.pretty);\n- });\n-\n- const subgraph = genDotSubgraph(id, nodes);\n- stmts.push(subgraph);\n- subGraphTable.set(sccVertex.toString(), {\n- id,\n- repNodeId: `node${nodeCount - 1}`,\n- });\n- });\n-\n- \/\/ Edges\n- graph.vertices.forEach((sccVertex) => {\n- const { id: destinationId, repNodeId: destinationNodeId } = getSubgraphId(\n- subGraphTable,\n- sccVertex.toString()\n- );\n-\n- \/\/ RedGraph: input node => subgraph\n- sccVertex.inputs.forEach((input) => {\n- const inputNodeId = getNodeId(nodeTable, input.toString());\n- \/\/ Prevent self-loops on reactive inputs.\n- if (inputNodeId !== destinationNodeId) {\n- const edge = genDotEdge(inputNodeId, destinationNodeId, {\n- lhead: destinationId,\n- });\n- stmts.push(edge);\n- }\n- });\n-\n- \/\/ SCCGraph: dependency subgraph => dependent subgraph\n- sccVertex.incomings.forEach((sourceValVertices) => {\n- const stringifiedSCCVertex = `[${sourceValVertices\n- .map(({ val }) => val.toString())\n- .join(\",\")}]`;\n- const { id: sourceId, repNodeId: sourceNodeId } = getSubgraphId(\n- subGraphTable,\n- stringifiedSCCVertex\n- );\n- \/\/ Since Dot doesn't allow connecting two subgraphs directly, we\n- \/\/ instead connect each of their representative nodes and specify\n- \/\/ that the head and tail of the edge should attach to subgraphs instead.\n- const edge = genDotEdge(sourceNodeId, destinationNodeId, {\n- ltail: sourceId,\n- lhead: destinationId,\n- });\n- stmts.push(edge);\n- });\n- });\n-\n- return `\\\n- digraph G {\n- ${dotPrologue}\n- ${stmts.join(\"\\n\")}\n- }\n- `;\n-}\n-\n-function genDotNode(id: string, label: string): string {\n- return `${id} [id=\"${id}\", label=\"${label}\"];`;\n-}\n-\n-function genDotEdge(\n- sourceNode: string,\n- destinationNode: string,\n- options?: { ltail?: string; lhead?: string }\n-): string {\n- const edge = `${sourceNode} -> ${destinationNode}`;\n- const attrs = options\n- ? `[ltail=${options.ltail ?? `\"\"`}, lhead=${\n- options.lhead ?? `\"\"`\n- }, minlen=3]`\n- : undefined;\n- return [edge, attrs].filter(Boolean).join(\" \");\n-}\n-\n-function genDotSubgraph(id: string, stmts: string[]): string {\n- return `\\\n- subgraph ${id} {\n- style=filled;\n- color=\"#EBECF0\";\n- ${stmts.join(\"\\n\")}\n- }\n- `;\n-}\n-\n-function getNodeId(nodeTable: Map, label: string): string {\n- const id = nodeTable.get(label);\n- invariant(id, `Could not find Node ID for label: %s`, label);\n- return id;\n-}\n-\n-interface SubgraphId {\n- id: string;\n- \/\/ The ID of the node representing a subgraph (the last ID in the subgraph).\n- repNodeId: string;\n-}\n-\n-function getSubgraphId(\n- sourceMap: Map,\n- label: string\n-): SubgraphId {\n- const id = sourceMap.get(label);\n- invariant(id, `Could not find subgraph ID for label: %s`, label);\n- return id;\n-}\ndiff --git a\/compiler\/forget\/packages\/playground\/lib\/forgetMonacoDiagnostics.ts b\/compiler\/forget\/packages\/playground\/lib\/forgetMonacoDiagnostics.ts\ndeleted file mode 100644\nindex 9aa3b15701..0000000000\n--- a\/compiler\/forget\/packages\/playground\/lib\/forgetMonacoDiagnostics.ts\n+++ \/dev\/null\n@@ -1,88 +0,0 @@\n-\/*\n- * Copyright (c) Facebook, Inc. and its affiliates.\n- *\/\n-\n-import { Monaco } from \"@monaco-editor\/react\";\n-import { Diagnostic, DiagnosticLevel } from \"babel-plugin-react-forget-legacy\";\n-import { MarkerSeverity, type editor } from \"monaco-editor\";\n-\n-function mapForgetSeverityToMonaco(\n- level: DiagnosticLevel,\n- monaco: Monaco\n-): MarkerSeverity {\n- switch (level) {\n- case DiagnosticLevel.Error:\n- return monaco.MarkerSeverity.Error;\n- case DiagnosticLevel.Warning:\n- return monaco.MarkerSeverity.Warning;\n- default:\n- return monaco.MarkerSeverity.Info;\n- }\n-}\n-\n-function mapForgetDiagnosticToMonacoMarker(\n- { body, code, level, path, suggestion }: Diagnostic,\n- monaco: Monaco\n-): editor.IMarkerData | null {\n- if (path == null || path.node.loc == null) {\n- return null;\n- }\n- const severity = mapForgetSeverityToMonaco(level, monaco);\n- let message = `[${level.toUpperCase()}] ${body} (${code})`;\n- if (suggestion != null) {\n- message = message.concat(`\\n\\n${suggestion}`);\n- }\n- return {\n- severity,\n- message,\n- startLineNumber: path.node.loc.start.line,\n- startColumn: path.node.loc.start.column + 1,\n- endLineNumber: path.node.loc.end.line,\n- endColumn: path.node.loc.end.column + 1,\n- };\n-}\n-\n-type ForgetMarkerConfig = {\n- monaco: Monaco;\n- model: editor.ITextModel;\n- diagnostics: Diagnostic[];\n-};\n-let decorations: string[] = [];\n-export function renderForgetMarkers({\n- monaco,\n- model,\n- diagnostics,\n-}: ForgetMarkerConfig): void {\n- let markers = [];\n- for (const diag of diagnostics) {\n- const marker = mapForgetDiagnosticToMonacoMarker(diag, monaco);\n- if (marker == null) {\n- continue;\n- }\n- markers.push(marker);\n- }\n- if (markers.length > 0) {\n- monaco.editor.setModelMarkers(model, \"owner\", markers);\n- const newDecorations = markers.map((marker) => {\n- return {\n- range: new monaco.Range(\n- marker.startLineNumber,\n- marker.startColumn,\n- marker.endLineNumber,\n- marker.endColumn\n- ),\n- options: {\n- isWholeLine: true,\n- glyphMarginClassName: \"bg-red-300\",\n- },\n- };\n- });\n- decorations = model.deltaDecorations(decorations, newDecorations);\n- } else {\n- monaco.editor.setModelMarkers(model, \"owner\", []);\n- decorations = model.deltaDecorations(\n- model.getAllDecorations().map((d) => d.id),\n- []\n- );\n- }\n-}\ndiff --git a\/compiler\/forget\/packages\/playground\/lib\/stores\/store.ts b\/compiler\/forget\/packages\/playground\/lib\/stores\/store.ts\nindex 2712dcb51b..ca196bd41a 100644\n--- a\/compiler\/forget\/packages\/playground\/lib\/stores\/store.ts\n+++ b\/compiler\/forget\/packages\/playground\/lib\/stores\/store.ts\n@@ -2,12 +2,7 @@\n * Copyright (c) Facebook, Inc. and its affiliates.\n *\/\n \n-import {\n- createCompilerFlags,\n- parseCompilerFlags,\n-} from \"babel-plugin-react-forget-legacy\";\n import invariant from \"invariant\";\n-import { ForgetCompilerFlags } from \"..\/compilerDriver\";\n import { defaultStore } from \"..\/defaultStore\";\n import { codec } from \"..\/utils\";\n \n@@ -16,8 +11,6 @@ import { codec } from \"..\/utils\";\n *\/\n export interface Store {\n source: string;\n-\n- compilerFlags: ForgetCompilerFlags;\n }\n \n \/**\n@@ -34,23 +27,8 @@ export function saveStore(store: Store) {\n * - it has a `source` property and is a string\n *\/\n function getValidStore(raw: any): Store | null {\n- if (\"compilerFlags\" in raw && !(raw[\"compilerFlags\"] instanceof Object)) {\n- return null;\n- }\n const isValidStore = \"source\" in raw && typeof raw[\"source\"] === \"string\";\n if (isValidStore) {\n- if (\"compilerFlags\" in raw) {\n- \/\/ Merge flags from decoded store into flags valid for this compiler version\n- \/\/ Since the compiler is in active dev, if\n- \/\/ - a flag exists in the decoded store but is not supported by the compiler,\n- \/\/ we discard + ignore it\n- \/\/ - a flag does not exist in the decoded store but is used by the compiler,\n- \/\/ we use the default value\n- raw.compilerFlags = parseCompilerFlags(raw.compilerFlags, true);\n- } else {\n- \/\/ some saved Stores may not have `compilerFlags`\n- raw.compilerFlags = createCompilerFlags();\n- }\n return raw;\n } else {\n return null;\ndiff --git a\/compiler\/forget\/packages\/playground\/lib\/utils.ts b\/compiler\/forget\/packages\/playground\/lib\/utils.ts\nindex 04e36830ae..9cb8eceefa 100644\n--- a\/compiler\/forget\/packages\/playground\/lib\/utils.ts\n+++ b\/compiler\/forget\/packages\/playground\/lib\/utils.ts\n@@ -1,10 +1,6 @@\n \/*\n * Copyright (c) Facebook, Inc. and its affiliates.\n *\/\n-import type { PluginItem } from \"@babel\/core\";\n-import ReactForgetBabelPlugin, {\n- CompilerOptions,\n-} from \"babel-plugin-react-forget-legacy\";\n \n \/**\n * Unicode-Base64 Codec.\n@@ -24,21 +20,3 @@ export const codec = {\n return decodeURIComponent(escape(atob(base64)));\n },\n };\n-\n-export function getBabelPlugins(\n- language: string | null,\n- enableForget: boolean,\n- compilerOptions: Partial\n-): PluginItem[] {\n- const babelPlugins: PluginItem[] = [\"syntax-jsx\"];\n- if (language === \"typescript\") {\n- babelPlugins.push([\"transform-typescript\", { isTSX: true }]);\n- } else if (language == \"javascript\") {\n- babelPlugins.push(\"transform-flow-strip-types\");\n- }\n-\n- if (enableForget) {\n- babelPlugins.push([ReactForgetBabelPlugin, compilerOptions]);\n- }\n- return babelPlugins;\n-}\ndiff --git a\/compiler\/forget\/packages\/playground\/scripts\/setup.sh b\/compiler\/forget\/packages\/playground\/scripts\/setup.sh\nindex b2cc8506e0..555a73f844 100755\n--- a\/compiler\/forget\/packages\/playground\/scripts\/setup.sh\n+++ b\/compiler\/forget\/packages\/playground\/scripts\/setup.sh\n@@ -20,17 +20,10 @@ yarn\n yarn build\n yarn link\n \n-cd ..\/babel-plugin-react-forget-legacy\n-echo \"building legacy forget\"\n-yarn\n-yarn build\n-yarn link\n-\n ## Configure the playground itself to use the above locally linked packages\n cd ..\/playground\n echo \"linking playground\"\n yarn link babel-plugin-react-forget\n-yarn link babel-plugin-react-forget-legacy\n yarn link eslint-browser\n \n \n"}

dillon1000/react

Files changed