fix: plus editor icons (#1120)

This commit is contained in:
Mo
2022-06-18 09:20:44 -05:00
committed by GitHub
parent cd645f74df
commit ba65948364
158 changed files with 232 additions and 1601 deletions

View File

@@ -20,7 +20,7 @@
"@babel/core": "^7.13.13",
"@babel/preset-env": "^7.13.12",
"@standardnotes/component-relay": "2.2.0",
"copy-webpack-plugin": "^8.1.0",
"copy-webpack-plugin": "*",
"css-loader": "^5.2.0",
"dompurify": "^2.2.9",
"easymde": "2.16.1",
@@ -37,7 +37,7 @@
"sn-stylekit": "3.0.1",
"webpack": "*",
"webpack-cli": "*",
"webpack-dev-server": "^3.11.2",
"webpack-dev-server": "*",
"webpack-merge": "^5.7.3"
}
}

View File

@@ -19,7 +19,7 @@
"@babel/preset-react": "^7.13.13",
"@standardnotes/editor-kit": "2.2.3",
"babel-loader": "^8.2.2",
"copy-webpack-plugin": "^8.1.1",
"copy-webpack-plugin": "*",
"css-loader": "^5.2.0",
"dompurify": "^2.2.9",
"eslint": "*",
@@ -37,7 +37,7 @@
"terser-webpack-plugin": "^5.1.1",
"webpack": "*",
"webpack-cli": "*",
"webpack-dev-server": "^3.11.2",
"webpack-dev-server": "*",
"webpack-merge": "^5.7.3",
"webpack-merge-and-include-globally": "^2.3.4"
}

View File

@@ -19,7 +19,7 @@
"@babel/preset-env": "^7.12.11",
"@standardnotes/component-relay": "2.2.0",
"codemirror": "5.65.2",
"copy-webpack-plugin": "^7.0.0",
"copy-webpack-plugin": "*",
"css-loader": "^5.0.1",
"eslint": "*",
"http-server": "^0.12.3",

View File

@@ -32,7 +32,10 @@ module.exports = {
patterns: [
{ from: '../../../../../node_modules/codemirror/lib', to: path.resolve(__dirname, 'vendor/codemirror/lib') },
{ from: '../../../../../node_modules/codemirror/mode', to: path.resolve(__dirname, 'vendor/codemirror/mode') },
{ from: '../../../../../node_modules/codemirror/addon', to: path.resolve(__dirname, 'vendor/codemirror/addon') },
{
from: '../../../../../node_modules/codemirror/addon',
to: path.resolve(__dirname, 'vendor/codemirror/addon'),
},
{
from: '../../../../../node_modules/codemirror/keymap/vim.js',
to: path.resolve(__dirname, 'vendor/codemirror/keymap'),

View File

@@ -33,7 +33,7 @@
"summernote": "^0.8.18",
"webpack": "*",
"webpack-cli": "*",
"webpack-dev-server": "^3.11.2",
"webpack-dev-server": "*",
"webpack-merge": "^5.7.3",
"webpack-merge-and-include-globally": "^2.3.3"
}

View File

@@ -1,16 +1,14 @@
const path = require("path");
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const MergeIntoSingleFilePlugin = require("webpack-merge-and-include-globally");
const HtmlWebpackPlugin = require("html-webpack-plugin");
const path = require('path')
const MiniCssExtractPlugin = require('mini-css-extract-plugin')
const MergeIntoSingleFilePlugin = require('webpack-merge-and-include-globally')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const CopyPlugin = require('copy-webpack-plugin')
module.exports = {
entry: [
path.resolve(__dirname, "src", "main.js"),
path.resolve(__dirname, "src", "main.scss"),
],
entry: [path.resolve(__dirname, 'src', 'main.js'), path.resolve(__dirname, 'src', 'main.scss')],
output: {
path: path.join(__dirname, "dist"),
filename: "dist.js"
path: path.join(__dirname, 'dist'),
filename: 'dist.js',
},
module: {
rules: [
@@ -18,14 +16,12 @@ module.exports = {
test: /\.s[ac]ss$/i,
use: [
MiniCssExtractPlugin.loader,
"css-loader",
'css-loader',
{
loader: "sass-loader",
loader: 'sass-loader',
options: {
sassOptions: {
includePaths: [
"src/main.scss"
],
includePaths: ['src/main.scss'],
},
},
},
@@ -35,28 +31,36 @@ module.exports = {
},
plugins: [
new MiniCssExtractPlugin({
filename: "dist.css"
filename: 'dist.css',
}),
new MergeIntoSingleFilePlugin({
files: {
"vendor.js": [
'vendor.js': [
require.resolve('jquery/dist/jquery.min.js'),
require.resolve('bootstrap/dist/js/bootstrap.min.js'),
require.resolve('summernote/dist/summernote.min.js'),
require.resolve('@standardnotes/component-relay/dist/dist.js'),
require.resolve('dompurify/dist/purify.min.js'),
'node_modules/sn-stylekit/dist/stylekit.js'
'node_modules/sn-stylekit/dist/stylekit.js',
],
"vendor.css": [
'vendor.css': [
require.resolve('bootstrap/dist/css/bootstrap.min.css'),
require.resolve('summernote/dist/summernote.min.css'),
'node_modules/sn-stylekit/dist/stylekit.css'
]
}
'node_modules/sn-stylekit/dist/stylekit.css',
],
},
}),
new HtmlWebpackPlugin({
title: "Plus Editor",
template: "editor.index.ejs"
})
title: 'Plus Editor',
template: 'editor.index.ejs',
}),
new CopyPlugin({
patterns: [
{
from: 'vendor',
to: '.',
},
],
}),
],
};
}

View File

@@ -26,7 +26,7 @@
"@standardnotes/component-relay": "2.2.0",
"@standardnotes/eslint-config-extensions": "^1.0.0",
"babel-loader": "^8.1.0",
"copy-webpack-plugin": "6.0.3",
"copy-webpack-plugin": "*",
"css-loader": "~4.2.1",
"eslint": "*",
"eslint-formatter-pretty": "^4.0.0",
@@ -46,8 +46,8 @@
"sass-loader": "^9.0.3",
"sn-stylekit": "2.1.0",
"style-loader": "~1.2.1",
"webpack": "4.44.1",
"webpack-cli": "^3.3.12",
"webpack-dev-server": "3.11.0"
"webpack": "*",
"webpack-cli": "*",
"webpack-dev-server": "*"
}
}

View File

@@ -1,6 +1,6 @@
const path = require('path');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const path = require('path')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const MiniCssExtractPlugin = require('mini-css-extract-plugin')
module.exports = {
mode: 'production',
@@ -8,10 +8,7 @@ module.exports = {
hints: false,
},
devtool: 'cheap-source-map',
entry: [
path.resolve(__dirname, 'app/main.js'),
path.resolve(__dirname, 'app/stylesheets/main.scss'),
],
entry: [path.resolve(__dirname, 'app/main.js'), path.resolve(__dirname, 'app/stylesheets/main.scss')],
output: {
path: path.resolve(__dirname, 'dist'),
publicPath: '/',
@@ -22,7 +19,7 @@ module.exports = {
{
test: /\.css$/,
include: path.resolve(__dirname, 'app'),
loader: 'style-loader!css-loader',
use: ['style-loader', 'css-loader'],
},
{
test: /\.scss$/,
@@ -37,22 +34,16 @@ module.exports = {
'css-loader',
{
loader: 'sass-loader',
query: {
sourceMap: false,
},
},
],
},
{
test: /\.js[x]?$/,
include: [
path.resolve(__dirname, 'app'),
require.resolve('@standardnotes/component-relay/dist/dist.js'),
],
include: [path.resolve(__dirname, 'app'), require.resolve('@standardnotes/component-relay/dist/dist.js')],
exclude: /node_modules/,
loader: 'babel-loader'
}
]
loader: 'babel-loader',
},
],
},
resolve: {
extensions: ['.js', '.jsx', '.css', '.scss'],
@@ -74,4 +65,4 @@ module.exports = {
],
}),
],
};
}

View File

@@ -41,7 +41,7 @@
"validate-commit-msg": "2.x",
"webpack": "*",
"webpack-cli": "*",
"webpack-dev-server": "3.11.2",
"webpack-dev-server": "*",
"webpack-merge": "5.7.3"
}
}

View File

@@ -23,7 +23,7 @@
"@standardnotes/component-relay": "2.2.0",
"@standardnotes/eslint-config-extensions": "^1.0.4",
"babel-loader": "^8.2.2",
"copy-webpack-plugin": "^9.0.1",
"copy-webpack-plugin": "*",
"css-loader": "^5.2.6",
"eslint": "*",
"eslint-plugin-react": "^7.24.0",
@@ -37,7 +37,7 @@
"terser-webpack-plugin": "^5.1.4",
"webpack": "*",
"webpack-cli": "*",
"webpack-dev-server": "3.11.0",
"webpack-dev-server": "*",
"webpack-merge": "^5.8.0"
}
}

View File

@@ -46,7 +46,7 @@
"terser-webpack-plugin": "^5.1.1",
"webpack": "*",
"webpack-cli": "*",
"webpack-dev-server": "^3.11.2",
"webpack-dev-server": "*",
"webpack-merge": "^5.7.3"
}
}