feat(package): More package name changes

Made package name consistent across code
nearmap · Feb 13, 2020 · 113503e · 113503e
1 parent b1fe6d3
commit 113503e
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 23 deletions.
diff --git a/examples/page1.js b/examples/page1.js
@@ -1,8 +1,8 @@
 /* eslint-env node */
 import React from 'react';
 
-import {render} from 'react-entry-loader/render';
-import {Module, Styles, Scripts} from 'react-entry-loader/injectors';
+import {render} from '@nearmap/react-entry-loader/render';
+import {Module, Styles, Scripts} from '@nearmap/react-entry-loader/injectors';
 
 import App from './app';
 import GeneratedCode from './code-gen';

diff --git a/examples/page2.js b/examples/page2.js
@@ -1,8 +1,8 @@
 /* eslint-env node */
 import React from 'react';
 
-import {hydrate} from 'react-entry-loader/render';
-import {Module, Styles, Scripts} from 'react-entry-loader/injectors';
+import {hydrate} from '@nearmap/react-entry-loader/render';
+import {Module, Styles, Scripts} from '@nearmap/react-entry-loader/injectors';
 
 import App from './app';
 import GeneratedCode from './code-gen';

diff --git a/src/code-split.js b/src/code-split.js
@@ -46,7 +46,10 @@ const isModuleComponent = (path)=> {
   /* istanbul ignore else  */
   if (isReactCreateComponent(path)) {
     const [comp] = path.get('arguments');
-    return comp.referencesImport('react-entry-loader/injectors', 'Module');
+    return comp.referencesImport(
+      '@nearmap/react-entry-loader/injectors',
+      'Module'
+    );
   }
   // TODO: we somehow never get here, maybe because we stop traversal
   // when we have found the module component.

diff --git a/src/code-split.test.js b/src/code-split.test.js
@@ -19,8 +19,12 @@ describe('App rendered at runtime', ()=> {
 
   const entry = jsx`
     import React from 'react';
-    import render from 'react-entry-loader/render';
-    import {Module, Styles, Scripts} from 'react-entry-loader/injectors';
+    import render from '@nearmap/react-entry-loader/render';
+    import {
+      Module,
+      Styles,
+      Scripts
+    } from '@nearmap/react-entry-loader/injectors';
 
     import App from './app';
     import {theme} from './app.css';
@@ -53,7 +57,7 @@ describe('App rendered at runtime', ()=> {
 
     expect(code).toBe(jsx`
       import React from 'react';
-      import render from 'react-entry-loader/render';
+      import render from '@nearmap/react-entry-loader/render';
       import App from './app';
       import {theme} from './app.css';
       const foo = 'needed by app';
@@ -69,7 +73,11 @@ describe('App rendered at runtime', ()=> {
     expect(code).toBe(jsx`
       import React from 'react';
 
-      import {Module, Styles, Scripts} from 'react-entry-loader/injectors';
+      import {
+        Module,
+        Styles,
+        Scripts
+      } from '@nearmap/react-entry-loader/injectors';
 
       const Html = ({scripts, styles})=> (
         <html>
@@ -96,8 +104,12 @@ describe('App rendered at compile time and hydrated at runtiume', ()=> {
 
   const entry = jsx`
     import React from 'react';
-    import {hydrate} from 'react-entry-loader/render';
-    import {Module, Styles, Scripts} from 'react-entry-loader/injectors';
+    import {hydrate} from '@nearmap/react-entry-loader/render';
+    import {
+      Module,
+      Styles,
+      Scripts
+    } from '@nearmap/react-entry-loader/injectors';
 
     import App from './app';
 
@@ -127,7 +139,7 @@ describe('App rendered at compile time and hydrated at runtiume', ()=> {
 
     expect(code).toBe(jsx`
       import React from 'react';
-      import {hydrate} from 'react-entry-loader/render';
+      import {hydrate} from '@nearmap/react-entry-loader/render';
       import App from './app';
 
       hydrate('test-app')(<App />);
@@ -140,7 +152,11 @@ describe('App rendered at compile time and hydrated at runtiume', ()=> {
 
     expect(code).toBe(jsx`
       import React from 'react';
-      import {Module, Styles, Scripts} from 'react-entry-loader/injectors';
+      import {
+        Module,
+        Styles,
+        Scripts
+      } from '@nearmap/react-entry-loader/injectors';
 
       import App from './app';
 
@@ -171,7 +187,7 @@ describe('no child to render', ()=> {
 
   const entry = jsx`
     import React from 'react';
-    import {Module, Scripts} from 'react-entry-loader/injectors';
+    import {Module, Scripts} from '@nearmap/react-entry-loader/injectors';
 
     import {signingSilent} from './silent-signing';
 
@@ -206,7 +222,7 @@ describe('no child to render', ()=> {
 
     expect(code).toBe(jsx`
       import React from 'react';
-      import {Module, Scripts} from 'react-entry-loader/injectors';
+      import {Module, Scripts} from '@nearmap/react-entry-loader/injectors';
 
       const Html = ({scripts})=> (
         <html>
@@ -230,7 +246,7 @@ describe('path removal issues', ()=> {
   it('removes variable declarations only if they would be empty', ()=> {
     const {code} = getModule(jsx`
       import React from 'react';
-      import {Module, Scripts} from 'react-entry-loader/injectors';
+      import {Module, Scripts} from '@nearmap/react-entry-loader/injectors';
 
       const foo = 1, bar = '2';
 

diff --git a/src/entry.js b/src/entry.js
@@ -8,7 +8,7 @@
  *   * ...props - Props to be sent to the template component in `src`.
  */
 const reactEntryLoader = (options)=> (src)=> (
-  `react-entry-loader?${JSON.stringify(options)}!${src}`
+  `@nearmap/react-entry-loader?${JSON.stringify(options)}!${src}`
 );
 
 export default reactEntryLoader;
diff --git a/src/index.js b/src/index.js
@@ -23,7 +23,7 @@ const createLoader = (loaderCtx)=> async (source, sourceMap, meta)=> {
  * ```javascript
  * {
  *   entry: {
- *    page1: 'react-entry-loader?output=page1.html!./src/page1.js'
+ *    page1: '@nearmap/react-entry-loader?output=page1.html!./src/page1.js'
  *   }
  *   ...
  * }
@@ -38,7 +38,8 @@ const createLoader = (loaderCtx)=> async (source, sourceMap, meta)=> {
  * as default.
  * It splits the code into two part: the module and the template code.
  * Only the module code will be returned, while the template code is
- * sent to the `react-entry-loader/plugin` for generating an HTML asset.
+ * sent to the `@nearmap/react-entry-loader/plugin` for generating an
+ * HTML asset.
  *
  * Code splitting is done by searching for a children of the `<Module />`
  * component in the `source`. Those children and all of it's dependencies are

diff --git a/src/template.js b/src/template.js
@@ -19,8 +19,8 @@ const sanitize = (html)=> (
 const getRequire = (parentContext, compilation, exec)=> (req)=> {
   // TODO: needed for tests to be able to import react-entry-loader
   // should find a better way to handle this, e.g. using webpack's resolver
-  if (req.startsWith('react-entry-loader/')) {
-    req = req.replace('react-entry-loader', __dirname);
+  if (req.startsWith('@nearmap/react-entry-loader/')) {
+    req = req.replace('@nearmap/react-entry-loader', __dirname);
   }
 
   // TODO: should use webpack's resolver

diff --git a/src/testing/webpack.config.js b/src/testing/webpack.config.js
@@ -8,12 +8,12 @@ export default {
   mode: 'development',
   resolveLoader: {
     alias: {
-      'react-entry-loader': join(packageDir, 'src')
+      '@nearmap/react-entry-loader': join(packageDir, 'src')
     }
   },
   resolve: {
     alias: {
-      'react-entry-loader': join(packageDir, 'src')
+      '@nearmap/react-entry-loader': join(packageDir, 'src')
     }
   },
   output: {