Permalink
Browse files

chore: prepare npm, bower registration for 1.0 (fix #1022, #1058)

* test: remove src context from test bundle

* chore: prepare registration on npm, bower for 1.0 (fix #1022)

* chore: apply code review (fix #1022)
  • Loading branch information...
1 parent 2a313cd commit 1c28bb1a9d5263b7097efff19e45d486c0949246 @kyuwoo-choi kyuwoo-choi committed Dec 29, 2017
Showing with 2,329 additions and 742 deletions.
  1. +21 −4 bower.json
  2. +1 −0 jsdoc.conf.js
  3. +6 −9 karma.conf.js
  4. +2,235 −701 package-lock.json
  5. +36 −20 package.json
  6. +1 −0 test/extensions/table/wwMergedTableManager.spec.js
  7. +0 −4 test/test.bundle.js
  8. +29 −4 webpack.config.js
View
@@ -1,13 +1,29 @@
{
"name": "tui-editor",
- "description": "private",
+ "description": "GFM Markdown Wysiwyg Editor - Productive and Extensible",
"authors": ["NHN Ent. FE Development Lab <dl_javascript@nhnent.com> (https://nhnent.github.io/tui.editor/)"],
+ "homepage": "https://github.com/nhnent/tui.editor",
+ "repository": {
+ "type": "git",
+ "url": "git@github.com:nhnent/tui.editor.git"
+ },
"moduleType": [
"globals",
"es6",
"amd",
"node"
],
+ "keywords": [
+ "toast",
+ "ui",
+ "tui",
+ "markdown",
+ "wysiwyg",
+ "editor",
+ "preview",
+ "gfm",
+ "jquery-plugin"
+ ],
"main": "dist/tui-editor-Editor.js",
"license": "MIT",
"ignore": [
@@ -16,9 +32,10 @@
"bower_components",
"lib/",
"test",
- "tests"
+ "tests",
+ "api",
+ "report"
],
- "keywords": [],
"dependencies": {
"tui-code-snippet": "^1.2.9",
"codemirror": "^5.32.0",
@@ -28,7 +45,7 @@
"toMark": "nhnent/toMark#0.0.19",
"tui-color-picker": "^2.0.1",
"squire-rte": "neilj/Squire#306230d0df9b38047cd06204476ddc0582569cfd",
- "plantuml-encoder": "aleung/plantuml-encoder#156729063bfa62da6fa5f577627ebab57ae98c95",
+ "plantuml-encoder": "kyuwoo-choi/plantuml-encoder#156729063bfa62da6fa5f577627ebab57ae98c95",
"tui-chart": "^2.13.0"
},
"resolutions": {
View
@@ -13,6 +13,7 @@ module.exports = {
'plugins/markdown'
],
'templates': {
+ 'name': 'Editor',
'logo': {
'url': 'https://cloud.githubusercontent.com/assets/389021/16107646/9729e556-33d8-11e6-933f-5b09fa3a53bb.png',
'width': '150px',
View
@@ -66,7 +66,7 @@ configurator.nhnent = function(defaultConfig) {
if (BROWSER === 'IE11' || !BROWSER) {
customLaunchers.IE11 = nhnentLauncher('WebDriver', 'internet explorer', '11');
}
- if (BROWSER === 'Edge') {
+ if (BROWSER === 'Edge' || !BROWSER) {
customLaunchers.Edge = nhnentLauncher('WebDriver', 'MicrosoftEdge');
}
if (BROWSER === 'Chrome' || !BROWSER) {
@@ -109,11 +109,11 @@ configurator.saucelabs = function(defaultConfig) {
if (BROWSER === 'IE11' || !BROWSER) {
customLaunchers.sl_ie_11 = saucelabsLauncher('SauceLabs', 'internet explorer', 'Windows 8.1', '11.0');
}
- if (BROWSER === 'Edge') {
+ if (BROWSER === 'Edge' || !BROWSER) {
customLaunchers.sl_edge_14 = saucelabsLauncher('SauceLabs', 'MicrosoftEdge', 'Windows 10', '15.15063');
}
- if (BROWSER === 'Safari') {
- defaultConfig.customLaunchers.sl_safari = saucelabsLauncher('SauceLabs', 'safari', 'macOS 10.12', '10.0');
+ if (BROWSER === 'Safari' || !BROWSER) {
+ defaultConfig.customLaunchers.sl_safari = saucelabsLauncher('SauceLabs', 'safari', 'macOS 10.13', '11.0');
}
defaultConfig.reporters.push('saucelabs');
defaultConfig.browsers = Object.keys(defaultConfig.customLaunchers);
@@ -141,7 +141,7 @@ configurator.localhost = function(defaultConfig) {
configurator.noserver = function(defaultConfig) {
defaultConfig.browsers = [
- BROWSER || 'Chrome'
+ BROWSER || 'ChromeHeadless'
];
defaultConfig.singleRun = SINGLE_RUN || false;
};
@@ -160,9 +160,6 @@ module.exports = function(config) {
// chart is not npm package and it needs global code snippet.
// remove chart and code snippet from here once chart is on npm
files: [
- 'node_modules/tui-code-snippet/dist/tui-code-snippet.js',
- 'node_modules/tui-chart/dist/tui-chart.js',
- 'node_modules/tui-chart/dist/tui-chart.css',
'node_modules/codemirror/lib/codemirror.css',
'src/css/tui-editor.css',
'test/fixtures/*.*',
@@ -189,7 +186,7 @@ module.exports = function(config) {
{
test: /\.js$/,
exclude: /node_modules|lib|dist/,
- loader: 'babel-loader',
+ loader: 'babel-loader?cacheDirectory',
options: {
babelrc: true
}
Oops, something went wrong.

0 comments on commit 1c28bb1

Please sign in to comment.