From d12360ad8b3818aad4c717d998fc91ed258e331a Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Thu, 23 Apr 2020 00:19:29 +0300
Subject: [PATCH] move default layout
---
editors/editoria/package.json | 1 -
package.json | 1 +
wax-prosemirror-components/rollup.config.js | 5 -----
wax-prosemirror-core/rollup.config.js | 3 +--
.../LayoutService/DefaultLayout}/DefaultLayout.js | 0
wax-prosemirror-core/src/services/LayoutService/Layout.js | 2 +-
wax-prosemirror-layouts/index.js | 1 -
wax-prosemirror-layouts/rollup.config.js | 5 -----
wax-prosemirror-plugins/rollup.config.js | 6 ------
wax-prosemirror-schema/rollup.config.js | 6 ------
wax-prosemirror-services/rollup.config.js | 8 ++++----
wax-prosemirror-themes/rollup.config.js | 6 ------
wax-prosemirror-utilities/rollup.config.js | 6 ------
13 files changed, 7 insertions(+), 43 deletions(-)
rename {wax-prosemirror-layouts/src/layouts => wax-prosemirror-core/src/services/LayoutService/DefaultLayout}/DefaultLayout.js (100%)
diff --git a/editors/editoria/package.json b/editors/editoria/package.json
index 2ab7378db..348c35c63 100644
--- a/editors/editoria/package.json
+++ b/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",
diff --git a/package.json b/package.json
index 5ddabbba9..c5a676d18 100644
--- a/package.json
+++ b/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",
diff --git a/wax-prosemirror-components/rollup.config.js b/wax-prosemirror-components/rollup.config.js
index 15a09995a..8d989b437 100644
--- a/wax-prosemirror-components/rollup.config.js
+++ b/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
}),
diff --git a/wax-prosemirror-core/rollup.config.js b/wax-prosemirror-core/rollup.config.js
index 64b68c896..9ffc2c249 100644
--- a/wax-prosemirror-core/rollup.config.js
+++ b/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
diff --git a/wax-prosemirror-layouts/src/layouts/DefaultLayout.js b/wax-prosemirror-core/src/services/LayoutService/DefaultLayout/DefaultLayout.js
similarity index 100%
rename from wax-prosemirror-layouts/src/layouts/DefaultLayout.js
rename to wax-prosemirror-core/src/services/LayoutService/DefaultLayout/DefaultLayout.js
diff --git a/wax-prosemirror-core/src/services/LayoutService/Layout.js b/wax-prosemirror-core/src/services/LayoutService/Layout.js
index 59bf0f1f4..229d6eca8 100644
--- a/wax-prosemirror-core/src/services/LayoutService/Layout.js
+++ b/wax-prosemirror-core/src/services/LayoutService/Layout.js
@@ -1,5 +1,5 @@
import { injectable } from "inversify";
-import { DefaultLayout } from "wax-prosemirror-layouts";
+import DefaultLayout from "./DefaultLayout/DefaultLayout";
import LayoutFactory from "./components/LayoutFactory";
@injectable()
diff --git a/wax-prosemirror-layouts/index.js b/wax-prosemirror-layouts/index.js
index 6ea69e16e..c48bf92d5 100644
--- a/wax-prosemirror-layouts/index.js
+++ b/wax-prosemirror-layouts/index.js
@@ -1,2 +1 @@
export { default as EditoriaLayout } from "./src/layouts/EditoriaLayout";
-export { default as DefaultLayout } from "./src/layouts/DefaultLayout";
diff --git a/wax-prosemirror-layouts/rollup.config.js b/wax-prosemirror-layouts/rollup.config.js
index 8003f5458..4443b1f9a 100644
--- a/wax-prosemirror-layouts/rollup.config.js
+++ b/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
}),
diff --git a/wax-prosemirror-plugins/rollup.config.js b/wax-prosemirror-plugins/rollup.config.js
index f43c40919..b2b93c1a1 100644
--- a/wax-prosemirror-plugins/rollup.config.js
+++ b/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
}),
diff --git a/wax-prosemirror-schema/rollup.config.js b/wax-prosemirror-schema/rollup.config.js
index 1ab72128a..6887179da 100644
--- a/wax-prosemirror-schema/rollup.config.js
+++ b/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
}),
diff --git a/wax-prosemirror-services/rollup.config.js b/wax-prosemirror-services/rollup.config.js
index 8454fc6a1..95e85457c 100644
--- a/wax-prosemirror-services/rollup.config.js
+++ b/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"
]
};
diff --git a/wax-prosemirror-themes/rollup.config.js b/wax-prosemirror-themes/rollup.config.js
index 8e356c8ef..1a7da58db 100644
--- a/wax-prosemirror-themes/rollup.config.js
+++ b/wax-prosemirror-themes/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
}),
diff --git a/wax-prosemirror-utilities/rollup.config.js b/wax-prosemirror-utilities/rollup.config.js
index 1ab72128a..6887179da 100644
--- a/wax-prosemirror-utilities/rollup.config.js
+++ b/wax-prosemirror-utilities/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
}),
--
GitLab