Merge branch 'move-service' into 'master'

Move service

See merge request !97

editors/editoria/package.json

@@ -4,7 +4,6 @@
   "private": true,
   "dependencies": {
     "@guardian/prosemirror-invisibles": "^1.2.0",
-    "babel-plugin-parameter-decorator": "1.0.12",
     "prosemirror-tables": "^0.9.5",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
@@ -17,7 +16,7 @@
     "wax-prosemirror-themes": "^0.0.6"
   },
   "scripts": {
-    "start": "react-app-rewired start",
+    "start": "lerna run build && react-app-rewired start",
     "test": "react-app-rewired test --env=jsdom",
     "eject": "react-scripts eject"
   },

package.json

@@ -28,6 +28,7 @@
     "@babel/plugin-proposal-decorators": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
+    "babel-plugin-parameter-decorator": "1.0.12",
     "css-loader": "^0.28.11",
     "lerna": "^2.6.0",
     "react-app-rewired": "^2.1.2",

wax-prosemirror-components/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.6",
   "description": "Wax prosemirror UI components",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"

wax-prosemirror-components/rollup.config.js

@@ -18,11 +18,6 @@ export default {
     }),
     babel({
       presets: ["react-app"],
-      plugins: [
-        ["@babel/plugin-proposal-decorators", { legacy: true }],
-        "babel-plugin-parameter-decorator",
-        ["@babel/plugin-proposal-class-properties", { loose: true }]
-      ],
       exclude: "node_modules/**",
       runtimeHelpers: true
     }),

wax-prosemirror-core/index.js

-export { default as Service } from "./src/services/Service";
-export { WaxContext } from "./src/ioc-react";
+export { WaxContext, useInjection } from "./src/ioc-react";
 export { default as Wax } from "./src/Wax";
-export {
-  default as componentPlugin
-} from "./src/services/LayoutService/components/componentPlugin";

wax-prosemirror-core/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.6",
   "description": "Wax prosemirror core",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"

wax-prosemirror-core/rollup.config.js

@@ -20,8 +20,7 @@ export default {
       presets: ["react-app"],
       plugins: [
         ["@babel/plugin-proposal-decorators", { legacy: true }],
-        "babel-plugin-parameter-decorator",
-        ["@babel/plugin-proposal-class-properties", { loose: true }]
+        "babel-plugin-parameter-decorator"
       ],
       exclude: "node_modules/**",
       runtimeHelpers: true

wax-prosemirror-core/src/config/defaultConfig.js

-import LayoutService from "../services/LayoutService/LayoutService";
 import {
   SchemaService,
   MenuService,
   RulesService,
-  ShortCutsService
+  ShortCutsService,
+  LayoutService
 } from "wax-prosemirror-services";
 
 export default {

wax-prosemirror-layouts/index.js

 export { default as EditoriaLayout } from "./src/layouts/EditoriaLayout";
-export { default as DefaultLayout } from "./src/layouts/DefaultLayout";

wax-prosemirror-layouts/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.6",
   "description": "Wax prosemirror layouts",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"

wax-prosemirror-layouts/rollup.config.js

@@ -18,11 +18,6 @@ export default {
     }),
     babel({
       presets: ["react-app"],
-      plugins: [
-        ["@babel/plugin-proposal-decorators", { legacy: true }],
-        "babel-plugin-parameter-decorator",
-        ["@babel/plugin-proposal-class-properties", { loose: true }]
-      ],
       exclude: "node_modules/**",
       runtimeHelpers: true
     }),

wax-prosemirror-layouts/src/layouts/EditoriaLayout.js

 import React, { useContext } from "react";
 import styled, { ThemeProvider } from "styled-components";
 import { InfoArea } from "wax-prosemirror-components";
-import { componentPlugin, Service } from "wax-prosemirror-core";
+import { componentPlugin } from "wax-prosemirror-services";
 import EditorElements from "./EditorElements";
 import { cokoTheme } from "wax-prosemirror-themes";
 import { DocumentHelpers } from "wax-prosemirror-utilities";

wax-prosemirror-plugins/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.6",
   "description": "Wax prosemirror plugins",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"

wax-prosemirror-plugins/rollup.config.js

@@ -17,12 +17,6 @@ export default {
       includeDependencies: true
     }),
     babel({
-      presets: ["react-app"],
-      plugins: [
-        ["@babel/plugin-proposal-decorators", { legacy: true }],
-        "babel-plugin-parameter-decorator",
-        ["@babel/plugin-proposal-class-properties", { loose: true }]
-      ],
       exclude: "node_modules/**",
       runtimeHelpers: true
     }),

wax-prosemirror-schema/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.6",
   "description": "Wax prosemirror schema",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"

wax-prosemirror-schema/rollup.config.js

@@ -17,12 +17,6 @@ export default {
       includeDependencies: true
     }),
     babel({
-      presets: ["react-app"],
-      plugins: [
-        ["@babel/plugin-proposal-decorators", { legacy: true }],
-        "babel-plugin-parameter-decorator",
-        ["@babel/plugin-proposal-class-properties", { loose: true }]
-      ],
       exclude: "node_modules/**",
       runtimeHelpers: true
     }),

wax-prosemirror-services/index.js

+export {
+  default as componentPlugin
+} from "./src/LayoutService/components/componentPlugin";
+export { default as LayoutService } from "./src/LayoutService/LayoutService";
 export { default as MenuService } from "./src/MenuService/MenuService";
 export { default as LinkService } from "./src/LinkService/LinkService";
 export {

wax-prosemirror-services/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.6",
   "description": "Wax prosemirror services",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"

wax-prosemirror-services/rollup.config.js

@@ -4,7 +4,7 @@ import external from "rollup-plugin-peer-deps-external";
 import { terser } from "rollup-plugin-terser";
 
 export default {
-  input: "./index.js",
+  input: "index.js",
   output: [
     {
       file: "dist/index.js",
@@ -20,8 +20,7 @@ export default {
       presets: ["react-app"],
       plugins: [
         ["@babel/plugin-proposal-decorators", { legacy: true }],
-        "babel-plugin-parameter-decorator",
-        ["@babel/plugin-proposal-class-properties", { loose: true }]
+        "babel-plugin-parameter-decorator"
       ],
       exclude: "node_modules/**",
       runtimeHelpers: true
@@ -35,6 +34,7 @@ export default {
     "react-dom",
     "wax-prosemirror-schema",
     "lodash",
-    "prosemirror-tables"
+    "prosemirror-tables",
+    "prosemirror-schema-list"
   ]
 };

wax-prosemirror-services/src/BaseService/BaseService.js

-import { Service } from "wax-prosemirror-core";
+import Service from "../Service";
 import BaseServices from "./index";
 
 class BaseService extends Service {