mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Use /index suffix for JS import statements
Otherwise browserify or gulp-sourcemaps doesn't include these in the *.map file, which makes debugging impossible
This commit is contained in:
parent
2cf5fbcfce
commit
0675f85d32
@ -10,7 +10,7 @@ import SchemaReducer from 'state/schema/reducer';
|
||||
import RecordsReducer from 'state/records/reducer';
|
||||
|
||||
// Sections
|
||||
import CampaignAdmin from 'sections/campaign-admin';
|
||||
import CampaignAdmin from 'sections/campaign-admin/index';
|
||||
|
||||
function appBoot() {
|
||||
reducerRegister.add('config', ConfigReducer);
|
||||
|
@ -1,5 +1,5 @@
|
||||
import React from 'react';
|
||||
import SilverStripeComponent from 'silverstripe-component.js';
|
||||
import SilverStripeComponent from 'silverstripe-component';
|
||||
|
||||
class FormActionComponent extends SilverStripeComponent {
|
||||
constructor(props) {
|
||||
|
@ -3,11 +3,11 @@ import { connect } from 'react-redux';
|
||||
import { bindActionCreators } from 'redux';
|
||||
import $ from 'jQuery';
|
||||
import * as schemaActions from 'state/schema/actions';
|
||||
import SilverStripeComponent from 'silverstripe-component.js';
|
||||
import FormComponent from 'components/form';
|
||||
import TextField from 'components/text-field';
|
||||
import HiddenField from 'components/hidden-field';
|
||||
import GridField from 'components/grid-field';
|
||||
import SilverStripeComponent from 'silverstripe-component';
|
||||
import FormComponent from 'components/form/index';
|
||||
import TextField from 'components/text-field/index';
|
||||
import HiddenField from 'components/hidden-field/index';
|
||||
import GridField from 'components/grid-field/index';
|
||||
import fetch from 'isomorphic-fetch';
|
||||
|
||||
import es6promise from 'es6-promise';
|
||||
|
@ -1,4 +1,4 @@
|
||||
jest.unmock('silverstripe-component.js');
|
||||
jest.unmock('silverstripe-component');
|
||||
jest.unmock('../');
|
||||
|
||||
import { FormBuilderComponent } from '../';
|
||||
|
@ -1,6 +1,6 @@
|
||||
import React from 'react';
|
||||
import SilverStripeComponent from 'silverstripe-component.js';
|
||||
import FormActionComponent from 'components/form-action';
|
||||
import SilverStripeComponent from 'silverstripe-component';
|
||||
import FormActionComponent from 'components/form-action/index';
|
||||
|
||||
class FormComponent extends SilverStripeComponent {
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import React from 'react';
|
||||
import SilverStripeComponent from 'silverstripe-component.js';
|
||||
import SilverStripeComponent from 'silverstripe-component';
|
||||
|
||||
class GridFieldCellComponent extends SilverStripeComponent {
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import React from 'react';
|
||||
import SilverStripeComponent from 'silverstripe-component.js';
|
||||
import SilverStripeComponent from 'silverstripe-component';
|
||||
|
||||
class GridFieldHeaderCellComponent extends SilverStripeComponent {
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import React from 'react';
|
||||
import SilverStripeComponent from 'silverstripe-component.js';
|
||||
import SilverStripeComponent from 'silverstripe-component';
|
||||
import GridFieldRowComponent from './row';
|
||||
|
||||
class GridFieldHeaderComponent extends SilverStripeComponent {
|
||||
|
@ -1,7 +1,7 @@
|
||||
import React from 'react';
|
||||
import { bindActionCreators } from 'redux';
|
||||
import { connect } from 'react-redux';
|
||||
import SilverStripeComponent from 'silverstripe-component.js';
|
||||
import SilverStripeComponent from 'silverstripe-component';
|
||||
import GridFieldTable from './table';
|
||||
import GridFieldHeader from './header';
|
||||
import GridFieldHeaderCell from './header-cell';
|
||||
|
@ -1,5 +1,5 @@
|
||||
import React from 'react';
|
||||
import SilverStripeComponent from 'silverstripe-component.js';
|
||||
import SilverStripeComponent from 'silverstripe-component';
|
||||
|
||||
class GridFieldRowComponent extends SilverStripeComponent {
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import React from 'react';
|
||||
import SilverStripeComponent from 'silverstripe-component.js';
|
||||
import SilverStripeComponent from 'silverstripe-component';
|
||||
|
||||
class GridFieldTableComponent extends SilverStripeComponent {
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import React from 'react';
|
||||
import SilverStripeComponent from 'silverstripe-component.js';
|
||||
import SilverStripeComponent from 'silverstripe-component';
|
||||
|
||||
class HiddenFieldComponent extends SilverStripeComponent {
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import React from 'react';
|
||||
import SilverStripeComponent from 'silverstripe-component.js';
|
||||
import SilverStripeComponent from 'silverstripe-component';
|
||||
|
||||
class NorthHeaderBreadcrumbsComponent extends SilverStripeComponent {
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
import React from 'react';
|
||||
import NorthHeaderBreadcrumbsComponent from '../north-header-breadcrumbs';
|
||||
import SilverStripeComponent from 'silverstripe-component.js';
|
||||
import NorthHeaderBreadcrumbsComponent from '../north-header-breadcrumbs/index';
|
||||
import SilverStripeComponent from 'silverstripe-component';
|
||||
|
||||
class NorthHeaderComponent extends SilverStripeComponent {
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import React from 'react';
|
||||
import SilverStripeComponent from 'silverstripe-component.js';
|
||||
import SilverStripeComponent from 'silverstripe-component';
|
||||
|
||||
class TextFieldComponent extends SilverStripeComponent {
|
||||
|
||||
|
@ -1,10 +1,10 @@
|
||||
import React from 'react';
|
||||
import { connect } from 'react-redux';
|
||||
import SilverStripeComponent from 'silverstripe-component';
|
||||
import FormAction from 'components/form-action';
|
||||
import FormAction from 'components/form-action/index';
|
||||
import i18n from 'i18n';
|
||||
import NorthHeader from 'components/north-header';
|
||||
import FormBuilder from 'components/form-builder';
|
||||
import NorthHeader from 'components/north-header/index';
|
||||
import FormBuilder from 'components/form-builder/index';
|
||||
|
||||
class CampaignAdminContainer extends SilverStripeComponent {
|
||||
|
||||
|
60
gulpfile.js
60
gulpfile.js
@ -192,32 +192,32 @@ gulp.task('bundle-lib', function bundleLib() {
|
||||
.on('update', bundleLib)
|
||||
.on('log', function (msg) { gulpUtil.log('Finished', 'bundled ' + bundleFileName + ' ' + msg) })
|
||||
.transform('babelify', babelifyOptions)
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/form', { expose: 'components/form' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/form-action', { expose: 'components/form-action' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/form-builder', { expose: 'components/form-builder' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field', { expose: 'components/grid-field' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/cell', { expose: 'components/grid-field/cell' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/header', { expose: 'components/grid-field/header' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/header-cell', { expose: 'components/grid-field/header-cell' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/row', { expose: 'components/grid-field/row' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/table', { expose: 'components/grid-field/table' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/hidden-field', { expose: 'components/hidden-field' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/text-field', { expose: 'components/text-field' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/north-header', { expose: 'components/north-header' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/north-header-breadcrumbs', { expose: 'components/north-header-breadcrumbs' })
|
||||
.require('deep-freeze', { expose: 'deep-freeze' })
|
||||
.require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/i18n.js', { expose: 'i18n' })
|
||||
.require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/jQuery.js', { expose: 'jQuery' })
|
||||
.require('react', { expose: 'react' })
|
||||
.require('react-addons-css-transition-group', { expose: 'react-addons-css-transition-group' })
|
||||
.require('react-addons-test-utils', { expose: 'react-addons-test-utils' })
|
||||
.require('react-dom', { expose: 'react-dom' })
|
||||
.require('react-redux', { expose: 'react-redux' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/reducer-register.js', { expose: 'reducer-register' })
|
||||
.require('redux', { expose: 'redux' })
|
||||
.require('redux-thunk', { expose: 'redux-thunk' })
|
||||
.require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/router.js', { expose: 'router' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/silverstripe-component.js', { expose: 'silverstripe-component' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/form/index', { expose: 'components/form/index' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/form-action/index', { expose: 'components/form-action' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/form-builder/index', { expose: 'components/form-builder/index' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/index', { expose: 'components/grid-field/index' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/cell', { expose: 'components/grid-field/cell/index' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/header', { expose: 'components/grid-field/header' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/header-cell', { expose: 'components/grid-field/header-cell' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/row', { expose: 'components/grid-field/row' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/table', { expose: 'components/grid-field/table' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/hidden-field/index', { expose: 'components/hidden-field/index' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/text-field/index', { expose: 'components/text-field/index' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/north-header/index', { expose: 'components/north-header/index' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/north-header-breadcrumbs/index', { expose: 'components/north-header-breadcrumbs/index' })
|
||||
.require('deep-freeze', { expose: 'deep-freeze' })
|
||||
.require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/i18n.js', { expose: 'i18n' })
|
||||
.require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/jQuery.js', { expose: 'jQuery' })
|
||||
.require('react', { expose: 'react' })
|
||||
.require('react-addons-css-transition-group', { expose: 'react-addons-css-transition-group' })
|
||||
.require('react-addons-test-utils', { expose: 'react-addons-test-utils' })
|
||||
.require('react-dom', { expose: 'react-dom' })
|
||||
.require('react-redux', { expose: 'react-redux' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/reducer-register.js', { expose: 'reducer-register' })
|
||||
.require('redux', { expose: 'redux' })
|
||||
.require('redux-thunk', { expose: 'redux-thunk' })
|
||||
.require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/router.js', { expose: 'router' })
|
||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/silverstripe-component', { expose: 'silverstripe-component' })
|
||||
.bundle()
|
||||
.on('update', bundleLib)
|
||||
.on('error', notify.onError({ message: bundleFileName + ': <%= error.message %>' }))
|
||||
@ -258,11 +258,11 @@ gulp.task('bundle-framework', function bundleBoot() {
|
||||
.on('update', bundleBoot)
|
||||
.on('log', function (msg) { gulpUtil.log('Finished', 'bundled ' + bundleFileName + ' ' + msg) })
|
||||
.transform('babelify', babelifyOptions)
|
||||
.external('components/action-button')
|
||||
.external('components/north-header')
|
||||
.external('components/form-builder')
|
||||
.external('components/action-button/index')
|
||||
.external('components/north-header/index')
|
||||
.external('components/form-builder/index')
|
||||
.external('deep-freeze')
|
||||
.external('components/grid-field')
|
||||
.external('components/grid-field/index')
|
||||
.external('i18n')
|
||||
.external('jQuery')
|
||||
.external('page.js')
|
||||
|
Loading…
Reference in New Issue
Block a user