From 0ce42c1cb7d7aaf830e1b7f055fb47684219e1e0 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Wed, 30 Jun 2021 08:44:29 +0200 Subject: [PATCH] core-plugin -> @remix-project --- apps/remix-ide/src/app.js | 10 +++++----- apps/remix-ide/src/app/files/fileProvider.js | 2 +- apps/remix-ide/src/app/ui/landing-page/landing-page.js | 2 +- apps/remix-ide/src/lib/cmdInterpreterAPI.js | 2 +- libs/remix-core-plugin/compiler-artefacts/package.json | 2 +- .../compiler-content-imports/package.json | 2 +- .../compiler-fetch-and-compile/package.json | 2 +- libs/remix-core-plugin/compiler-metadata/package.json | 2 +- .../offset-line-to-column-converter/package.json | 2 +- nx.json | 2 +- package-lock.json | 6 ------ tsconfig.json | 10 +++++----- 12 files changed, 19 insertions(+), 25 deletions(-) diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js index 520f32d31a..ed7f86fc1b 100644 --- a/apps/remix-ide/src/app.js +++ b/apps/remix-ide/src/app.js @@ -17,11 +17,11 @@ 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-core-plugin/compiler-artefacts' -import { CompilerImports } from '@remix-core-plugin/compiler-content-imports' -import { FetchAndCompile } from '@remix-core-plugin/compiler-fetch-and-compile' -import { OffsetToLineColumnConverter } from '@remix-core-plugin/offset-line-to-column-converter' -import { CompilerMetadata } from '@remix-core-plugin/compiler-metadata' +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 migrateFileSystem from './migrateFileSystem' diff --git a/apps/remix-ide/src/app/files/fileProvider.js b/apps/remix-ide/src/app/files/fileProvider.js index 288eabe518..ef8f9f8a93 100644 --- a/apps/remix-ide/src/app/files/fileProvider.js +++ b/apps/remix-ide/src/app/files/fileProvider.js @@ -1,6 +1,6 @@ 'use strict' -import { CompilerImports } from '@remix-core-plugin/compiler-content-imports' +import { CompilerImports } from '@remix-project/compiler-content-imports' const EventManager = require('events') const modalDialogCustom = require('../ui/modal-dialog-custom') const tooltip = require('../ui/tooltip') diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js index 7f02892809..039c47fb92 100644 --- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js +++ b/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-core-plugin/compiler-content-imports' +import { CompilerImports } from '@remix-project/compiler-content-imports' import JSZip from 'jszip' const yo = require('yo-yo') diff --git a/apps/remix-ide/src/lib/cmdInterpreterAPI.js b/apps/remix-ide/src/lib/cmdInterpreterAPI.js index e8bb3e000e..7717e4b7d4 100644 --- a/apps/remix-ide/src/lib/cmdInterpreterAPI.js +++ b/apps/remix-ide/src/lib/cmdInterpreterAPI.js @@ -1,5 +1,5 @@ 'use strict' -import { CompilerImports } from '@remix-core-plugin/compiler-content-imports' +import { CompilerImports } from '@remix-project/compiler-content-imports' var yo = require('yo-yo') var async = require('async') var EventManager = require('../lib/events') diff --git a/libs/remix-core-plugin/compiler-artefacts/package.json b/libs/remix-core-plugin/compiler-artefacts/package.json index 046a760da7..55606a6759 100644 --- a/libs/remix-core-plugin/compiler-artefacts/package.json +++ b/libs/remix-core-plugin/compiler-artefacts/package.json @@ -1,5 +1,5 @@ { - "name": "@remix-core-plugin/compiler-artefacts", + "name": "@remix-project/compiler-artefacts", "version": "0.0.1", "description": "This library was generated with [Nx](https://nx.dev).", "main": "index.js", diff --git a/libs/remix-core-plugin/compiler-content-imports/package.json b/libs/remix-core-plugin/compiler-content-imports/package.json index 95af3c807c..3124552151 100644 --- a/libs/remix-core-plugin/compiler-content-imports/package.json +++ b/libs/remix-core-plugin/compiler-content-imports/package.json @@ -1,5 +1,5 @@ { - "name": "@remix-core-plugin/compiler-content-imports", + "name": "@remix-project/compiler-content-imports", "version": "0.0.1", "description": "This library was generated with [Nx](https://nx.dev).", "main": "index.js", diff --git a/libs/remix-core-plugin/compiler-fetch-and-compile/package.json b/libs/remix-core-plugin/compiler-fetch-and-compile/package.json index 05dfdb3372..0e41b098a3 100644 --- a/libs/remix-core-plugin/compiler-fetch-and-compile/package.json +++ b/libs/remix-core-plugin/compiler-fetch-and-compile/package.json @@ -1,5 +1,5 @@ { - "name": "@remix-core-plugin/compiler-fetch-and-compile", + "name": "@remix-project/compiler-fetch-and-compile", "version": "0.0.1", "description": "This library was generated with [Nx](https://nx.dev).", "main": "index.js", diff --git a/libs/remix-core-plugin/compiler-metadata/package.json b/libs/remix-core-plugin/compiler-metadata/package.json index f8a22f5ab6..1b0c0ef678 100644 --- a/libs/remix-core-plugin/compiler-metadata/package.json +++ b/libs/remix-core-plugin/compiler-metadata/package.json @@ -1,5 +1,5 @@ { - "name": "@remix-core-plugin/compiler-metadata", + "name": "@remix-project/compiler-metadata", "version": "0.0.1", "description": "This library was generated with [Nx](https://nx.dev).", "main": "index.js", diff --git a/libs/remix-core-plugin/offset-line-to-column-converter/package.json b/libs/remix-core-plugin/offset-line-to-column-converter/package.json index 761b79682e..4554680180 100644 --- a/libs/remix-core-plugin/offset-line-to-column-converter/package.json +++ b/libs/remix-core-plugin/offset-line-to-column-converter/package.json @@ -1,5 +1,5 @@ { - "name": "@remix-core-plugin/offset-line-to-column-converter", + "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", diff --git a/nx.json b/nx.json index 3549933180..0c247fcf7c 100644 --- a/nx.json +++ b/nx.json @@ -104,7 +104,7 @@ }, "compiler-artefacts": { "tags": [], - "implicitDependencies": ["remix-lib"] + "implicitDependencies": ["remix-lib", "remix-solidity"] }, "compiler-fetch-and-compile": { "tags": [] diff --git a/package-lock.json b/package-lock.json index fb58209d79..c2707a9707 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17553,12 +17553,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "optional": true - }, "fstream": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", diff --git a/tsconfig.json b/tsconfig.json index bf1134b50c..5f0dc24d8f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -41,19 +41,19 @@ "@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-core-plugin/compiler-artefacts": [ + "@remix-project/compiler-artefacts": [ "libs/remix-core-plugin/compiler-artefacts/src/index.ts" ], - "@remix-core-plugin/compiler-fetch-and-compile": [ + "@remix-project/compiler-fetch-and-compile": [ "libs/remix-core-plugin/compiler-fetch-and-compile/src/index.ts" ], - "@remix-core-plugin/compiler-content-imports": [ + "@remix-project/compiler-content-imports": [ "libs/remix-core-plugin/compiler-content-imports/src/index.ts" ], - "@remix-core-plugin/offset-line-to-column-converter": [ + "@remix-project/offset-line-to-column-converter": [ "libs/remix-core-plugin/offset-line-to-column-converter/src/index.ts" ], - "@remix-core-plugin/compiler-metadata": [ + "@remix-project/compiler-metadata": [ "libs/remix-core-plugin/compiler-metadata/src/index.ts" ] }