[Publish patch versions] Switch to @jetbrains-scoped packages

Add React 16 fragments example

Author: Hypnosphi

.idea/libraries/kotlin_extensions.xml

@@ -6,20 +6,19 @@
   "scripts": {
     "build": "yarn --cwd packages/react-scripts build",
     "changelog": "lerna-changelog",
-    "create-react-kotlin-app": "tasks/cra.sh",
+    "create-react-kotlin-app": "tasks/cra.sh my-app",
     "e2e": "tasks/e2e-simple.sh",
     "publish": "tasks/release.sh",
-    "start": "node packages/react-scripts/scripts/start.js",
-    "test": "node packages/react-scripts/scripts/test.js --env=jsdom",
+    "start": "yarn --cwd packages/react-scripts start",
     "format": "prettier --trailing-comma es5 --single-quote --write 'packages/*/*.js' 'packages/*/!(node_modules)/**/*.js'",
     "precommit": "lint-staged"
   },
   "devDependencies": {
     "eslint": "3.19.0",
-    "husky": "^0.13.2",
-    "lerna": "^2.3.1",
-    "lerna-changelog": "^0.2.3",
-    "lint-staged": "^3.3.1",
+    "husky": "^0.14.3",
+    "lerna": "^2.4.0",
+    "lerna-changelog": "^0.6.0",
+    "lint-staged": "^4.2.3",
     "prettier": "^0.21.0"
   },
   "lint-staged": {

.idea/libraries/kotlin_react.xml

@@ -13,11 +13,7 @@ const fs = require('fs');
   }, '.')
 */
 
-module.exports = function generate(
-  packages,
-  projectDir,
-  imlPath
-) {
+module.exports = function generate(packages, projectDir, imlPath) {
   const libTemplate = fs.readFileSync(
     path.join(__dirname, './libTemplate.xml'),
     'utf8'
@@ -35,7 +31,7 @@ module.exports = function generate(
         `${path.basename(path.resolve(projectDir))}.iml`
       );
       iml = fs.readFileSync(_imlPath, 'utf8');
-    } catch(e) {
+    } catch (e) {
       _imlPath = path.join(
         projectDir,
         `${path.basename(path.resolve(projectDir))}.iml`
@@ -44,17 +40,17 @@ module.exports = function generate(
     }
   }
   Object.keys(packages).forEach(name => {
-    const pkg = packages[name]
-    const classes = path.relative(projectDir, path.join(pkg, '..'))
+    const pkg = packages[name];
+    const classes = path.relative(projectDir, path.join(pkg, '..'));
     fs.writeFile(
       path.join(projectDir, `.idea/libraries/${name.replace(/-/g, '_')}.xml`),
       libTemplate.replace(/%name%/g, name).replace(/%classes%/g, classes)
     );
 
     const dep = depTemplate.replace(/%name%/g, name);
     if (!iml.includes(dep)) {
-      iml = iml.replace(/(\n\s+)<\/component>/, `$1  ${dep}$&`)
+      iml = iml.replace(/(\n\s+)<\/component>/, `$1  ${dep}$&`);
     }
-  })
+  });
   fs.writeFile(_imlPath, iml);
 };

.idea/libraries/kotlin_react_dom.xml

@@ -1,6 +1,6 @@
 {
   "name": "gen-idea-libs",
-  "version": "1.0.3",
+  "version": "1.0.4-0",
   "description": "Generate IntelliJ Idea libs config from given npm kotlinJs dependencies",
   "main": "generate",
   "author": "Filipp Riabchun",

.idea/libraries/kotlinx_html_js.xml

@@ -5,7 +5,11 @@ import kotlin.browser.*
 
 fun main(args: Array<String>) {
     render(document.getElementById("app")) {
-        div { +"Hello!" }
+        span {
+            key = "hello"
+            +"Hello"
+        }
+        +" World!"
     }
 }
 

package.json

@@ -32,9 +32,9 @@ module.exports = {
       verbose: true,
       optimize: true,
       libraries: [
-        '@hypnosphi/kotlin-extensions',
-        '@hypnosphi/kotlin-react',
-        '@hypnosphi/kotlin-react-dom',
+        '@jetbrains/kotlin-extensions',
+        '@jetbrains/kotlin-react',
+        '@jetbrains/kotlin-react-dom',
         '@hypnosphi/kotlinx-html-js',
       ].map(pkg => require.resolve(pkg)),
     }),

packages/gen-idea-libs/generate.js

@@ -1,6 +1,6 @@
 {
   "name": "kotlin-webpack-plugin",
-  "version": "1.0.6",
+  "version": "1.0.7-0",
   "description": "Webpack kotlin plugin",
   "main": "plugin.js",
   "repository": "JetBrains/create-react-kotlin-app",
@@ -29,19 +29,19 @@
     "glob": "7.1.2",
     "globby": "6.1.0",
     "kotlin-compiler": "1.1.4-dev-970",
-    "kotlinc-js": "^1.0.5",
+    "kotlinc-js": "^1.0.6-0",
     "read-dir-files": "^0.1.1"
   },
   "devDependencies": {
-    "@hypnosphi/kotlin-extensions": "0.0.4",
-    "@hypnosphi/kotlin-react": "0.0.2",
-    "@hypnosphi/kotlin-react-dom": "0.0.3",
     "@hypnosphi/kotlinx-html-js": "^0.0.1",
+    "@jetbrains/kotlin-extensions": "^1.0.0-pre.2",
+    "@jetbrains/kotlin-react": "^16.0.0-pre.2",
+    "@jetbrains/kotlin-react-dom": "^16.0.0-pre.2",
     "@princed/source-map-loader": "0.2.1",
     "html-webpack-plugin": "^2.28.0",
-    "kotlin": "^1.1.4",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
+    "kotlin": "^1.1.51",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
     "webpack": "^2.6.1",
     "webpack-dev-server": "2.4.5"
   }

packages/gen-idea-libs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kotlinc-js",
-  "version": "1.0.5",
+  "version": "1.0.6-0",
   "description": "KotlincJS compiler wrapper for NodeJS",
   "main": "kotlin-compiler.js",
   "scripts": {
@@ -23,12 +23,12 @@
   "author": "Andrey Skladchikov <[email protected]>",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@hypnosphi/kotlin-extensions": "0.0.4",
-    "@hypnosphi/kotlin-react": "0.0.2",
-    "kotlin": "^1.1.0",
-    "react": "^15.5.4"
+    "@jetbrains/kotlin-extensions": "^1.0.0-pre.0",
+    "@jetbrains/kotlin-react": "^16.0.0-pre.0",
+    "kotlin": "^1.1.51",
+    "react": "^16.0.0"
   },
   "dependencies": {
-    "kotlin-compiler": "^1.1.4"
+    "kotlin-compiler": "^1.1.51"
   }
 }

packages/kotlin-webpack-plugin/example/main.kt

@@ -13,9 +13,9 @@ kotlinCompiler
     sourceMaps: true,
     moduleKind: 'commonjs',
     libraries: [
-      'node_modules/@hypnosphi/kotlin-extensions/build/classes/main/kotlin-extensions.meta.js',
-      'node_modules/@hypnosphi/kotlin-react/build/classes/main/kotlin-react.meta.js',
-    ],
+      '@jetbrains/kotlin-extensions',
+      '@jetbrains/kotlin-react',
+    ].map(lib => require.resolve(lib).replace(/(?:\.js)?$/, '.meta.js')),
   })
   .then(() => {
     return new Promise(

packages/kotlin-webpack-plugin/example/webpack.config.js

@@ -1,11 +1,13 @@
 (function (_, Kotlin, $module$react, $module$kotlin_extensions) {
   'use strict';
+  var $$importsForInline$$ = _.$$importsForInline$$ || (_.$$importsForInline$$ = {});
   var println = Kotlin.kotlin.io.println_s8jyv4$;
   function main(args) {
     var obj = {};
     var el = $module$react.createElement('test', obj, 'test');
     println(JSON.stringify(el));
   }
+  $$importsForInline$$['kotlin-extensions'] = $module$kotlin_extensions;
   var package$test = _.test || (_.test = {});
   package$test.main_kand9s$ = main;
   main([]);

packages/kotlin-webpack-plugin/package.json

@@ -57,7 +57,6 @@ module.exports = {
   appPackageJson: resolveApp('package.json'),
   appSrc: resolveApp('src'),
   yarnLockFile: resolveApp('yarn.lock'),
-  testsSetup: resolveApp('src/setupTests.js'),
   appNodeModules: resolveApp('node_modules'),
   publicUrl: getPublicUrl(resolveApp('package.json')),
   servedPath: getServedPath(resolveApp('package.json')),
@@ -78,7 +77,6 @@ module.exports = {
   appPackageJson: resolveApp('package.json'),
   appSrc: resolveApp('src'),
   yarnLockFile: resolveApp('yarn.lock'),
-  testsSetup: resolveApp('src/setupTests.js'),
   appNodeModules: resolveApp('node_modules'),
   publicUrl: getPublicUrl(resolveApp('package.json')),
   servedPath: getServedPath(resolveApp('package.json')),
@@ -108,7 +106,6 @@ if (
     appPackageJson: resolveOwn('package.json'),
     appSrc: resolveOwn('template/src'),
     yarnLockFile: resolveOwn('template/yarn.lock'),
-    testsSetup: resolveOwn('template/src/setupTests.js'),
     appNodeModules: resolveOwn('node_modules'),
     publicUrl: getPublicUrl(resolveOwn('package.json')),
     servedPath: getServedPath(resolveOwn('package.json')),

packages/kotlinc-js/package.json

@@ -200,9 +200,9 @@ module.exports = {
       output: paths.kotlinOutputPath,
       moduleName: kotlinModuleName,
       libraries: [
-        '@hypnosphi/kotlin-extensions',
-        '@hypnosphi/kotlin-react',
-        '@hypnosphi/kotlin-react-dom',
+        '@jetbrains/kotlin-extensions',
+        '@jetbrains/kotlin-react',
+        '@jetbrains/kotlin-react-dom',
         '@hypnosphi/kotlinx-html-js',
       ].map(pkg => require.resolve(pkg)),
     }),

packages/kotlinc-js/test/kotlin-compiler.test.js

@@ -212,9 +212,9 @@ module.exports = {
       moduleName: kotlinModuleName,
       optimize: true,
       libraries: [
-        '@hypnosphi/kotlin-extensions',
-        '@hypnosphi/kotlin-react',
-        '@hypnosphi/kotlin-react-dom',
+        '@jetbrains/kotlin-extensions',
+        '@jetbrains/kotlin-react',
+        '@jetbrains/kotlin-react-dom',
         '@hypnosphi/kotlinx-html-js',
       ].map(pkg => require.resolve(pkg)),
     }),

packages/kotlinc-js/test/reference.js.ref

@@ -75,7 +75,7 @@ module.exports = function(proxy, allowedHost) {
     // Reportedly, this avoids CPU overload on some systems.
     // https://github.com/facebookincubator/create-react-app/issues/293
     watchOptions: {
-      ignored: /node_modules(?!\/.cache)/
+      ignored: /node_modules(?!\/.cache)/,
     },
     // Enable HTTPS if the HTTPS environment variable is set to 'true'
     https: protocol === 'https',