mv to core-plugin package

apps/remix-ide/src/app.js

@@ -17,11 +17,7 @@ import { VerticalIcons } from './app/components/vertical-icons'
 import { LandingPage } from './app/ui/landing-page/landing-page'
 import { MainPanel } from './app/components/main-panel'
 
-import { CompilerArtefacts } from '@remix-project/compiler-artefacts'
-import { CompilerImports } from '@remix-project/compiler-content-imports'
-import { FetchAndCompile } from '@remix-project/compiler-fetch-and-compile'
-import { OffsetToLineColumnConverter } from '@remix-project/offset-line-to-column-converter'
-import { CompilerMetadata } from '@remix-project/compiler-metadata'
+import { OffsetToLineColumnConverter, CompilerMetadata, CompilerArtefacts, FetchAndCompile, CompilerImports } from '@remix-project/core-plugin'
 
 import migrateFileSystem from './migrateFileSystem'
 

apps/remix-ide/src/app/files/fileProvider.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { CompilerImports } from '@remix-project/compiler-content-imports'
+import { CompilerImports } from '@remix-project/core-plugin'
 const EventManager = require('events')
 const modalDialogCustom = require('../ui/modal-dialog-custom')
 const tooltip = require('../ui/tooltip')

apps/remix-ide/src/app/ui/landing-page/landing-page.js

@@ -1,7 +1,7 @@
 import * as packageJson from '../../../../../../package.json'
 import { ViewPlugin } from '@remixproject/engine-web'
 import { migrateToWorkspace } from '../../../migrateFileSystem'
-import { CompilerImports } from '@remix-project/compiler-content-imports'
+import { CompilerImports } from '@remix-project/core-plugin'
 import JSZip from 'jszip'
 
 const yo = require('yo-yo')

apps/remix-ide/src/lib/cmdInterpreterAPI.js

@@ -1,5 +1,5 @@
 'use strict'
-import { CompilerImports } from '@remix-project/compiler-content-imports'
+import { CompilerImports } from '@remix-project/core-plugin'
 var yo = require('yo-yo')
 var async = require('async')
 var EventManager = require('../lib/events')

libs/remix-core-plugin/.eslintrc

@@ -0,0 +1 @@
+{ "extends": "../../.eslintrc", "rules": {}, "ignorePatterns": ["!**/*"] }

libs/remix-core-plugin/README.md

@@ -1,3 +1,3 @@
-# compiler-content-imports
+# remix-core-plugin-core-plugin
 
 This library was generated with [Nx](https://nx.dev).

libs/remix-core-plugin/compiler-artefacts/.eslintrc

@@ -1 +0,0 @@
-{ "extends": "../../../.eslintrc", "rules": {}, "ignorePatterns": ["!**/*"] }

libs/remix-core-plugin/compiler-artefacts/README.md

@@ -1,3 +0,0 @@
-# compiler-artefacts
-
-This library was generated with [Nx](https://nx.dev).

libs/remix-core-plugin/compiler-artefacts/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "@remix-project/compiler-artefacts",
-  "version": "0.0.1",
-  "description": "This library was generated with [Nx](https://nx.dev).",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Remix Team",
-  "license": "ISC"
-}

libs/remix-core-plugin/compiler-artefacts/src/index.ts

@@ -1 +0,0 @@
-export * from './lib/compiler-artefacts'

libs/remix-core-plugin/compiler-artefacts/tsconfig.lib.json

@@ -1,12 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "module": "commonjs",
-    "outDir": "../../../dist/out-tsc",
-    "declaration": true,
-    "rootDir": "./src",
-    "types": ["node"]
-  },
-  "exclude": ["**/*.spec.ts"],
-  "include": ["**/*.ts"]
-}

libs/remix-core-plugin/compiler-content-imports/.eslintrc

@@ -1 +0,0 @@
-{ "extends": "../../../.eslintrc", "rules": {}, "ignorePatterns": ["!**/*"] }

libs/remix-core-plugin/compiler-content-imports/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "@remix-project/compiler-content-imports",
-  "version": "0.0.1",
-  "description": "This library was generated with [Nx](https://nx.dev).",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Remix Team",
-  "license": "ISC"
-}

libs/remix-core-plugin/compiler-content-imports/src/index.ts

@@ -1 +0,0 @@
-export * from './lib/compiler-content-imports'

libs/remix-core-plugin/compiler-content-imports/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "extends": "../../../tsconfig.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    }
-  ]
-}

libs/remix-core-plugin/compiler-fetch-and-compile/.eslintrc

@@ -1 +0,0 @@
-{ "extends": "../../../.eslintrc", "rules": {}, "ignorePatterns": ["!**/*"] }

libs/remix-core-plugin/compiler-fetch-and-compile/README.md

@@ -1,3 +0,0 @@
-# compiler-fetch-and-compile
-
-This library was generated with [Nx](https://nx.dev).

libs/remix-core-plugin/compiler-fetch-and-compile/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "@remix-project/compiler-fetch-and-compile",
-  "version": "0.0.1",
-  "description": "This library was generated with [Nx](https://nx.dev).",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Remix Team",
-  "license": "ISC"
-}

libs/remix-core-plugin/compiler-fetch-and-compile/src/index.ts

@@ -1 +0,0 @@
-export * from './lib/compiler-fetch-and-compile'

libs/remix-core-plugin/compiler-fetch-and-compile/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "extends": "../../../tsconfig.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    }
-  ]
-}

libs/remix-core-plugin/compiler-fetch-and-compile/tsconfig.lib.json

@@ -1,12 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "module": "commonjs",
-    "outDir": "../../../dist/out-tsc",
-    "declaration": true,
-    "rootDir": "./src",
-    "types": ["node"]
-  },
-  "exclude": ["**/*.spec.ts"],
-  "include": ["**/*.ts"]
-}

libs/remix-core-plugin/compiler-metadata/.eslintrc

@@ -1 +0,0 @@
-{ "extends": "../../../.eslintrc", "rules": {}, "ignorePatterns": ["!**/*"] }

libs/remix-core-plugin/compiler-metadata/README.md

@@ -1,3 +0,0 @@
-# remix-core-plugin-compiler-metadata
-
-This library was generated with [Nx](https://nx.dev).

libs/remix-core-plugin/compiler-metadata/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "@remix-project/compiler-metadata",
-  "version": "0.0.1",
-  "description": "This library was generated with [Nx](https://nx.dev).",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Remix Team",
-  "license": "ISC"
-}

libs/remix-core-plugin/compiler-metadata/src/index.ts

@@ -1 +0,0 @@
-export * from './lib/compiler-metadata'

libs/remix-core-plugin/compiler-metadata/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "extends": "../../../tsconfig.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    }
-  ]
-}

libs/remix-core-plugin/compiler-metadata/tsconfig.lib.json

@@ -1,12 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "module": "commonjs",
-    "outDir": "../../../dist/out-tsc",
-    "declaration": true,
-    "rootDir": "./src",
-    "types": ["node"]
-  },
-  "exclude": ["**/*.spec.ts"],
-  "include": ["**/*.ts"]
-}

libs/remix-core-plugin/offset-line-to-column-converter/.eslintrc

@@ -1 +0,0 @@
-{ "extends": "../../../.eslintrc", "rules": {}, "ignorePatterns": ["!**/*"] }

libs/remix-core-plugin/offset-line-to-column-converter/README.md

@@ -1,3 +0,0 @@
-# offset-line-to-column-converter
-
-This library was generated with [Nx](https://nx.dev).

libs/remix-core-plugin/offset-line-to-column-converter/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "@remix-project/offset-line-to-column-converter",
-  "version": "0.0.1",
-  "description": "This library was generated with [Nx](https://nx.dev).",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Remix Team",
-  "license": "ISC"
-}

libs/remix-core-plugin/offset-line-to-column-converter/src/index.ts

@@ -1 +0,0 @@
-export * from './lib/offset-line-to-column-converter'

libs/remix-core-plugin/offset-line-to-column-converter/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "extends": "../../../tsconfig.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    }
-  ]
-}

libs/remix-core-plugin/offset-line-to-column-converter/tsconfig.lib.json

@@ -1,12 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "module": "commonjs",
-    "outDir": "../../../dist/out-tsc",
-    "declaration": true,
-    "rootDir": "./src",
-    "types": ["node"]
-  },
-  "exclude": ["**/*.spec.ts"],
-  "include": ["**/*.ts"]
-}

libs/remix-core-plugin/package.json

@@ -0,0 +1,12 @@
+{
+    "name": "@remix-project/core-plugin",
+    "version": "0.0.1",
+    "description": "This library was generated with [Nx](https://nx.dev).",
+    "main": "index.js",
+    "scripts": {
+      "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "author": "Remix Team",
+    "license": "ISC"
+  }
+  

libs/remix-core-plugin/src/index.ts

@@ -0,0 +1,4 @@
+export * from './lib/offset-line-to-column-converter'
+export * from './lib/compiler-metadata'
+export * from './lib/compiler-fetch-and-compile'
+export * from './lib/offset-line-to-column-converter'

libs/remix-core-plugin/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "files": [],
   "include": [],
   "references": [

libs/remix-core-plugin/tsconfig.lib.json

@@ -2,7 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "../../../dist/out-tsc",
+    "outDir": "../../dist/out-tsc",
     "declaration": true,
     "rootDir": "./src",
     "types": ["node"]

nx.json

@@ -102,20 +102,7 @@
     "remix-ui-checkbox": {
       "tags": []
     },
-    "compiler-artefacts": {
-      "tags": [],
-      "implicitDependencies": ["remix-lib", "remix-solidity"]
-    },
-    "compiler-fetch-and-compile": {
-      "tags": []
-    },
-    "compiler-content-imports": {
-      "tags": []
-    },
-    "offset-line-to-column-converter": {
-      "tags": []
-    },
-    "compiler-metadata": {
+    "remix-core-plugin": {
       "tags": []
     }
   }

tsconfig.json

@@ -39,22 +39,12 @@
       "@remix-ui/toaster": ["libs/remix-ui/toaster/src/index.ts"],
       "@remix-ui/file-explorer": ["libs/remix-ui/file-explorer/src/index.ts"],
       "@remix-ui/workspace": ["libs/remix-ui/workspace/src/index.ts"],
-      "@remix-ui/static-analyser": ["libs/remix-ui/static-analyser/src/index.ts"],
-      "@remix-ui/checkbox": ["libs/remix-ui/checkbox/src/index.ts"],
-      "@remix-project/compiler-artefacts": [
-        "libs/remix-core-plugin/compiler-artefacts/src/index.ts"
-      ],
-      "@remix-project/compiler-fetch-and-compile": [
-        "libs/remix-core-plugin/compiler-fetch-and-compile/src/index.ts"
-      ],
-      "@remix-project/compiler-content-imports": [
-        "libs/remix-core-plugin/compiler-content-imports/src/index.ts"
+      "@remix-ui/static-analyser": [
+        "libs/remix-ui/static-analyser/src/index.ts"
       ],
-      "@remix-project/offset-line-to-column-converter": [
-        "libs/remix-core-plugin/offset-line-to-column-converter/src/index.ts"
-      ],
-      "@remix-project/compiler-metadata": [
-        "libs/remix-core-plugin/compiler-metadata/src/index.ts"
+      "@remix-ui/checkbox": ["libs/remix-ui/checkbox/src/index.ts"],
+      "@remix-project/core-plugin": [
+        "libs/remix-core-plugin/src/index.ts"
       ]
     }
   },

workspace.json

@@ -761,9 +761,9 @@
         }
       }
     },
-    "compiler-artefacts": {
-      "root": "libs/remix-core-plugin/compiler-artefacts",
-      "sourceRoot": "libs/remix-core-plugin/compiler-artefacts/src",
+    "remix-core-plugin": {
+      "root": "libs/remix-core-plugin",
+      "sourceRoot": "libs/remix-core-plugin/src",
       "projectType": "library",
       "schematics": {},
       "architect": {
@@ -772,141 +772,21 @@
           "options": {
             "linter": "eslint",
             "tsConfig": [
-              "libs/remix-core-plugin/compiler-artefacts/tsconfig.lib.json"
+              "libs/remix-core-plugin/tsconfig.lib.json"
             ],
             "exclude": [
               "**/node_modules/**",
-              "!libs/remix-core-plugin/compiler-artefacts/**/*"
+              "!libs/remix-core-plugin/**/*"
             ]
           }
         },
         "build": {
           "builder": "@nrwl/node:package",
           "options": {
-            "outputPath": "dist/libs/core-plugin/compiler-artefacts",
-            "tsConfig": "libs/remix-core-plugin/compiler-artefacts/tsconfig.lib.json",
-            "packageJson": "libs/remix-core-plugin/compiler-artefacts/package.json",
-            "main": "libs/remix-core-plugin/compiler-artefacts/src/index.ts"
-          }
-        }
-      }
-    },
-    "compiler-fetch-and-compile": {
-      "root": "libs/remix-core-plugin/compiler-fetch-and-compile",
-      "sourceRoot": "libs/remix-core-plugin/compiler-fetch-and-compile/src",
-      "projectType": "library",
-      "schematics": {},
-      "architect": {
-        "lint": {
-          "builder": "@nrwl/linter:lint",
-          "options": {
-            "linter": "eslint",
-            "tsConfig": [
-              "libs/remix-core-plugin/compiler-fetch-and-compile/tsconfig.lib.json"
-            ],
-            "exclude": [
-              "**/node_modules/**",
-              "!libs/remix-core-plugin/compiler-fetch-and-compile/**/*"
-            ]
-          }
-        },
-        "build": {
-          "builder": "@nrwl/node:package",
-          "options": {
-            "outputPath": "dist/libs/core-plugin/compiler-fetch-and-compile",
-            "tsConfig": "libs/remix-core-plugin/compiler-fetch-and-compile/tsconfig.lib.json",
-            "packageJson": "libs/remix-core-plugin/compiler-fetch-and-compile/package.json",
-            "main": "libs/remix-core-plugin/compiler-fetch-and-compile/src/index.ts"
-          }
-        }
-      }
-    },
-    "compiler-content-imports": {
-      "root": "libs/remix-core-plugin/compiler-content-imports",
-      "sourceRoot": "libs/remix-core-plugin/compiler-content-imports/src",
-      "projectType": "library",
-      "schematics": {},
-      "architect": {
-        "lint": {
-          "builder": "@nrwl/linter:lint",
-          "options": {
-            "linter": "eslint",
-            "tsConfig": [
-              "libs/remix-core-plugin/compiler-content-imports/tsconfig.lib.json"
-            ],
-            "exclude": [
-              "**/node_modules/**",
-              "!libs/remix-core-plugin/compiler-content-imports/**/*"
-            ]
-          }
-        },
-        "build": {
-          "builder": "@nrwl/node:package",
-          "options": {
-            "outputPath": "dist/libs/core-plugin/compiler-content-imports",
-            "tsConfig": "libs/remix-core-plugin/compiler-content-imports/tsconfig.lib.json",
-            "packageJson": "libs/remix-core-plugin/compiler-content-imports/package.json",
-            "main": "libs/remix-core-plugin/compiler-content-imports/src/index.ts"
-          }
-        }
-      }
-    },
-    "offset-line-to-column-converter": {
-      "root": "libs/remix-core-plugin/offset-line-to-column-converter",
-      "sourceRoot": "libs/remix-core-plugin/offset-line-to-column-converter/src",
-      "projectType": "library",
-      "schematics": {},
-      "architect": {
-        "lint": {
-          "builder": "@nrwl/linter:lint",
-          "options": {
-            "linter": "eslint",
-            "tsConfig": [
-              "libs/remix-core-plugin/offset-line-to-column-converter/tsconfig.lib.json"
-            ],
-            "exclude": [
-              "**/node_modules/**",
-              "!libs/remix-core-plugin/offset-line-to-column-converter/**/*"
-            ]
-          }
-        },
-        "build": {
-          "builder": "@nrwl/node:package",
-          "options": {
-            "outputPath": "dist/libs/core-plugin/offset-line-to-column-converter",
-            "tsConfig": "libs/remix-core-plugin/offset-line-to-column-converter/tsconfig.lib.json",
-            "packageJson": "libs/remix-core-plugin/offset-line-to-column-converter/package.json",
-            "main": "libs/remix-core-plugin/coffset-line-to-column-converter/src/index.ts"
-          }
-        }
-      }
-    },
-    "compiler-metadata": {
-      "root": "libs/remix-core-plugin/compiler-metadata",
-      "sourceRoot": "libs/remix-core-plugin/compiler-metadata/src",
-      "projectType": "library",
-      "schematics": {},
-      "architect": {
-        "lint": {
-          "builder": "@nrwl/linter:lint",
-          "options": {
-            "linter": "eslint",
-            "tsConfig": [
-              "libs/remix-core-plugin/compiler-metadata/tsconfig.lib.json"
-            ],
-            "exclude": [
-              "**/node_modules/**",
-              "!libs/remix-core-plugin/compiler-metadata/**/*"
-            ]
-          }
-        },
-        "build": {
-          "builder": "@nrwl/node:package",
-          "options": {
-            "outputPath": "dist/libs/core-plugin/compiler-metadata",
-            "tsConfig": "libs/remix-core-plugin/compiler-metadata/tsconfig.lib.json",
-            "packageJson": "libs/remix-core-plugin/compiler-metadata/package.json",
-            "main": "libs/remix-core-plugin/compiler-metadata/src/index.ts"
+            "outputPath": "dist/libs/core-plugin",
+            "tsConfig": "libs/remix-core-plugin/tsconfig.lib.json",
+            "packageJson": "libs/remix-core-plugin/package.json",
+            "main": "libs/remix-core-plugin/src/index.ts"
           }
         }
       }