Bumped version 6.0.0 -> 7.0.0

atularen · Feb 24, 2019 · 74bce1d · 74bce1d
1 parent a64309d
commit 74bce1d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5,567 deletions.
diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
  - Angular <= 4: v3.x.x
  - Angular 5: v5.x.x
  - Angular 6: v6.x.x
+ - Angular 7: v7.x.x
 
 Using this Module you can utilize the Monaco Editor as an Angular Component. Feel free to contribute, raise feature requests and make it better.
 
@@ -17,9 +18,9 @@ Install from npm repository:
 npm install ngx-monaco-editor --save
  ```
 
-For angular version 5 use v5.x.x
+For angular version 6 use v6.x.x
 ```
-npm install ngx-monaco-editor@5.0.0 --save
+npm install ngx-monaco-editor@6.0.0 --save
  ```
 
 Add the glob to assets in .angular-cli.json (to make monaco-editor lib available to the app):
@@ -185,32 +186,35 @@ import { MonacoEditorModule, NgxMonacoEditorConfig } from 'ngx-monaco-editor';
 import { AppComponent } from './app.component';
 
 const monacoConfig: NgxMonacoEditorConfig = {
-  onMonacoLoad: () => { 
-    const id = "foo.json";
+  baseUrl: 'assets',
+  defaultOptions: { scrollBeyondLastLine: false },
+  onMonacoLoad: () => {
+    console.log((window as any).monaco);
+    const uri = monaco.Uri.parse('a://b/foo.json');
     monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
       validate: true,
       schemas: [{
-        uri: "http://myserver/foo-schema.json",
-        fileMatch: [id],
+        uri: 'http://myserver/foo-schema.json',
+        fileMatch: [uri.toString()],
         schema: {
-          type: "object",
+          type: 'object',
           properties: {
             p1: {
-              enum: [ "v1", "v2"]
+              enum: ['v1', 'v2']
             },
             p2: {
-              $ref: "http://myserver/bar-schema.json"
+              $ref: 'http://myserver/bar-schema.json'
             }
           }
         }
-      },{
-        uri: "http://myserver/bar-schema.json",
-        fileMatch: [id],
+      }, {
+        uri: 'http://myserver/bar-schema.json',
+        fileMatch: [uri.toString()],
         schema: {
-          type: "object",
+          type: 'object',
           properties: {
             q1: {
-              enum: [ "x1", "x2"]
+              enum: ['x1', 'x2']
             }
           }
         }
@@ -257,7 +261,7 @@ export class AppComponent {
   model: NgxEditorModel = {
     value: this.jsonCode,
     language: 'json',
-    uri: 'foo.json'
+    uri: monaco.Uri.parse('a://b/foo.json')
   };
 }
 ```

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-monaco-editor",
-  "version": "2.0.1",
+  "version": "7.0.0",
   "description": "Monaco Code Editor For Angular",
   "keywords": [
     "angular",
@@ -18,7 +18,7 @@
     "lint": "ng lint",
     "e2e": "ng e2e",
     "build-editor": "npm run copy:readme && npm run copy:typings && ng build editor && npm run copy:types && npm run copy:editor",
-    "npm-publish": "npm run build && bash scripts/npm-publish",
+    "npm-publish": "npm run build-editor && bash scripts/npm-publish",
     "copy:typings": "cp node_modules/monaco-editor/monaco.d.ts projects/editor/src/lib",
     "copy:types": "cp node_modules/monaco-editor/monaco.d.ts dist/editor",
     "copy:readme": "cp -rf README.md projects/editor/",

diff --git a/projects/editor/package.json b/projects/editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-monaco-editor",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "private": false,
   "description": "Monaco Code Editor for Angular",
   "keywords": [