Skip to content
This repository has been archived by the owner on Dec 27, 2023. It is now read-only.

Updated to latest babel #605

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated to latest babel #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions acceptance-setup/__tests__/__snapshots__/acceptance.js.snap
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions packages/oc-template-react-compiler/__tests__/__snapshots__/compile.js.snap
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions packages/oc-template-react-compiler/__tests__/compile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ const execute = (options, cb) => {
result.oc.date = "";
result.oc.files.template.version = "";
nodeDir.paths(options.publishPath, (err2, res2) => {
const files = _
.chain(res2.files)
const files = _.chain(res2.files)
.map(filePath => {
const source = fs.readFileSync(filePath, "UTF8");
return {
Expand Down
9 changes: 6 additions & 3 deletions ...-compiler/lib/to-abstract-base-template-utils/oc-webpack/lib/configurator/client/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,16 @@ module.exports = options => {
babelrc: false,
presets: [
[
require.resolve("babel-preset-env"),
require.resolve("@babel/preset-env"),
{ modules: false, loose: true }
],
[require.resolve("babel-preset-react")]
[require.resolve("@babel/preset-react")]
],
plugins: [
[require.resolve("babel-plugin-transform-object-rest-spread")]
[
require.resolve("@babel/plugin-proposal-object-rest-spread")
],
[require.resolve("@babel/plugin-proposal-class-properties")]
]
}
}
Expand Down
9 changes: 4 additions & 5 deletions ...-compiler/lib/to-abstract-base-template-utils/oc-webpack/lib/configurator/server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,19 @@ module.exports = function webpackConfigGenerator(options) {
babelrc: false,
presets: [
[
require.resolve("babel-preset-env"),
require.resolve("@babel/preset-env"),
{
modules: false,
targets: {
node: 6
}
}
],
[
require.resolve("babel-preset-react")
]
[require.resolve("@babel/preset-react")]
],
plugins: [
[require.resolve("babel-plugin-transform-object-rest-spread")]
[require.resolve("@babel/plugin-proposal-object-rest-spread")],
[require.resolve("@babel/plugin-proposal-class-properties")]
]
}
}
Expand Down
9 changes: 5 additions & 4 deletions packages/oc-template-react-compiler/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@
},
"license": "MIT",
"dependencies": {
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-object-rest-spread": "^7.7.4",
"@babel/preset-env": "^7.7.4",
"@babel/preset-react": "^7.7.4",
"async": "2.6.3",
"autoprefixer": "9.6.2",
"babel-loader": "7.1.5",
"babel-loader": "^8.0.0",
"babel-minify-webpack-plugin": "0.3.1",
"babel-plugin-transform-object-rest-spread": "6.26.0",
"babel-preset-env": "1.7.0",
"babel-preset-react": "6.24.1",
"css-loader": "1.0.1",
"fs-extra": "8.1.0",
"infinite-loop-loader": "1.0.6",
Expand Down