@nrwl/react 12.9.0-rc.0 → 12.10.0-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/migrations.json +10 -1
  2. package/package.json +11 -10
  3. package/src/generators/application/files/css-module/src/app/__fileName__.tsx__tmpl__ +1 -1
  4. package/src/generators/application/files/global-css/src/app/__fileName__.tsx__tmpl__ +1 -1
  5. package/src/generators/application/files/none/src/app/__fileName__.tsx__tmpl__ +1 -1
  6. package/src/generators/application/files/styled-jsx/src/app/__fileName__.tsx__tmpl__ +1 -1
  7. package/src/generators/application/files/styled-module/src/app/__fileName__.tsx__tmpl__ +1 -1
  8. package/src/generators/application/lib/add-project.js +1 -0
  9. package/src/generators/application/lib/add-project.js.map +1 -1
  10. package/src/utils/ast-utils.js +2 -2
  11. package/src/utils/versions.js +1 -1
  12. package/tailwind.js +1 -1
  13. package/tailwind.js.map +1 -1
package/migrations.json CHANGED
@@ -487,7 +487,7 @@
487
487
  "alwaysAddToPackageJson": false
488
488
  },
489
489
  "@reduxjs/toolkit": {
490
- "version": "1.5.0",
490
+ "version": "1.6.1",
491
491
  "alwaysAddToPackageJson": false
492
492
  },
493
493
  "react-redux": {
@@ -499,6 +499,15 @@
499
499
  "alwaysAddToPackageJson": false
500
500
  }
501
501
  }
502
+ },
503
+ "12.10.0": {
504
+ "version": "12.10.0-beta.2",
505
+ "packages": {
506
+ "@testing-library/react": {
507
+ "version": "11.2.6",
508
+ "alwaysAddToPackageJson": false
509
+ }
510
+ }
502
511
  }
503
512
  }
504
513
  }
package/package.json CHANGED
@@ -1,10 +1,11 @@
1
1
  {
2
2
  "name": "@nrwl/react",
3
- "version": "12.9.0-rc.0",
3
+ "version": "12.10.0-beta.3",
4
4
  "description": "React Plugin for Nx",
5
5
  "repository": {
6
6
  "type": "git",
7
- "url": "git+https://github.com/nrwl/nx.git"
7
+ "url": "https://github.com/nrwl/nx.git",
8
+ "directory": "packages/react"
8
9
  },
9
10
  "keywords": [
10
11
  "Monorepo",
@@ -30,14 +31,14 @@
30
31
  "dependencies": {
31
32
  "@babel/core": "^7.15.0",
32
33
  "@babel/preset-react": "^7.14.5",
33
- "@nrwl/cypress": "12.9.0-rc.0",
34
- "@nrwl/devkit": "12.9.0-rc.0",
35
- "@nrwl/jest": "12.9.0-rc.0",
36
- "@nrwl/linter": "12.9.0-rc.0",
37
- "@nrwl/storybook": "12.9.0-rc.0",
38
- "@nrwl/web": "12.9.0-rc.0",
39
- "@nrwl/workspace": "12.9.0-rc.0",
40
- "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
34
+ "@nrwl/cypress": "12.10.0-beta.3",
35
+ "@nrwl/devkit": "12.10.0-beta.3",
36
+ "@nrwl/jest": "12.10.0-beta.3",
37
+ "@nrwl/linter": "12.10.0-beta.3",
38
+ "@nrwl/storybook": "12.10.0-beta.3",
39
+ "@nrwl/web": "12.10.0-beta.3",
40
+ "@nrwl/workspace": "12.10.0-beta.3",
41
+ "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
41
42
  "@svgr/webpack": "^5.5.0",
42
43
  "chalk": "4.1.0",
43
44
  "eslint-plugin-import": "^2.22.1",
package/src/generators/application/files/css-module/src/app/__fileName__.tsx__tmpl__ CHANGED
@@ -16,7 +16,7 @@ export function App() {
16
16
  <div className={styles.app}>
17
17
  <header className="flex">
18
18
  <Logo width="75" height="75"/>
19
- <h1>Welcome to <%= name %>!</h1>
19
+ <h1>Welcome to <%= projectName %>!</h1>
20
20
  </header>
21
21
  <main>
22
22
  <h2>Resources &amp; Tools</h2>
package/src/generators/application/files/global-css/src/app/__fileName__.tsx__tmpl__ CHANGED
@@ -16,7 +16,7 @@ export function App() {
16
16
  <div className="app">
17
17
  <header className="flex">
18
18
  <Logo width="75" height="75"/>
19
- <h1>Welcome to <%= name %>!</h1>
19
+ <h1>Welcome to <%= projectName %>!</h1>
20
20
  </header>
21
21
  <main>
22
22
  <h2>Resources &amp; Tools</h2>
package/src/generators/application/files/none/src/app/__fileName__.tsx__tmpl__ CHANGED
@@ -12,7 +12,7 @@ export class App extends Component {
12
12
  export function App() {
13
13
  <% } %>
14
14
  return (
15
- <h1>Welcome to <%= name %>!</h1>
15
+ <h1>Welcome to <%= projectName %>!</h1>
16
16
  );
17
17
  <% if (classComponent) { %>
18
18
  }
package/src/generators/application/files/styled-jsx/src/app/__fileName__.tsx__tmpl__ CHANGED
@@ -146,7 +146,7 @@ export function App() {
146
146
 
147
147
  <header className="flex">
148
148
  <Logo width="75" height="75" />
149
- <h1>Welcome to <%= name %>!</h1>
149
+ <h1>Welcome to <%= projectName %>!</h1>
150
150
  </header>
151
151
  <main>
152
152
  <h2>Resources &amp; Tools</h2>
package/src/generators/application/files/styled-module/src/app/__fileName__.tsx__tmpl__ CHANGED
@@ -146,7 +146,7 @@ export function App() {
146
146
  <StyledApp>
147
147
  <header className="flex">
148
148
  <Logo width="75" height="75"/>
149
- <h1>Welcome to <%= name %>!</h1>
149
+ <h1>Welcome to <%= projectName %>!</h1>
150
150
  </header>
151
151
  <main>
152
152
  <h2>Resources &amp; Tools</h2>
package/src/generators/application/lib/add-project.js CHANGED
@@ -30,6 +30,7 @@ function createBuildTarget(options) {
30
30
  options: {
31
31
  outputPath: devkit_1.joinPathFragments('dist', options.appProjectRoot),
32
32
  index: devkit_1.joinPathFragments(options.appProjectRoot, 'src/index.html'),
33
+ baseHref: '/',
33
34
  main: devkit_1.joinPathFragments(options.appProjectRoot, maybeJs(options, `src/main.tsx`)),
34
35
  polyfills: devkit_1.joinPathFragments(options.appProjectRoot, maybeJs(options, 'src/polyfills.ts')),
35
36
  tsConfig: devkit_1.joinPathFragments(options.appProjectRoot, 'tsconfig.app.json'),
package/src/generators/application/lib/add-project.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AAEtB,SAAgB,UAAU,CAAC,IAAI,EAAE,OAAyB;IACxD,MAAM,QAAQ,GAA+B;QAC3C,IAAI,EAAE,OAAO,CAAC,UAAU;KACzB,CAAC;IAEF,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,MAAM;QAC3C,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE;YACP,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC;YACjC,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC;SAClC;KACF,CAAC;IAEF,gCAAuB,CACrB,IAAI,EACJ,OAAO,CAAC,WAAW,kCAEd,OAAO,GACP,QAAQ,GAEb,OAAO,CAAC,gBAAgB,CACzB,CAAC;AACJ,CAAC;AAxBD,gCAwBC;AAED,SAAS,OAAO,CAAC,OAAyB,EAAE,IAAY;IACtD,OAAO,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAClE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC;QAChC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAyB;IAClD,OAAO;QACL,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,OAAO,EAAE;YACP,UAAU,EAAE,0BAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;YAC7D,KAAK,EAAE,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,CAAC;YAClE,IAAI,EAAE,0BAAiB,CACrB,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,CACjC;YACD,SAAS,EAAE,0BAAiB,CAC1B,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC,CACrC;YACD,QAAQ,EAAE,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC;YACxE,MAAM,EAAE;gBACN,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,iBAAiB,CAAC;gBAC5D,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY,CAAC;aACxD;YACD,MAAM,EACJ,OAAO,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,SAAS;gBACxC,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC;oBACE,0BAAiB,CACf,OAAO,CAAC,cAAc,EACtB,cAAc,OAAO,CAAC,KAAK,EAAE,CAC9B;iBACF;YACP,OAAO,EAAE,EAAE;YACX,aAAa,EAAE,6BAA6B;SAC7C;QACD,cAAc,EAAE;YACd,UAAU,EAAE;gBACV,gBAAgB,EAAE;oBAChB;wBACE,OAAO,EAAE,0BAAiB,CACxB,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,OAAO,EAAE,iCAAiC,CAAC,CACpD;wBACD,IAAI,EAAE,0BAAiB,CACrB,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,OAAO,EAAE,sCAAsC,CAAC,CACzD;qBACF;iBACF;gBACD,YAAY,EAAE,IAAI;gBAClB,aAAa,EAAE,KAAK;gBACpB,SAAS,EAAE,KAAK;gBAChB,UAAU,EAAE,IAAI;gBAChB,WAAW,EAAE,KAAK;gBAClB,eAAe,EAAE,IAAI;gBACrB,WAAW,EAAE,KAAK;gBAClB,OAAO,EAAE,OAAO,CAAC,MAAM;oBACrB,CAAC,CAAC;wBACE;4BACE,IAAI,EAAE,SAAS;4BACf,cAAc,EAAE,OAAO;4BACvB,YAAY,EAAE,KAAK;yBACpB;qBACF;oBACH,CAAC,CAAC;wBACE;4BACE,IAAI,EAAE,SAAS;4BACf,cAAc,EAAE,KAAK;4BACrB,YAAY,EAAE,KAAK;yBACpB;qBACF;aACN;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAyB;IAClD,OAAO;QACL,QAAQ,EAAE,sBAAsB;QAChC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,QAAQ;YAC3C,GAAG,EAAE,IAAI;SACV;QACD,cAAc,EAAE;YACd,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;gBACtD,GAAG,EAAE,KAAK;aACX;SACF;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-project.ts"],"names":[],"mappings":"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"}
package/src/utils/ast-utils.js CHANGED
@@ -259,7 +259,7 @@ function addReduxStoreToMain(sourcePath, source) {
259
259
  }
260
260
  const jsx = renderStmt.arguments[0];
261
261
  return [
262
- ...addImport(source, `import { configureStore, getDefaultMiddleware } from '@reduxjs/toolkit';
262
+ ...addImport(source, `import { configureStore } from '@reduxjs/toolkit';
263
263
  import { Provider } from 'react-redux';`),
264
264
  {
265
265
  type: devkit_1.ChangeType.Insert,
@@ -268,7 +268,7 @@ import { Provider } from 'react-redux';`),
268
268
  const store = configureStore({
269
269
  reducer: {},
270
270
  // Additional middleware can be passed to this array
271
- middleware: [...getDefaultMiddleware()],
271
+ middleware: getDefaultMiddleware => getDefaultMiddleware(),
272
272
  devTools: process.env.NODE_ENV !== 'production',
273
273
  // Optional Redux store enhancers
274
274
  enhancers: [],
package/src/utils/versions.js CHANGED
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.babelPluginStyledComponentsVersion = exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.reactReduxVersion = exports.reduxjsToolkitVersion = exports.testingLibraryReactHooksVersion = exports.testingLibraryReactVersion = exports.typesReactRouterDomVersion = exports.reactRouterDomVersion = exports.typesStyledJsxVersion = exports.styledJsxVersion = exports.emotionBabelPlugin = exports.emotionReactVersion = exports.emotionStyledVersion = exports.typesStyledComponentsVersion = exports.styledComponentsVersion = exports.typesReactIsVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.reactIsVersion = exports.reactDomVersion = exports.reactVersion = exports.nxVersion = void 0;
4
- exports.nxVersion = '12.9.0-rc.0';
4
+ exports.nxVersion = '12.10.0-beta.3';
5
5
  exports.reactVersion = '17.0.2';
6
6
  exports.reactDomVersion = '17.0.2';
7
7
  exports.reactIsVersion = '17.0.2';
package/tailwind.js CHANGED
@@ -7,7 +7,7 @@ const generate_globs_1 = require("@nrwl/workspace/src/utilities/generate-globs")
7
7
  * @param dirPath workspace relative directory path that will be used to infer the parent project and dependencies
8
8
  * @param fileGlobPattern pass a custom glob pattern to be used
9
9
  */
10
- function createGlobPatternsForDependencies(dirPath, fileGlobPattern = '/**/!(*.stories|*.spec).{tsx,jsx,js}') {
10
+ function createGlobPatternsForDependencies(dirPath, fileGlobPattern = '/**/!(*.stories|*.spec).{tsx,jsx,js,html}') {
11
11
  try {
12
12
  return generate_globs_1.createGlobPatternsForDependencies(dirPath, fileGlobPattern);
13
13
  }
package/tailwind.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tailwind.js","sourceRoot":"","sources":["../../../packages/react/tailwind.ts"],"names":[],"mappings":";;;AAAA,iFAA2H;AAE3H;;;;GAIG;AACH,SAAgB,iCAAiC,CAC/C,OAAe,EACf,kBAA0B,sCAAsC;IAEhE,IAAI;QACF,OAAO,kDAAsB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;KACzD;IAAC,WAAM;QACN;;;;;;;;WAQG;QACH,OAAO,CAAC,IAAI,CACV,8IAA8I,CAC/I,CAAC;QACF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AArBD,8EAqBC"}
1
+ {"version":3,"file":"tailwind.js","sourceRoot":"","sources":["../../../packages/react/tailwind.ts"],"names":[],"mappings":";;;AAAA,iFAA2H;AAE3H;;;;GAIG;AACH,SAAgB,iCAAiC,CAC/C,OAAe,EACf,kBAA0B,2CAA2C;IAErE,IAAI;QACF,OAAO,kDAAsB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;KACzD;IAAC,WAAM;QACN;;;;;;;;WAQG;QACH,OAAO,CAAC,IAAI,CACV,8IAA8I,CAC/I,CAAC;QACF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AArBD,8EAqBC"}